Changeset d1ecb94 in buchla-68k

Timestamp:

11/12/2017 08:33:43 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

6d5247b

Parents:

210d896

Message:

Fixed scadv.c.

Location:

ram

Files:

• scadv.c (modified) (4 diffs)
• scadv.x (modified) (1 diff)

ram/scadv.c

@@ -18 +18 @@
 /* initialized stuff */
 
-int16_t nbmoff = 3;
-int16_t wrdoff = 3;
-
-int16_t nbmasks[4] = {          /* nybble masks */
+int16_t         nbmoff = 3;
+int16_t         wrdoff = 3;
+
+uint16_t        nbmasks[4] = {          /* nybble masks */
 
         0x000F,
@@ -40 +40 @@
 void sc_adv(void)
 {
-        int16_t masksl, maskpx, i;
+        uint16_t masksl, maskpx;
+        int16_t i;
         uint16_t sword;
         int32_t tl;
@@ -185 +186 @@
         uslice(nxtsl, maskpx, masksl, gdstbn);          /* update right edge */
 
-        scrl  = 0x8000 | ((soffset >> 1) ^ 0x0001);
+        scrl  = 0x8000 | (((uint16_t)soffset >> 1) ^ 0x0001);
 
         /* only update VSDD registers if score is up and scrl changed */
@@ -221 +222 @@
 void scupd(void)
 {
-        int16_t masksl, maskpx, i;
+        uint16_t masksl, maskpx;
+        int16_t i;
         uint16_t sword;
         int32_t tl;

ram/scadv.x

@@ -15 +15 @@
 */
 
-extern  int16_t         nbmasks[4];
+extern  uint16_t        nbmasks[4];
 extern  int16_t         nbmoff;
 extern  int16_t         wrdoff;