Changeset 2340de6 in buchla-68k for ram/im700.x

Timestamp:

07/10/2017 09:06:56 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

4aa78b2

Parents:

526a993

Message:

Keep macros in external declarations.

File:

• ram/im700.x (modified) (14 diffs)

ram/im700.x

@@ -11 +11 @@
 #include "instdsp.h"
 #include "libdsp.h"
+#include "midas.h"
 #include "objdefs.h"
 #include "score.h"
@@ -38 +39 @@
 extern  int16_t         asgmod;
 extern  uint16_t        *asgob;
-extern  struct  asgent  asgtab[100];
+extern  struct  asgent  asgtab[NASGS];
 extern  int16_t         asig;
 extern  int16_t         asmode;
@@ -113 +114 @@
 extern  int16_t         ext_cv4;
 extern  int16_t         ext_mod;
-extern  struct  fcat    filecat[20];
+extern  struct  fcat    filecat[FCMAX];
 extern  struct  gdsel   *gdfsep;
-extern  struct  gdsel   gdfsl[256];
-extern  struct  gdsel   *gdstbc[17];
-extern  struct  gdsel   *gdstbn[17];
-extern  struct  gdsel   *gdstbp[17];
+extern  struct  gdsel   gdfsl[MAXFSL];
+extern  struct  gdsel   *gdstbc[NGDSEL];
+extern  struct  gdsel   *gdstbn[NGDSEL];
+extern  struct  gdsel   *gdstbp[NGDSEL];
 extern  int16_t         gomode;
 extern  int16_t         grp2prt[12][2];
@@ -127 +128 @@
 extern  int16_t         hitcx;
 extern  int16_t         hitcy;
-extern  struct  s_entry *hplist[20][12];
+extern  struct  s_entry *hplist[N_SCORES][N_TYPES];
 extern  int16_t         idcfsw;
-extern  struct  instdef idefs[41];
+extern  struct  instdef idefs[NINST];
 extern  int16_t         idimsw;
 extern  int16_t         idintmp;
@@ -172 +173 @@
 extern  int16_t         lseqsw;
 extern  int16_t         lstbgnc;
-extern  struct  n_entry *lstbgns[48];
+extern  struct  n_entry *lstbgns[NLSTENTS];
 extern  int16_t         lstendc;
-extern  struct  n_entry *lstends[48];
+extern  struct  n_entry *lstends[NLSTENTS];
 extern  int16_t         lstflag;
 extern  int16_t         lstrsw;
@@ -197 +198 @@
 extern  struct  nevent  *nefree;
 extern  struct  nevent  *nelist;
-extern  struct  nevent  nevents[32];
+extern  struct  nevent  nevents[NNEVTS];
 extern  int16_t         newflag;
 extern  int16_t         nkdown;
@@ -241 +242 @@
 extern  int16_t         pecase;
 extern  struct  s_entry *peg;
-extern  struct  pflent  pfents[336];
+extern  struct  pflent  pfents[NPFENTS];
 extern  struct  pflent  *pflist;
 extern  struct  pflent  *pfqhdr;
@@ -258 +259 @@
 extern  int16_t         sbase;
 extern  int16_t         scmctl;
-extern  struct  s_entry *scores[20];
+extern  struct  s_entry *scores[N_SCORES];
 extern  struct  s_entry *scp;
 extern  uint16_t        scrl;
@@ -268 +269 @@
 extern  int16_t         sdmrow;
 extern  int16_t         se;
-extern  struct  s_entry *seclist[20][20];
+extern  struct  s_entry *seclist[N_SCORES][N_SECTS];
 extern  int16_t         secop;
 extern  int16_t         secopok;
@@ -275 +276 @@
 extern  int16_t         sharp;
 extern  int16_t         sigtab[128][2];
-extern  struct  scndx   sindex[20];
+extern  struct  scndx   sindex[N_SCORES];
 extern  struct  s_entry *size1;
 extern  struct  s_entry *size2;
@@ -291 +292 @@
 extern  int16_t         stepint;
 extern  int16_t         stepwgt;
-extern  struct  s_time  stimes[20][20];
+extern  struct  s_time  stimes[N_SCORES][N_SECTS];
 extern  int16_t         subj;
 extern  int16_t         submenu;
@@ -332 +333 @@
 extern  int16_t         ttsel3;
 extern  int16_t         tuneval;
-extern  int16_t         tunlib[10][128];
+extern  int16_t         tunlib[NTUNS][128];
 extern  int16_t         tunmod;
 extern  uint16_t        *tunob;
@@ -345 +346 @@
 extern  int16_t         tylast;
 extern  int16_t         tystop;
-extern  struct  valent  valents[12 << 4];
+extern  struct  valent  valents[NGPSRS];
 extern  int16_t         varmode[8][16];
 extern  struct  instdef vbufs[12];
@@ -387 +388 @@
 extern  int16_t         wpntsv;
 extern  int16_t         wshmax;
-extern  struct  wstbl   wslib[20];
+extern  struct  wstbl   wslib[NUMWAVS];
 extern  int16_t         wsnmod[12][2];
 extern  int16_t         wvlast;