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

ram/wscalc.c

@@ -18 +18 @@
 #define WAVESMIN        1023
 
-extern  short   curwhrm;
+extern  int16_t curwhrm;
 
-extern  long    hwave[NUMWPCAL];
+extern  int32_t hwave[NUMWPCAL];
 
-extern  short   offsets[NUMWPCAL];
-extern  short   vmtab[NUMHARM];
-extern  short   wsbuf[NUMWPCAL];
+extern  int16_t offsets[NUMWPCAL];
+extern  int16_t vmtab[NUMHARM];
+extern  int16_t wsbuf[NUMWPCAL];
 
-extern  long    vknm[NUMHARM][NUMWPCAL];
+extern  int32_t vknm[NUMHARM][NUMWPCAL];
 
 #include "knmtab.h"             /* short knmtab[NUMHARM][NUMWPCAL]; */
@@ -40 +40 @@
 */
 
-void adj(short wshar)
+void adj(int16_t wshar)
 {
-        register short wspnt;
-        register long harval;
-        register short *kp;
-        register long *vp;
+        register int16_t wspnt;
+        register int32_t harval;
+        register int16_t *kp;
+        register int32_t *vp;
 
         vp = &vknm[wshar][0];
@@ -77 +77 @@
 void wadj(void)
 {
-        register short wshar;
+        register int16_t wshar;
 
         for (wshar = 0; wshar < NUMHARM; wshar++)
@@ -108 +108 @@
 void wscalc(void)
 {
-        register short wspnt, wshar;
-        register long hfac, hmax, temp;
+        register int16_t wspnt, wshar;
+        register int32_t hfac, hmax, temp;
 
         hmax = WAVESMIN;        /* set minimum scaling value */
@@ -132 +132 @@
         /* calculate the scale factor */
 
-        hfac = ((long)WAVESMAX << 16) / hmax;
+        hfac = ((int32_t)WAVESMAX << 16) / hmax;
 
         /* scale the waveshape */