Changeset 7258c6a in buchla-68k for ram/uslice.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/uslice.c (modified) (12 diffs)

ram/uslice.c

@@ -31 +31 @@
 #endif
 
-extern  unsigned        scrl;
-
-extern  short           sbase;
-extern  short           sd;
-extern  short           soffset;
-
-extern  unsigned        *consl;
-extern  unsigned        *cursl;
-extern  unsigned        *nxtsl;
-extern  unsigned        *prvsl;
-extern  unsigned        *saddr;
-
-extern  unsigned        slices[];
-
-extern  short           gtctab[12];             /* group to color table */
+extern  uint16_t        scrl;
+
+extern  int16_t         sbase;
+extern  int16_t         sd;
+extern  int16_t         soffset;
+
+extern  uint16_t        *consl;
+extern  uint16_t        *cursl;
+extern  uint16_t        *nxtsl;
+extern  uint16_t        *prvsl;
+extern  uint16_t        *saddr;
+
+extern  uint16_t        slices[];
+
+extern  int16_t         gtctab[12];             /* group to color table */
 
 extern  struct  gdsel   *gdfsep;                /* gdsel freechain pointer */
@@ -61 +61 @@
 /* initialized data */
 
-short   lintab1[] = {                   /* note top line table */
+int16_t lintab1[] = {                   /* note top line table */
 
         205, 205, 201, 197, 197, 193, 193, 189, 185, 185, 181, 181,
@@ -73 +73 @@
 };
 
-short   lintab2[] = {                   /* note top line table - N_FLAT */
+int16_t lintab2[] = {                   /* note top line table - N_FLAT */
 
         205, 201, 201, 197, 193, 193, 189, 189, 185, 181, 181, 177, 
@@ -85 +85 @@
 };
 
-short   nttab1[] = {            /* forward code transition table */
+int16_t nttab1[] = {            /* forward code transition table */
 
         0,      /* 0 */
@@ -96 +96 @@
 };
 
-short   nttab2[] = {            /* backward code transition table */
+int16_t nttab2[] = {            /* backward code transition table */
 
         0,      /* 0 */
@@ -111 +111 @@
 */
 
-short   pxtbl[][4] = {          /* pixel mask table for notes */
+int16_t pxtbl[][4] = {          /* pixel mask table for notes */
 
         { 0x0000, 0x0000, 0x0000, 0 },  /* 0 */
@@ -122 +122 @@
 };
 
-short   epxtbl[][16] = {        /* pixel mask table for events */
+int16_t epxtbl[][16] = {        /* pixel mask table for events */
 
         { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,       /* 0 */
@@ -182 +182 @@
 */
 
-short uslice(unsigned *slice, unsigned mask1, unsigned mask2, struct gdsel *gdstb[])
+int16_t uslice(uint16_t *slice, uint16_t mask1, uint16_t mask2, struct gdsel *gdstb[])
 {
-        register unsigned *pxptr, *slptr;
+        register uint16_t *pxptr, *slptr;
         register struct gdsel *gdsep;
-        register unsigned i, ncolor, w;
-        unsigned *ncptr, *nctabp;
+        register uint16_t i, ncolor, w;
+        uint16_t *ncptr, *nctabp;
         struct gdsel **gdstp, *gdprv, *gdnxt;
-        short wrote;
-        short *lintab;
+        int16_t wrote;
+        int16_t *lintab;
 
         DB_ENTR("uslice()");
@@ -377 +377 @@
         register struct gdsel *gdsep;
         register struct gdsel **gdstp;
-        register unsigned *nctabp;
-        register unsigned i, nc;
+        register uint16_t *nctabp;
+        register uint16_t i, nc;
         struct gdsel *gdprv, *gdnxt;
 
@@ -496 +496 @@
 */
 
-short cslice(unsigned *slice, unsigned mask1, unsigned mask2, struct gdsel *gdstb[])
+int16_t cslice(uint16_t *slice, uint16_t mask1, uint16_t mask2, struct gdsel *gdstb[])
 {
-        register unsigned *pxptr, *slptr;
+        register uint16_t *pxptr, *slptr;
         register struct gdsel *gdsep;
-        register unsigned i, ncolor, w;
-        unsigned *ncptr, *nctabp;
+        register uint16_t i, ncolor, w;
+        uint16_t *ncptr, *nctabp;
         struct gdsel **gdstp, *gdprv, *gdnxt;
-        short wrote;
-        short *lintab;
+        int16_t wrote;
+        int16_t *lintab;
 
         DB_ENTR("cslice()");
@@ -675 +675 @@
 {
         register struct gdsel *gdsp, *gnxt, **gp;
-        register short i;
+        register int16_t i;
 
         gdfsep = gdsp = &gdfsl[0];      /* initialize slice control pool */
@@ -721 +721 @@
 */
         {
-                register unsigned *p1, *p2, *p3, sword;
-                unsigned *p4;
+                register uint16_t *p1, *p2, *p3, sword;
+                uint16_t *p4;
 
                 p1 = consl;                     /* clear slices */