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

ram/sqexec.c

@@ -34 +34 @@
 #endif
 
-extern  unsigned        setsr(unsigned sr);
-extern  long    rand24(void);
-
-extern  char            trgtab[];
-
-extern  short           curslin;
-extern  short           dsp_ok;
-extern  short           ndisp;
-
-extern  unsigned short  seqdupd;
-
-extern  unsigned        *obj10;
-
-extern  int             cg3[][256];
+extern  uint16_t        setsr(uint16_t sr);
+extern  int32_t rand24(void);
+
+extern  int8_t          trgtab[];
+
+extern  int16_t         curslin;
+extern  int16_t         dsp_ok;
+extern  int16_t         ndisp;
+
+extern  uint16_t        seqdupd;
+
+extern  uint16_t        *obj10;
+
+extern  int16_t         cg3[][256];
 
 extern  struct wordq    ptefifo;
 
-short   seqdspn;
-
-short   rtab[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F,
+int16_t seqdspn;
+
+int16_t rtab[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F,
                    0x003F, 0x003F, 0x003F };
 
@@ -66 +66 @@
 */
 
-unsigned short evaltv(unsigned short dat)
+uint16_t evaltv(uint16_t dat)
 {
         switch (SQ_MTYP & dat) {
@@ -84 +84 @@
         case SQ_RND:    /* random number */
 
-                return((short)rand24() & rtab[SQ_MVAL & dat]);
+                return((int16_t)rand24() & rtab[SQ_MVAL & dat]);
 
         default:        /* something weird got in here ... */
@@ -102 +102 @@
 */
 
-short dosqact(unsigned short seq, unsigned short act, unsigned short dat)
+int16_t dosqact(uint16_t seq, uint16_t act, uint16_t dat)
 {
-        register unsigned short obj, val;
-        register short sv;
+        register uint16_t obj, val;
+        register int16_t sv;
 
         obj = (SQ_MOBJ & act) >> 8;
@@ -269 +269 @@
 */
 
-void sqexec(unsigned short seq)
+void sqexec(uint16_t seq)
 {
-        register unsigned short act, dat, line;
+        register uint16_t act, dat, line;
         register struct seqent *sp;
-        register short rc;
+        register int16_t rc;
 
         line = seqline[seq];
@@ -354 +354 @@
 void seqproc(void)
 {
-        register unsigned short oldsr, seq;
-        register short dspn;
-        register unsigned short *fp;
-        char  linbuf[66];
+        register uint16_t oldsr, seq;
+        register int16_t dspn;
+        register uint16_t *fp;
+        int8_t  linbuf[66];
 
         if (0 EQ timers[SQTIMER]) {