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

ram/ucslice.c

@@ -23 +23 @@
 /* variables defined elsewhere */
 
-extern  unsigned        *saddr;         /* score object base address */
-
-extern  short           ndisp;          /* current display number */
-extern  short           sd;             /* scroll direction flag */
-extern  short           soffset;        /* score object scroll offset */
-
-extern  short           gtctab[];       /* group to color table */
-extern  short           lintab1[];      /* note top line table - N_SHARP */
-extern  short           lintab2[];      /* note top line table - N_FLAT */
-extern  short           nbmasks[];      /* pixel mask table for slices */
-extern  short           nttab1[];       /* gdsel code transition table - fwd */
-extern  short           nttab2[];       /* gdsel code transition table - bak */
-
-extern  short           pxtbl[][4];     /* pixel mask table - notes */
-extern  short           epxtbl[][16];   /* pixel mask table - events */
+extern  uint16_t        *saddr;         /* score object base address */
+
+extern  int16_t         ndisp;          /* current display number */
+extern  int16_t         sd;             /* scroll direction flag */
+extern  int16_t         soffset;        /* score object scroll offset */
+
+extern  int16_t         gtctab[];       /* group to color table */
+extern  int16_t         lintab1[];      /* note top line table - N_SHARP */
+extern  int16_t         lintab2[];      /* note top line table - N_FLAT */
+extern  int16_t         nbmasks[];      /* pixel mask table for slices */
+extern  int16_t         nttab1[];       /* gdsel code transition table - fwd */
+extern  int16_t         nttab2[];       /* gdsel code transition table - bak */
+
+extern  int16_t         pxtbl[][4];     /* pixel mask table - notes */
+extern  int16_t         epxtbl[][16];   /* pixel mask table - events */
 
 extern  struct  gdsel   *gdfsep;        /* gdsel freechain pointer */
@@ -64 +64 @@
 void ucslice(void)
 {
-        register unsigned *pxptr, *slptr;
+        register uint16_t *pxptr, *slptr;
         register struct gdsel *gdsep;
-        register long lc;
-        register unsigned i, ncolor, mask1, mask2;
-        unsigned *ncptr, *nctabp;
+        register int32_t lc;
+        register uint16_t i, ncolor, mask1, mask2;
+        uint16_t *ncptr, *nctabp;
         struct gdsel **gdstp, *gdprv, *gdnxt;
-        short *lintab;
+        int16_t *lintab;
 
         DB_ENTR("ucslice()");
@@ -105 +105 @@
 
                                         slptr = saddr + 64L +
-                                                ((long)lintab[gdsep->note] << 7);
+                                                ((int32_t)lintab[gdsep->note] << 7);
 
                                         pxptr = &pxtbl[gdsep->code][0];