Changeset 19caa64 in buchla-68k

Timestamp:

11/12/2017 06:00:49 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

3f2d518

Parents:

018d7ba

Message:

Fix sqselbx.c.

Location:

ram

Files:

• sqdisp.c (modified) (4 diffs)
• sqdisp.x (modified) (1 diff)
• sqselbx.c (modified) (13 diffs)
• sqselbx.x (modified) (1 diff)

ram/sqdisp.c

@@ -14 +14 @@
 #endif
 
-int16_t curslin;                        /* current sequence line */
-
-int8_t  sqhead[] =
+int16_t         curslin;                /* current sequence line */
+
+int8_t          sqhead[] =
 
         "\260 Lin Time  Action 1    Action 2    Action 3    \260 No Seq Rg T \260";
 
-int8_t  *sqmcon[] = {
+int8_t          *sqmcon[] = {
 
         "\260 Key transient  Trigger on   Stop         Set reg   Value    \260",
@@ -29 +29 @@
 };
 
-int16_t seqpal[16][3] = {               /* sequence display palette */
+int16_t         seqpal[16][3] = {       /* sequence display palette */
 
         {0, 0, 0},      /*  0 - black */
@@ -49 +49 @@
 };
 
-int16_t sqatype[] = {           /* sequence action types by box number */
+uint16_t        sqatype[] = {           /* sequence action types by box number */
 
         SQ_NULL,        /*      "           "   0 */
@@ -71 +71 @@
 };
 
-int8_t  *sqdsptb[] = {          /* sequence action display strings by action */
+int8_t          *sqdsptb[] = {  /* sequence action display strings by action */
 
         "           ",          /* SQ_NULL      0x0000  null action */

ram/sqdisp.x

@@ -17 +17 @@
 extern  int16_t         curslin;
 extern  int16_t         seqpal[16][3];
-extern  int16_t         sqatype[];
+extern  uint16_t        sqatype[];
 extern  int8_t          *sqdsptb[];
 extern  int8_t          sqhead[];

ram/sqselbx.c

@@ -22 +22 @@
 struct seqent   seqbuf;                 /* sequence line buffer */
 
-int8_t  sqhilit[][8] = {                /* submenu highlight table */
+int8_t          sqhilit[][8] = {        /* submenu highlight table */
 
         /* start, width, row1, row2, row3, row4, row5, pad */
@@ -40 +40 @@
 };
 
-int8_t  sqopreq[] = {           /* action needs operand type flag table */
+int8_t          sqopreq[] = {           /* action needs operand type flag table */
 
         0,  0, 0, 0, 0,  0, 0, 0, 0,  1, 1, 1, 1,  0, 0, 0,  1
 };
 
-int8_t  nextact[] = {  24, 36, 6 };     /* next column after action entry */
-
-int16_t sqidata[] = {           /* intial data by box */
+int8_t          nextact[] = {  24, 36, 6 };     /* next column after action entry */
+
+uint16_t        sqidata[] = {           /* intial data by box */
 
         0x0000, /*      "           "   0 */
@@ -69 +69 @@
 };
 
-int8_t  actcol[] = {                    /* action data entry column by action */
+int8_t          actcol[] = {            /* action data entry column by action */
 
         0,  3, 3, 3, 3,  9, 9, 9, 9,  5, 5, 5, 5,  10, 8, 3,  5
 };
 
-int8_t  sqvcol[]  = { 9, 8, 9, 9 };     /* value entry column - type order */
-
-int8_t  seqvcol[] = { 8, 8, 9, 9, 9 };  /* value entry column - box order */
-
-int16_t sqndata[] = {                   /* data types in box order */
+int8_t          sqvcol[]  = { 9, 8, 9, 9 };     /* value entry column - type order */
+
+int8_t          seqvcol[] = { 8, 8, 9, 9, 9 };  /* value entry column - box order */
+
+uint16_t        sqndata[] = {           /* data types in box order */
 
         SQ_VAL, SQ_REG, SQ_VLT, SQ_RND
@@ -209 +209 @@
         register int32_t ltemp;
         register uint16_t *ap, *dp;
-        uint16_t theact, port, chan, key, val, obj, dtype;
+        int16_t theact, port, chan, key, val, obj, dtype;
 
         switch (action) {
@@ -260 +260 @@
                 }
 
-                key = ltemp - 1;
+                key = (int16_t)(ltemp - 1);
 
                 i = sqdebuf[lcol + 7];
@@ -287 +287 @@
                 }
 
-                chan = ltemp - 1;
-                *dp = (port << 11) | (chan << 7) | key;
+                chan = (int16_t)(ltemp - 1);
+                *dp = ((uint16_t)port << 11) | ((uint16_t)chan << 7) |
+                                (uint16_t)key;
 
                 break;
@@ -305 +306 @@
                 }
 
-                *dp = ltemp - 1;
+                *dp = (uint16_t)(ltemp - 1);
 
                 break;
@@ -323 +324 @@
                         ltemp = (ltemp * 10) + (sqdebuf[i] - '0');
 
-                *dp = ltemp;
+                *dp = (uint16_t)ltemp;
 
                 break;
@@ -344 +345 @@
                 }
 
-                obj = ltemp - 1;
+                obj = (int16_t)(ltemp - 1);
 
                 switch (dtype) {
@@ -359 +360 @@
                         }
 
-                        val = ltemp - 1;
+                        val = (int16_t)(ltemp - 1);
                         break;
 
@@ -389 +390 @@
                         val |= 0x1000;
 
-                *ap = (*ap & SQ_MACT) | (obj << 8);
-                *dp = (*dp & SQ_MTYP) | val;
+                *ap = (*ap & SQ_MACT) | ((uint16_t)obj << 8);
+                *dp = (*dp & SQ_MTYP) | (uint16_t)val;
 
                 break;
@@ -432 +433 @@
                                 ltemp = (ltemp * 10) + (sqdebuf[i] - '0');
 
-                        curslin = ltemp;
+                        curslin = (int16_t)ltemp;
                         sqdeflg = FALSE;
                         dstw();
@@ -448 +449 @@
                                 ltemp = (ltemp * 10) + (sqdebuf[i] - '0');
 
-                        seqtab[curslin].seqtime = ltemp;
-                        seqbuf.seqtime = ltemp;
+                        seqtab[curslin].seqtime = (uint16_t)ltemp;
+                        seqbuf.seqtime = (uint16_t)ltemp;
                         dsqlin(sqdebuf, curslin);
                         sqdeflg = TRUE;

ram/sqselbx.x

@@ -26 +26 @@
 extern  int16_t         sqdeflg;
 extern  int8_t          sqhilit[][8];
-extern  int16_t         sqidata[];
+extern  uint16_t        sqidata[];
 extern  int16_t         sqmenu;
-extern  int16_t         sqndata[];
+extern  uint16_t        sqndata[];
 extern  int8_t          sqopreq[];
 extern  int8_t          sqvcol[];