Changeset b2691c2 in buchla-68k for ram

Timestamp:

11/12/2017 08:39:18 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

ffce2bc

Parents:

6d5247b

Message:

Fixed wsdsp.c.

File:

• ram/wsdsp.c (modified) (4 diffs)

ram/wsdsp.c

@@ -85 +85 @@
         register int16_t *fv, *hv, *ov;
         register int16_t i;
-        int16_t cx;
+        uint16_t cx;
 
         cx = exp_c(wdbox[0][0]);
@@ -131 +131 @@
 void wdswin(int16_t n)
 {
-        register int16_t cx, wval;
-        register int8_t wsgn;
-
-        cx = wdbox[n][5];
-        cx |= cx << 4;
-        cx |= cx << 8;
+        uint16_t cx;
+        int16_t wval;
+        int8_t wsgn;
+
+        cx = exp_c(wdbox[n][5]);
 
         /* first, fill the box with the background color */
@@ -166 +165 @@
                 sprintf(bfs, "%02d", curwave + 1);
                 tsplot4(waveob, 64,
-                        exp_c(wsnmod[curvce][curwslt] ? WS_CHGC : wdbox[n][4]),
+                        wsnmod[curvce][curwslt] ? WS_CHGC : wdbox[n][4],
                         wdbox[n][6], wdbox[n][7] + WAVE_OFF, bfs, 14);
 
@@ -367 +366 @@
                 for (j = 0; j < NUMWPNT; j++) {
 
-                        wslib[i].final[j]  = ((j + 1) << 8) ^ 0x8000;
-                        wslib[i].offset[j] = ((j + 1) << 8) ^ 0x8000;
+                        wslib[i].final[j]  = ((j + 1) << 8) ^ (int16_t)0x8000;
+                        wslib[i].offset[j] = ((j + 1) << 8) ^ (int16_t)0x8000;
                 }