Changeset a3c602f in buchla-68k

Timestamp:

11/12/2017 10:09:26 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

ba51a45

Parents:

b5b602e

Message:

Fixed vtyper.c.

Location:

ram

Files:

• im700.c (modified) (1 diff)
• im700.x (modified) (1 diff)
• vtyper.c (modified) (2 diffs)
• vtyper.x (modified) (2 diffs)

ram/im700.c

@@ -365 +365 @@
 uint16_t        curintp;        /* current interpolate time (FPU format) */
 uint16_t        scrl;           /* score VSDD object scroll register image */
-uint16_t        vtbgval;        /* virtual typewriter data background color */
-uint16_t        vtfgval;        /* virtual typewriter data foreground color */
+int16_t         vtbgval;        /* virtual typewriter data background color */
+int16_t         vtfgval;        /* virtual typewriter data foreground color */
 
 uint16_t        dfbuf[4096];    /* track formatting buffer */

ram/im700.x

@@ -366 +366 @@
 extern  int16_t         vrbw15;
 extern  int16_t         vrcw;
-extern  uint16_t        vtbgval;
+extern  int16_t         vtbgval;
 extern  int16_t         vtccol;
 extern  int16_t         vtcrow;
 extern  int8_t          vtdechr;
 extern  int16_t         vtdecol;
-extern  uint16_t        vtfgval;
+extern  int16_t         vtfgval;
 extern  int16_t         vtpcol;
 extern  int16_t         vtprow;

ram/vtyper.c

@@ -50 +50 @@
         vtdecol = col;          /* setup data entry base column */
         vtdeptr = ptr;          /* setup data entry area base address */
-        vtfgval = exp_c(fg);    /* setup foreground color value */
-        vtbgval = exp_c(bg);    /* setup background color value */
+        vtfgval = fg;           /* setup foreground color value */
+        vtbgval = bg;           /* setup background color value */
         SetPri(TTCURS, TTCPRI); /* turn on the typewriter cursor */
         vtxval = CTOX(tc);      /* setup vt x value */
@@ -109 +109 @@
 */
 
-void vtdisp(volatile uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf)
+void vtdisp(volatile uint16_t *obj, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *buf)
 {
 

ram/vtyper.x

@@ -9 +9 @@
 #include "stdint.h"
 
-typedef void            (*vtchar)(volatile uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
+typedef void            (*vtchar)(volatile uint16_t *obj, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *buf);
 typedef void            (*vtcurs)(void);
 
@@ -30 +30 @@
 extern  void            vtcxupd(void);
 extern  void            vtcyupd(void);
-extern  void            vtdisp(volatile uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
+extern  void            vtdisp(volatile uint16_t *obj, int16_t fg, int16_t bg, int16_t row, int16_t col, int8_t *buf);
 extern  void            vtsetup(volatile uint16_t *obj, vtchar dsp, int16_t col, int8_t *ptr, int16_t tr, int16_t tc, vtcurs adv, vtcurs bsp, vtcurs cup, vtcurs cdn, vtcurs stop, int16_t fg, int16_t bg);
 extern  int16_t         vtyper(void);