Changeset 7258c6a in buchla-68k for vlib/vobjfns.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:

• vlib/vobjfns.c (modified) (7 diffs)

vlib/vobjfns.c

@@ -60 +60 @@
 #include "vsddvars.h"
 
-extern  void    vbank(unsigned b);
-extern  void    objon(unsigned obj, unsigned line, unsigned num);
+extern  void    vbank(uint16_t b);
+extern  void    objon(uint16_t obj, uint16_t line, uint16_t num);
 extern  void    VIint(void);
 
-short           wsize;          /* object width calculated by SetObj() */
-short           vi_dis;         /* disable use of VIint */
-
-unsigned        vi_ctl;         /* object unblank control bits */
+int16_t         wsize;          /* object width calculated by SetObj() */
+int16_t         vi_dis;         /* disable use of VIint */
+
+uint16_t        vi_ctl;         /* object unblank control bits */
 
 /* 
@@ -79 +79 @@
 */
 
-void SelObj(int obj)
+void SelObj(int16_t obj)
 {
         register struct octent *op;
-        register unsigned newbank;
+        register uint16_t newbank;
 
         op = &v_obtab[obj];
@@ -109 +109 @@
 */
 
-void SetPri(int obj, int pri)
+void SetPri(int16_t obj, int16_t pri)
 {
         register struct octent *op;
@@ -121 +121 @@
         v_odtab[pri][0] = op->odtw0 | V_BLA;    /* start object as blanked */
         v_odtab[pri][1] = op->odtw1;
-        v_odtab[pri][2] = ((long)op->obase >> 1) & 0xFFFF;
+        v_odtab[pri][2] = ((int32_t)op->obase >> 1) & 0xFFFF;
 
         objon(pri, op->objy, op->ysize);        /* enable access table bits */
@@ -132 +132 @@
         vi_ctl |= (1 << pri);                   /* set unblank bit */
 
-        if (*((long *)0x000064) NE &VIint)      /* make sure VI vector is set */
+        if (*((int32_t *)0x000064) NE &VIint)   /* make sure VI vector is set */
                 BIOS(B_SETV, 25, VIint);
 
@@ -149 +149 @@
 */
 
-void SetObj(int obj, int type, int bank, int xpix, int ypix, int x0, int y0, int flags, int pri, unsigned int *base)
+void SetObj(int16_t obj, int16_t type, int16_t bank, int16_t xpix, int16_t ypix, int16_t x0, int16_t y0, int16_t flags, int16_t pri, uint16_t *base)
 {
         register struct octent *op;
@@ -252 +252 @@
 */
 
-void CpyObj(unsigned *from, unsigned *to, unsigned w, unsigned h, unsigned sw)
-{
-        register unsigned *tp;
-        register unsigned i, j;
+void CpyObj(uint16_t *from, uint16_t *to, uint16_t w, uint16_t h, uint16_t sw)
+{
+        register uint16_t *tp;
+        register uint16_t i, j;
 
         for (i = h; i--; ) {