Changeset 7258c6a in buchla-68k for ram/sqselbx.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/sqselbx.c (modified) (9 diffs)

ram/sqselbx.c

@@ -27 +27 @@
 */
 
-extern  short   cmtype;
-extern  short   curslin;
-extern  short   stccol;
-extern  short   stcrow;
-extern  short   submenu;
-extern  short   vtccol;
-extern  short   vtcrow;
-
-extern  char    actlft[];
-
-extern  short   sqatype[];
-
-extern  unsigned        *obj11;
+extern  int16_t cmtype;
+extern  int16_t curslin;
+extern  int16_t stccol;
+extern  int16_t stcrow;
+extern  int16_t submenu;
+extern  int16_t vtccol;
+extern  int16_t vtcrow;
+
+extern  int8_t  actlft[];
+
+extern  int16_t sqatype[];
+
+extern  uint16_t        *obj11;
 
 extern  struct seqent   seqtab[];
 
-short   action;                         /* current action column */
-short   sqdeflg;                        /* sequence data entry buffer filled */
-short   sqmenu;                         /* sqeuence submenu state */
-
-char    sqdebuf[50];                    /* sequence data entry buffer */
+int16_t action;                         /* current action column */
+int16_t sqdeflg;                        /* sequence data entry buffer filled */
+int16_t sqmenu;                         /* sqeuence submenu state */
+
+int8_t  sqdebuf[50];                    /* sequence data entry buffer */
 
 struct seqent   seqbuf;                 /* sequence line buffer */
 
-short   sqfnbox(short n);
-
-/* 
-
-*/
-
-char    sqhilit[][8] = {                /* submenu highlight table */
+int16_t sqfnbox(int16_t n);
+
+/* 
+
+*/
+
+int8_t  sqhilit[][8] = {                /* submenu highlight table */
 
         /* start, width, row1, row2, row3, row4, row5, pad */
@@ -75 +75 @@
 };
 
-char    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
 };
 
-char    nextact[] = {  24, 36, 6 };     /* next column after action entry */
-
-/* 
-
-*/
-
-short   sqidata[] = {           /* intial data by box */
+int8_t  nextact[] = {  24, 36, 6 };     /* next column after action entry */
+
+/* 
+
+*/
+
+int16_t sqidata[] = {           /* intial data by box */
 
         0x0000, /*      "           "   0 */
@@ -112 +112 @@
 */
 
-char    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
 };
 
-char    sqvcol[]  = { 9, 8, 9, 9 };     /* value entry column - type order */
-
-char    seqvcol[] = { 8, 8, 9, 9, 9 };  /* value entry column - box order */
-
-short   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 */
+
+int16_t sqndata[] = {                   /* data types in box order */
 
         SQ_VAL, SQ_REG, SQ_VLT, SQ_RND
@@ -136 +136 @@
 */
 
-void hilitsq(char n)
+void hilitsq(int8_t n)
 {
-        register short chr, h, v, w;
+        register int16_t chr, h, v, w;
 
         sqmenu = n;                             /* set current submenu type */
@@ -218 +218 @@
 */
 
-void movestc(short r, short c)
+void movestc(int16_t r, int16_t c)
 {
         ctcpos(r, c);
@@ -230 +230 @@
 */
 
-void endssm(short row, short col)
+void endssm(int16_t row, int16_t col)
 {
         submenu = FALSE;
@@ -250 +250 @@
 */
 
-void setsqm(short r, short c)
+void setsqm(int16_t r, int16_t c)
 {
         submenu = TRUE;
@@ -267 +267 @@
 */
 
-short sqenter(void)
+int16_t sqenter(void)
 {
-        register short i, lcol;
-        register long ltemp;
-        register unsigned short *ap, *dp;
-        unsigned short theact, port, chan, key, val, obj, dtype;
+        register int16_t i, lcol;
+        register int32_t ltemp;
+        register uint16_t *ap, *dp;
+        uint16_t theact, port, chan, key, val, obj, dtype;
 
         switch (action) {
@@ -493 +493 @@
 */
 
-short sqfnbox(short n)
+int16_t sqfnbox(int16_t n)
 {
-        short act, vtype;
-        register short box;
-        register short i;
-        register long ltemp;
+        int16_t act, vtype;
+        register int16_t box;
+        register int16_t i;
+        register int32_t ltemp;
 
         if (NOT submenu) {                      /* SEQUENCE DATA ENTRY LINE */