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

ram/etiosc.c

@@ -20 +20 @@
 
 extern  void    advicur(void);
-extern  void    dosync(short vce);
-
-extern  char    *strcpy(char *s1, char *s2);
+extern  void    dosync(int16_t vce);
+
+extern  int8_t  *strcpy(int8_t *s1, int8_t *s2);
 
 /* variables defined elsewhere */
 
-extern  short   stcrow, stccol, curvce;
-
-extern  short   idbox[][8];
-
-extern  unsigned        *instob;
-
-extern  char    dspbuf[];
+extern  int16_t stcrow, stccol, curvce;
+
+extern  int16_t idbox[][8];
+
+extern  uint16_t        *instob;
+
+extern  int8_t  dspbuf[];
 
 extern  struct  instdef vbufs[];
 
-extern  short   cents, bform;
+extern  int16_t cents, bform;
 
 /* 
@@ -45 +45 @@
 
 /*                  C  C# D  D# E  F  F# G  G# A  A# B  */
-short   notes[]  = {2, 2, 3, 3, 4, 5, 5, 6, 6, 0, 0, 1};
+int16_t notes[]  = {2, 2, 3, 3, 4, 5, 5, 6, 6, 0, 0, 1};
 
 /*                      A     B     C     D     E     F     G   */
-short   pitches[] = { 900, 1100,    0,  200,  400,  500,  700};
+int16_t pitches[] = { 900, 1100,    0,  200,  400,  500,  700};
 
 #include "ratio.h"      /* short ratio[]; */
 
 /*                  C  C# D  D# E  F  F# G  G# A  A# B  */
-short   sharps[] = {7, 9, 7, 9, 7, 7, 9, 7, 9, 7, 9, 7};
-
-short   shrpflt[] = {  0, -100,    100};
-
-char    sfdsp[]   = {' ', D_FLAT,  D_SHARP};
-
-static  char    intstr[] = "+0000";
-static  char    ratstr[] = "1/1";
-static  char    frqstr[] = "00.0";
-static  char    pchstr[] = "0C 00";
-
-short   ndvals[10] = {0, 0, 1200, 1902, 2400, 2786, 3102, 3369, 3600, 3804};
+int16_t sharps[] = {7, 9, 7, 9, 7, 7, 9, 7, 9, 7, 9, 7};
+
+int16_t shrpflt[] = {  0, -100,    100};
+
+int8_t  sfdsp[]   = {' ', D_FLAT,  D_SHARP};
+
+static  int8_t  intstr[] = "+0000";
+static  int8_t  ratstr[] = "1/1";
+static  int8_t  frqstr[] = "00.0";
+static  int8_t  pchstr[] = "0C 00";
+
+int16_t ndvals[10] = {0, 0, 1200, 1902, 2400, 2786, 3102, 3369, 3600, 3804};
 
 
@@ -77 +77 @@
 */
 
-void int2rat(short rat)
-{
-        register short den, inum, num;
+void int2rat(int16_t rat)
+{
+        register int16_t den, inum, num;
 
         ebuf[0] = '1';
@@ -112 +112 @@
 */
 
-void cnvc2p(char *buf, short cv)
-{
-        short   rem, tmp;
+void cnvc2p(int8_t *buf, int16_t cv)
+{
+        int16_t rem, tmp;
 
         cv -= 160;
@@ -147 +147 @@
 */
 
-short cnvp2c(void)
+int16_t cnvp2c(void)
 {
         if (ebuf[0] EQ 9)               /* high limit is C9 00 */
@@ -174 +174 @@
 */
 
-short et_iosc(short nn)
+int16_t et_iosc(int16_t nn)
 {
         register struct instdef *ip;
-        register short val, ctl, fh, fl, v;
+        register int16_t val, ctl, fh, fl, v;
 
         v = (nn >> 8) & 0x03;
@@ -258 +258 @@
 */
 
-void setoval(struct instdef *ip, short v, short val)
+void setoval(struct instdef *ip, int16_t v, int16_t val)
 {
         switch (v) {
@@ -301 +301 @@
 */
 
-short ef_iosc(short nn)
+int16_t ef_iosc(int16_t nn)
 {
         register struct instdef *ip;
-        register short v, i, tmp;
+        register int16_t v, i, tmp;
 
         v = (nn >> 8) & 3;
@@ -375 +375 @@
 */
 
-short rd_iosc(short nn)
+int16_t rd_iosc(int16_t nn)
 {
         register struct instdef *ip;
-        register short val, ctl, fh, fl, v;
-        short n;
-        char ocs;
+        register int16_t val, ctl, fh, fl, v;
+        int16_t n;
+        int8_t ocs;
 
         v = (nn >> 8) & 0x03;
@@ -475 +475 @@
 */
 
-void setoscb(short n, short v)
+void setoscb(int16_t n, int16_t v)
 {
         register struct instdef *ip;
-        register short bfm, ctl, val;
-        register char ocs;
+        register int16_t bfm, ctl, val;
+        register int8_t ocs;
 
         ip = &vbufs[curvce];
@@ -594 +594 @@
 */
 
-void setosyn(short n, short v, short t)
+void setosyn(int16_t n, int16_t v, int16_t t)
 {
         register struct instdef *ip;
-        register char *sc;
+        register int8_t *sc;
 
         ip = &vbufs[curvce];
@@ -647 +647 @@
 */
 
-short nd_iosc(short nn, short k)
-{
-        register short v, n;
+int16_t nd_iosc(int16_t nn, int16_t k)
+{
+        register int16_t v, n;
 
         n = nn & 0xFF;