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

ram/sendval.c

@@ -27 +27 @@
 /* functions defined elsewhere */
 
-extern  unsigned        tofpu(unsigned time);
-
-extern  unsigned        setipl(unsigned arg);
-
-extern  short   amplval, ext_cv1, ext_cv2, ext_cv3, ext_cv4, ext_mod;
-extern  short   lstbgnc, lstendc, ps_intn, ps_rate, ps_dpth, sliders;
-
-extern  short   lastart[];
-extern  short   dyntab[];
-extern  short   expbit[];
-extern  short   fnoff[];
-extern  short   fp_resv[];
-extern  short   grpdyn[];
-extern  short   grploc[];
-extern  short   lastvce[];
-extern  short   prstab[];
-extern  short   vce2grp[];
-extern  short   vce2trg[];
-extern  short   veltab[];
-
-extern  short   sigtab[128][2];
-
-extern  char    keystat[];
-extern  char    mpsust[];
-extern  char    trgtab[];
+extern  uint16_t        tofpu(uint16_t time);
+
+extern  uint16_t        setipl(uint16_t arg);
+
+extern  int16_t amplval, ext_cv1, ext_cv2, ext_cv3, ext_cv4, ext_mod;
+extern  int16_t lstbgnc, lstendc, ps_intn, ps_rate, ps_dpth, sliders;
+
+extern  int16_t lastart[];
+extern  int16_t dyntab[];
+extern  int16_t expbit[];
+extern  int16_t fnoff[];
+extern  int16_t fp_resv[];
+extern  int16_t grpdyn[];
+extern  int16_t grploc[];
+extern  int16_t lastvce[];
+extern  int16_t prstab[];
+extern  int16_t vce2grp[];
+extern  int16_t vce2trg[];
+extern  int16_t veltab[];
+
+extern  int16_t sigtab[128][2];
+
+extern  int8_t  keystat[];
+extern  int8_t  mpsust[];
+extern  int8_t  trgtab[];
 
 extern  struct  n_entry *lstbgns[NLSTENTS];
@@ -66 +66 @@
 */
 
-void sendval(short voice, short par, short ival)
+void sendval(int16_t voice, int16_t par, int16_t ival)
 {
-        register unsigned *fpu;
-        register short oldi, val;
-        register long ltmp;
-        short nop;
+        register uint16_t *fpu;
+        register int16_t oldi, val;
+        register int32_t ltmp;
+        int16_t nop;
 
         fpu = io_fpu + FPU_OFNC + (voice << 8) + (par << 4);
@@ -92 +92 @@
         case 10:        /* filter */
 
-                ltmp = ((long)ival >> 1) + ((long)ival >>2);
-
-                if (ltmp GT (long)VALMAX)
-                        ltmp = (long)VALMAX;
-                else if (ltmp LT (long)VALMIN)
-                        ltmp = (long)VALMIN;
-
-                val = (short)ltmp;
+                ltmp = ((int32_t)ival >> 1) + ((int32_t)ival >>2);
+
+                if (ltmp GT (int32_t)VALMAX)
+                        ltmp = (int32_t)VALMAX;
+                else if (ltmp LT (int32_t)VALMIN)
+                        ltmp = (int32_t)VALMIN;
+
+                val = (int16_t)ltmp;
                 break;
 /* 
@@ -106 +106 @@
         case 2:         /* level */
 
-                val = (((short)ival >> 5) - 500) << 6;
+                val = (((int16_t)ival >> 5) - 500) << 6;
                 break;
 
@@ -118 +118 @@
 /* ++++++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++ */
 
-        *(fpu + (long)FPU_TNV0) = val;
+        *(fpu + (int32_t)FPU_TNV0) = val;
         ++nop;  ++nop;  ++nop;
-        *(fpu + (long)FPU_TNV1) = val;
+        *(fpu + (int32_t)FPU_TNV1) = val;
         ++nop;  ++nop;  ++nop;
-        *(fpu + (long)FPU_TCTL) = 0x0015;
+        *(fpu + (int32_t)FPU_TCTL) = 0x0015;
 
         setipl(oldi);
@@ -140 +140 @@
 */
 
-void clearer(short stat, short sig)
+void clearer(int16_t stat, int16_t sig)
 {
-        register unsigned *fpu;
-        register unsigned fpexp, fpmant, fptime;
-        register short oldi, i;
-        short nop, olds;
+        register uint16_t *fpu;
+        register uint16_t fpexp, fpmant, fptime;
+        register int16_t oldi, i;
+        int16_t nop, olds;
 
         if (stat) {