Changeset fa50076 in buchla-68k

Timestamp:

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

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

26553e2

Parents:

c93e44d

Message:

Fixed initi.c.

Files:

• include/instdsp.h (modified) (2 diffs)
• ram/etitim.c (modified) (1 diff)
• ram/im700.c (modified) (1 diff)
• ram/im700.x (modified) (1 diff)
• ram/initi.c (modified) (6 diffs)
• ram/initi.x (modified) (1 diff)

include/instdsp.h

@@ -124 +124 @@
 struct  instpnt {       /* function point definition */
 
-        int16_t iptim;          /* time (packed) */
-        int16_t ipval;          /* value */
-        int16_t ipvmlt;         /* value multiplier */
-
-        int8_t  ipvsrc;         /* value source */
-        int8_t  ipact;          /* action code */
+        uint16_t        iptim;  /* time (packed) */
+        int16_t         ipval;  /* value */
+        int16_t         ipvmlt; /* value multiplier */
+
+        int8_t          ipvsrc; /* value source */
+        int8_t          ipact;  /* action code */
 
 #define AC_NULL         0       /* null action */
@@ -140 +140 @@
 #define AC_UNDF         7       /* -- undefined - treated as AC_NULL -- */
 
-        int8_t  ippar1;         /* action parameter 1  (point) */
-        int8_t  ippar2;         /* action parameter 2  (count) */
-
-        int8_t  ippar3;         /* action parameter 3  (counter) */
-        int8_t  ippad;          /* padding for even boundary */
+        int8_t          ippar1; /* action parameter 1  (point) */
+        int8_t          ippar2; /* action parameter 2  (count) */
+
+        int8_t          ippar3; /* action parameter 3  (counter) */
+        int8_t          ippad;  /* padding for even boundary */
 };
 

ram/etitim.c

@@ -72 +72 @@
                 subj, pecase, temin, tmpval, temax);
 #endif
-        if (tmpval > (uint16_t)temax)
+        if (tmpval > temax)
                 return(FAILURE);
 
-        if (tmpval < (uint16_t)temin)
+        if (tmpval < temin)
                 return(FAILURE);
 

ram/im700.c

@@ -200 +200 @@
 int16_t         tagslot;                /* tagged load slot */
 int16_t         tdnamsw;                /* tuning editor displaying typewriter */
-int16_t         temax;                  /* time upper limit */
-int16_t         temin;                  /* time lower limit */
+uint16_t        temax;                  /* time upper limit */
+uint16_t        temin;                  /* time lower limit */
 int16_t         testing;                /* test level */
 int16_t         tglclk;                 /* clock on/off toggle flag */

ram/im700.x

@@ -314 +314 @@
 extern  int16_t         tdnamsw;
 extern  struct  octent  *tdoct;
-extern  int16_t         temax;
-extern  int16_t         temin;
+extern  uint16_t        temax;
+extern  uint16_t        temin;
 extern  int16_t         testing;
 extern  int16_t         tglclk;

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));
         }
 }

ram/initi.x

@@ -34 +34 @@
 extern  void            newvce(int16_t voice);
 extern  void            pntsel(void);
-extern  int16_t         segtime(int16_t pn, uint16_t ptime);
+extern  uint16_t        segtime(int16_t pn, uint16_t ptime);
 extern  int16_t         selpnt(void);
 extern  void            setinst(void);
 extern  void            setivce(int16_t voice);
 extern  void            setseg(int16_t pn, uint16_t ptime);
-extern  int16_t         timeto(int16_t fn, int16_t pj);
+extern  uint16_t        timeto(int16_t fn, int16_t pj);
 extern  int16_t         ttox(uint16_t time, int16_t window);
 extern  int16_t         vtoy(int16_t val, int16_t window);