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

ram/sqscan.c

@@ -15 +15 @@
 
 #if     CHEKSTOP
-short   chkstop = TRUE;
+int16_t chkstop = TRUE;
 #endif
 
-extern  short   notenum, notepit, curgrp, thescore, verbose;
-extern  short   testing;
-extern  short   sharp, endflg;
-
-extern  long    curtime, noteon, noteoff, noteval, noteper, nrest;
-extern  long    dvwork;
-
-char    *nlist[]  = { "a", "b", "c", "d", "e", "f", "g", NULL };
-
-int     notetab[] = { 0, 2, 3, 5, 7, 8, 10 };
-int     octab[]   = { 21, 33, 45, 57, 69, 81, 93, 105 };
+extern  int16_t notenum, notepit, curgrp, thescore, verbose;
+extern  int16_t testing;
+extern  int16_t sharp, endflg;
+
+extern  int32_t curtime, noteon, noteoff, noteval, noteper, nrest;
+extern  int32_t dvwork;
+
+int8_t  *nlist[]  = { "a", "b", "c", "d", "e", "f", "g", NULL };
+
+int16_t notetab[] = { 0, 2, 3, 5, 7, 8, 10 };
+int16_t octab[]   = { 21, 33, 45, 57, 69, 81, 93, 105 };
 
 /* 
@@ -40 +40 @@
 */
 
-void nospace(char *et)
+void nospace(int8_t *et)
 {
 
@@ -67 +67 @@
 */
 
-int Pcheck(struct s_entry *ptr, char *msg)
+int16_t Pcheck(struct s_entry *ptr, int8_t *msg)
 {
         register struct s_entry *cval;
@@ -94 +94 @@
         }
                 
-        cval = &spool[(long)MAX_SE-1];
+        cval = &spool[(int32_t)MAX_SE-1];
 
         if (ptr GT cval) {
@@ -119 +119 @@
 */
 
-struct n_entry *insnevt(struct n_entry *nsp, short nt, short grp, short note, short vel)
+struct n_entry *insnevt(struct n_entry *nsp, int16_t nt, int16_t grp, int16_t note, int16_t vel)
 {
         nsp->e_time  = t_cur;
@@ -140 +140 @@
 */
 
-int Qevent(void)
+int16_t Qevent(void)
 {
-        register int aux1, aux2, aux3, aux4, aux5;
-        register char *chptr;
+        register int16_t aux1, aux2, aux3, aux4, aux5;
+        register int8_t *chptr;
         register struct s_entry *tsp1, *tsp2;
         struct s_entry *tsp3;
@@ -858 +858 @@
 */
 
-int Qnote(void)
+int16_t Qnote(void)
 {
         struct n_entry *nsp1;
@@ -1026 +1026 @@
 */
 
-int Qadv(void)
+int16_t Qadv(void)
 {
         if (CM_CHR('.')) {      /* advance by 1 frame */
@@ -1070 +1070 @@
 */
 
-int Qseq(void)
+int16_t Qseq(void)
 {
         CM_DBLK;
@@ -1141 +1141 @@
 */
 
-int sqscan(char *ip)
+int16_t sqscan(int8_t *ip)
 {
         endflg = FALSE;