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

ram/scadv.c

@@ -27 +27 @@
 /* variables defined elsewhere */
 
-extern  unsigned        *consl;
-extern  unsigned        *cursl;
-extern  unsigned        *nxtsl;
-extern  unsigned        *prvsl;
-extern  unsigned        *saddr;
-
-extern  unsigned        scrl;
-extern  unsigned        vi_sadr;
-extern  unsigned        vi_scrl;
-
-extern  short   ctrsw;
-extern  short   ndisp;
-extern  short   sbase;
-extern  short   sd;
-extern  short   soffset;
+extern  uint16_t        *consl;
+extern  uint16_t        *cursl;
+extern  uint16_t        *nxtsl;
+extern  uint16_t        *prvsl;
+extern  uint16_t        *saddr;
+
+extern  uint16_t        scrl;
+extern  uint16_t        vi_sadr;
+extern  uint16_t        vi_scrl;
+
+extern  int16_t ctrsw;
+extern  int16_t ndisp;
+extern  int16_t sbase;
+extern  int16_t sd;
+extern  int16_t soffset;
 
 extern  struct  gdsel   *gdstbc[];
@@ -53 +53 @@
 /* initialized stuff */
 
-short   nbmoff = 3;
-short   wrdoff = 3;
-
-short   nbmasks[4] = {          /* nybble masks */
+int16_t nbmoff = 3;
+int16_t wrdoff = 3;
+
+int16_t nbmasks[4] = {          /* nybble masks */
 
         0x000F,
@@ -79 +79 @@
 void sc_adv(void)
 {
-        register short masksl, maskpx, i;
-        register unsigned sword;
-        register long tl;
-        register unsigned *optr, *pptr, *fsl;
-        unsigned *qptr;
-        unsigned pscrl;
+        register int16_t masksl, maskpx, i;
+        register uint16_t sword;
+        register int32_t tl;
+        register uint16_t *optr, *pptr, *fsl;
+        uint16_t *qptr;
+        uint16_t pscrl;
 
         DB_ENTR("sc_adv");
@@ -238 +238 @@
         if ((ndisp EQ 2) AND (scrl NE pscrl)) {
 
-                sword = (unsigned)((long)saddr >> 1);
+                sword = (uint16_t)((int32_t)saddr >> 1);
 
                 setipl(VID_DI);         /* disable video interrupts */
@@ -272 +272 @@
 void scupd(void)
 {
-        register short masksl, maskpx, i;
-        register unsigned sword;
-        register long tl;
-        register unsigned *optr, *qptr, *fsl;
-        short soff;
+        register int16_t masksl, maskpx, i;
+        register uint16_t sword;
+        register int32_t tl;
+        register uint16_t *optr, *qptr, *fsl;
+        int16_t soff;
 
         DB_ENTR("scupd");