Changeset fa50076 in buchla-68k for ram/initi.c

Timestamp:

11/12/2017 07:08:44 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

26553e2

Parents:

c93e44d

Message:

Fixed initi.c.

File:

• ram/initi.c (modified) (6 diffs)

ram/initi.c

@@ -58 +58 @@
 */
 
-int16_t segtime(int16_t pn, uint16_t ptime)
+uint16_t segtime(int16_t pn, uint16_t ptime)
 {
         register struct instpnt *pp;
@@ -102 +102 @@
 */
 
-int16_t timeto(int16_t fn, int16_t pj)
+uint16_t timeto(int16_t fn, int16_t pj)
 {
         register struct instdef *ip;
         register struct instpnt *pt;
-        register int16_t tf, pm, pn;
+        register int16_t pm, pn;
+        uint16_t tf;
 
         ip = &vbufs[curvce];
@@ -423 +424 @@
 void initi(struct instdef *ip)
 {
-        register int16_t i, mintfpu, rb;
+        int16_t i, rb;
+        uint16_t mintfpu;
 
         memsetw(ip, 0, sizeof (struct instdef) / 2);
@@ -433 +435 @@
 
         ip->idhplft = NIPNTS - NFINST;
-        ip->idhcfg = (initcfg >> 8) & 0x00FF;
+        ip->idhcfg = (int8_t)((initcfg >> 8) & 0x00FF);
         mintfpu = tofpu(1);
 
@@ -442 +444 @@
                 rb = ((i < 4) AND (i NE 0)) ? 0 : I_NRATIO;
                 ip->idhfnc[i].idfpif = 1;
-                ip->idhfnc[i].idfpt1 = i;
-                ip->idhfnc[i].idftmd = (I_TM_KEY | 0x0010) | rb;
+                ip->idhfnc[i].idfpt1 = (int8_t)i;
+                ip->idhfnc[i].idftmd = (int8_t)((I_TM_KEY | 0x0010) | rb);
 
                 /* initialize the first point in the function */
@@ -453 +455 @@
         for (i = 0; i < NUMWPNT; i++) {
 
-                ip->idhwvaf[i] = (ip->idhwvao[i] = 0x8000 ^ ((i + 1) << 8));
-                ip->idhwvbf[i] = (ip->idhwvbo[i] = 0x8000 ^ ((i + 1) << 8));
+                ip->idhwvaf[i] = (ip->idhwvao[i] = (int16_t)0x8000 ^ ((i + 1) << 8));
+                ip->idhwvbf[i] = (ip->idhwvbo[i] = (int16_t)0x8000 ^ ((i + 1) << 8));
         }
 }