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

ram/stmproc.c

@@ -24 +24 @@
 #include "ptdisp.h"
 
-extern  short   ptegood, ptedfok, ptestok, ptedsok, ptedtok;
-
-extern  short   ptedef, ptestm, ptespec, ptesuba, ptedat1;
-
-extern  short   pteset;
-
-extern  short   ptecpos, ptepred, ptesucc;
+extern  int16_t ptegood, ptedfok, ptestok, ptedsok, ptedtok;
+
+extern  int16_t ptedef, ptestm, ptespec, ptesuba, ptedat1;
+
+extern  int16_t pteset;
+
+extern  int16_t ptecpos, ptepred, ptesucc;
 
 extern  struct patch    ptebuf;
 
-extern  char    ptdebuf[];
+extern  int8_t  ptdebuf[];
 
 #if     DEBUGDP
@@ -62 +62 @@
 #endif
 
-unsigned short  dtfree;                 /* defent free list index */
-unsigned short  ptfree;                 /* patch free list index */
-
-unsigned short  dpepred;                /* defent predecessor index */
-unsigned short  dpecpos;                /* current defent index */
-unsigned short  dpesucc;                /* defent successor index */
-
-char    ptdsbuf[50];                    /* patch display build buffer */
-
-char    defptr[NDEFSTMS];               /* definition index table */
-char    stmptr[NDEFSTMS];               /* stimulus index table */
+uint16_t        dtfree;                 /* defent free list index */
+uint16_t        ptfree;                 /* patch free list index */
+
+uint16_t        dpepred;                /* defent predecessor index */
+uint16_t        dpecpos;                /* current defent index */
+uint16_t        dpesucc;                /* defent successor index */
+
+int8_t  ptdsbuf[50];                    /* patch display build buffer */
+
+int8_t  defptr[NDEFSTMS];               /* definition index table */
+int8_t  stmptr[NDEFSTMS];               /* stimulus index table */
 
 struct  defent  defents[RAWDEFS];       /* definition control table */
@@ -80 +80 @@
 struct  wordq   ptefifo;                /* patch trigger fifo header */
 
-unsigned short  ptewrds[NPTEQELS];      /* patch trigger fifo entries */
-
-char    dmatch[] = {                    /* addat1 match tags */
+uint16_t        ptewrds[NPTEQELS];      /* patch trigger fifo entries */
+
+int8_t  dmatch[] = {                    /* addat1 match tags */
 
         0, 0, 0, 0, 0, 0, 0, 0,         /*  0 ..  7 */
@@ -102 +102 @@
 void initpt(void)
 {
-        register unsigned short i;
+        register uint16_t i;
 
         /* initialize the trigger fifo */
@@ -142 +142 @@
 */
 
-unsigned short pt_alc(void)
-{
-        register unsigned short pe;
+uint16_t pt_alc(void)
+{
+        register uint16_t pe;
 
         if (0 NE (pe = ptfree))
@@ -158 +158 @@
 */
 
-void pt_del(unsigned short pe)
+void pt_del(uint16_t pe)
 {
         patches[pe].nextstm = ptfree;
@@ -174 +174 @@
 */
 
-unsigned short dt_alc(void)
-{
-        register unsigned short de;
+uint16_t dt_alc(void)
+{
+        register uint16_t de;
 
         if (0 NE (de = dtfree))
@@ -190 +190 @@
 */
 
-void dt_del(unsigned short de)
+void dt_del(uint16_t de)
 {
         defents[de].nextdef = dtfree;
@@ -211 +211 @@
 */
 
-short cprdpe(unsigned short np)
-{
-        register unsigned short ca, cb, ct;
+int16_t cprdpe(uint16_t np)
+{
+        register uint16_t ca, cb, ct;
         register struct defent *pp;
 
@@ -274 +274 @@
 */
 
-short finddpe(void)
-{
-        register unsigned short c, idef;
+int16_t finddpe(void)
+{
+        register uint16_t c, idef;
 
         dpepred = 0;            /* initialize dpepred = 0  (no predecessor) */
@@ -370 +370 @@
 */
 
-short cprpte(unsigned short np)
-{
-        register unsigned short ca, cb, ct;
+int16_t cprpte(uint16_t np)
+{
+        register uint16_t ca, cb, ct;
         register struct patch *pb, *pp;
 
@@ -440 +440 @@
 */
 
-short findpte(void)
-{
-        register unsigned short c, istim;
+int16_t findpte(void)
+{
+        register uint16_t c, istim;
 
         ptepred = 0;            /* initialize ptepred = 0  (no predecessor) */
@@ -533 +533 @@
 void entrpte(void)
 {
-        register short c;
-        register unsigned short np, stim;
+        register int16_t c;
+        register uint16_t np, stim;
 
         ptegood = ptedfok AND ptestok AND ptedsok AND ptedtok;
@@ -711 +711 @@
 */
 
-short find1st(void)
-{
-        register short cp, pp;
+int16_t find1st(void)
+{
+        register int16_t cp, pp;
 
         for (cp = 0; cp < NDEFSTMS; cp++)
@@ -728 +728 @@
 */
 
-short findnxt(short cp)
-{
-        register short np, stim;
+int16_t findnxt(int16_t cp)
+{
+        register int16_t np, stim;
 
         if (0 NE (np = patches[cp].nextstm))
@@ -754 +754 @@
 */
 
-short findprv(short cp)
-{
-        register short np, pp, stim;
+int16_t findprv(int16_t cp)
+{
+        register int16_t np, pp, stim;
 
         if (0 NE (np = patches[cp].prevstm))    /* return prevstm if set */
@@ -789 +789 @@
 */
 
-void dpte(short pe, short row, short atr)
-{
-        register short i;
+void dpte(int16_t pe, int16_t row, int16_t atr)
+{
+        register int16_t i;
 
         memset(ptdsbuf, ' ', 50);
@@ -824 +824 @@
 void dptw(void)
 {
-        register short cp, r, row, pp;
+        register int16_t cp, r, row, pp;
 
 #if     DEBUGDP
@@ -979 +979 @@
 void srdspte(void)
 {
-        short   oldcpos, oldpred, oldsucc;
+        int16_t oldcpos, oldpred, oldsucc;
 #if     DEBUGSR
         register short i;
@@ -1064 +1064 @@
 */
 
-void stmproc(unsigned short trg)
+void stmproc(uint16_t trg)
 {
         register struct defent  *nextdef;
         register struct patch   *nextpch;
-        register unsigned short adspec, adsuba, np, stim;
-        unsigned short addat1, adrtag;
+        register uint16_t adspec, adsuba, np, stim;
+        uint16_t addat1, adrtag;
 
         /* ***** DEFINER PROCESSING PHASE ***** */