Changeset 57425b6 in buchla-68k for ram/uslice.c

Timestamp:

11/12/2017 09:16:54 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

522c363

Parents:

e2707e9

Message:

Fixed uslice.c.

File:

• ram/uslice.c (modified) (5 diffs)

ram/uslice.c

@@ -135 +135 @@
         struct gdsel *gdsep;
         uint16_t i, ncolor, w;
-        uint16_t *ncptr, *nctabp;
+        uint16_t *ncptr;
+        int16_t *nctabp;
         struct gdsel **gdstp, *gdprv, *gdnxt;
         int16_t wrote;
@@ -225 +226 @@
                                 /* get event color */
 
-                                ncolor = mask1 & gdsep->note;
+                                ncolor = mask1 & (uint16_t)gdsep->note;
 
                                 /* update the slice */
@@ -313 +314 @@
 void rslice(struct gdsel *gdstb[])
 {
-        register struct gdsel *gdsep;
-        register struct gdsel **gdstp;
-        register uint16_t *nctabp;
-        register uint16_t i, nc;
+        struct gdsel *gdsep;
+        struct gdsel **gdstp;
+        int16_t *nctabp;
+        uint16_t i;
         struct gdsel *gdprv, *gdnxt;
 
@@ -347 +348 @@
                                 /* update and check update note status code */
 
-                                if (0 EQ (gdsep->code = nctabp[nc = gdsep->code])) {
+                                if (0 EQ (gdsep->code = nctabp[gdsep->code])) {
 
 #if DEBUGIT
@@ -509 +510 @@
                                 pxptr = &epxtbl[gdsep->code][0];
 
-                                ncolor = gdsep->note;   /* get event color */
+                                ncolor = (uint16_t)gdsep->note; /* get event color */
 
                                 /* update the slice */