Changeset bf89cfb in buchla-68k for vlib/vobjfns.c

Timestamp:

07/15/2017 11:15:58 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

c80943f

Parents:

09d1345

Message:

No more warnings in vlib.

File:

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

vlib/vobjfns.c

@@ -6 +6 @@
 
         SelObj(obj)
-        int obj;
 
                 Select 'obj' as the current working object.
 
         SetPri(obj, pri)
-        int obj, pri;
 
                 Display object 'obj' with priority 'pri'.
 
         SetObj(obj, type, bank, base, xpix, ypix, x0, y0, flags, pri)
-        int obj, type, bank, xpix, ypix, x0, y0, flags, pri;
-        unsigned int *base;
 
                 Setup object 'obj' of type 'type' at 'base' in bank 'bank'
@@ -27 +23 @@
 
         CpyObj(from, to, w, h, sw)
-        unsigned int *from, *to;
-        int w, h, sw;
 
                 Copy a 'w'-word by 'h'-line object from 'from' to 'to' with
@@ -51 +45 @@
 #include "ram.h"
 
+typedef         void    (**intvec)(void);
+
 int16_t         wsize;          /* object width calculated by SetObj() */
 int16_t         vi_dis;         /* disable use of VIint */
@@ -96 +92 @@
 
         op = &v_obtab[obj];             /* point at the object table */
-        op->opri = pri;                 /* set the priority */
+        op->opri = (int8_t)pri;         /* set the priority */
 
         v_odtab[pri][0] = op->odtw0 | V_BLA;    /* start object as blanked */
         v_odtab[pri][1] = op->odtw1;
-        v_odtab[pri][2] = ((int32_t)op->obase >> 1) & 0xFFFF;
+        v_odtab[pri][2] = (uint16_t)(((int32_t)op->obase >> 1) & 0xFFFF);
 
         objon(pri, op->objy, op->ysize);        /* enable access table bits */
@@ -111 +107 @@
         vi_ctl |= (1u << pri);                  /* set unblank bit */
 
-        if (*((int32_t *)0x000064) NE &VIint)   /* make sure VI vector is set */
+        if (*(intvec)0x000064 NE &VIint)        /* make sure VI vector is set */
                 BIOS(B_SETV, 25, VIint);
 
@@ -142 +138 @@
         op->objy = y0;
         op->obase = base;
-        op->opri = pri;
+        op->opri = (int8_t)pri;
         op->obank = bank & 3;