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

ram/ptfield.c

@@ -39 +39 @@
 extern  void    (*premove)(void);
 extern  void    (*pstmove)(void);
-extern  short   (*curtype)(void);
-
-extern  unsigned        fromfpu(unsigned fputime);
+extern  int16_t (*curtype)(void);
+
+extern  uint16_t        fromfpu(uint16_t fputime);
 
 extern  void    select(void);
 extern  void    nokey(void);
-extern  short   nonf(short k);
-extern  short   stdctp5(void);
+extern  int16_t nonf(int16_t k);
+extern  int16_t stdctp5(void);
 extern  void    cxkstd(void);
 extern  void    cykstd(void);
 extern  void    stdmkey(void);
-extern  void    stddkey(short k);
+extern  void    stddkey(int16_t k);
 extern  void    stopcm(void);
 extern  void    smxupd(void);
 extern  void    smyupd(void);
 extern  void    aftercm(void);
-extern  void    ptdkey(short k);
-
-extern  short   astat;
-extern  short   chtime;
-extern  short   chwait;
-extern  short   cmfirst;
-extern  short   cmtype;
-extern  short   curhold;
-extern  short   cvtime;
-extern  short   cvwait;
-extern  short   ncvwait;
-extern  short   ptbflag;
-extern  short   ptecpos;
-extern  short   ptedef;
-extern  short   ptedfok;
-extern  short   pteset;
-extern  short   ptestm;
-extern  short   ptestok;
-extern  short   ss_ptsw;
-extern  short   ss_sqsw;
-extern  short   stccol;
-extern  short   stcrow;
-extern  short   syrate;
-extern  short   tvcwval;
-extern  short   vcwval;
-
-extern  short   crate1[];
-
-extern  char    ptdebuf[];
+extern  void    ptdkey(int16_t k);
+
+extern  int16_t astat;
+extern  int16_t chtime;
+extern  int16_t chwait;
+extern  int16_t cmfirst;
+extern  int16_t cmtype;
+extern  int16_t curhold;
+extern  int16_t cvtime;
+extern  int16_t cvwait;
+extern  int16_t ncvwait;
+extern  int16_t ptbflag;
+extern  int16_t ptecpos;
+extern  int16_t ptedef;
+extern  int16_t ptedfok;
+extern  int16_t pteset;
+extern  int16_t ptestm;
+extern  int16_t ptestok;
+extern  int16_t ss_ptsw;
+extern  int16_t ss_sqsw;
+extern  int16_t stccol;
+extern  int16_t stcrow;
+extern  int16_t syrate;
+extern  int16_t tvcwval;
+extern  int16_t vcwval;
+
+extern  int16_t crate1[];
+
+extern  int8_t  ptdebuf[];
 
 extern  struct  selbox  *csbp;
@@ -98 +98 @@
 */
 
-char    *trdata[] = {   "Trans", "Stop ", "Start"        };
-char    *ssdata[] = {   "Stop ", "Start" };
-
-char    *stdata[] = {   "Srce" , "Mult", "Time", "Valu", "Func" };
-
-char    *smdata[] = {
+int8_t  *trdata[] = {   "Trans", "Stop ", "Start"        };
+int8_t  *ssdata[] = {   "Stop ", "Start" };
+
+int8_t  *stdata[] = {   "Srce" , "Mult", "Time", "Valu", "Func" };
+
+int8_t  *smdata[] = {
 
         "     ",        /* SM_NONE      0       No source - always 0 */
@@ -158 +158 @@
 void ptmkey(void)
 {
-        register short nc;
+        register int16_t nc;
 
         if (astat) {
@@ -214 +214 @@
 void ptekey(void)
 {
-        register short nc;
+        register int16_t nc;
 
         if (astat) {
@@ -270 +270 @@
 void ptxkey(void)
 {
-        register short i, cp, pp, sp, stm;
+        register int16_t i, cp, pp, sp, stm;
 
         if (NOT astat)                          /* only on key closures ... */
@@ -427 +427 @@
 */
 
-void dspdfst(char *buf, unsigned short val)
+void dspdfst(int8_t *buf, uint16_t val)
 {
-        register unsigned short chan, port, stim;
+        register uint16_t chan, port, stim;
 
         if (val EQ NULL_DEF) {          /* handle possible blank definer */
@@ -505 +505 @@
 */
 
-char *dfpdat(struct patch *pp)
+int8_t *dfpdat(struct patch *pp)
 {
-        static char buf[32];
-        unsigned short sgn, vp1, vp2;
-        short val;
+        static int8_t buf[32];
+        uint16_t sgn, vp1, vp2;
+        int16_t val;
 
         val = pp->padat2;
@@ -603 +603 @@
 */
 
-void pafpu1(char *bf, char *ad, unsigned short gt, unsigned short gn, struct patch *pp)
+void pafpu1(int8_t *bf, int8_t *ad, uint16_t gt, uint16_t gn, struct patch *pp)
 {
         sprintf(bf, "%s %s %c%c %s", ad, stdata[pp->padat1], gt, gn, dfpdat(pp));
@@ -616 +616 @@
 */
 
-void pafpu2(char *bf, char *ad, unsigned short os, unsigned short gt, unsigned short gn, struct patch *pp)
+void pafpu2(int8_t *bf, int8_t *ad, uint16_t os, uint16_t gt, uint16_t gn, struct patch *pp)
 {
         sprintf(bf, "%s %d %s %c%c %s", ad, os, stdata[pp->padat1], gt, gn, dfpdat(pp));
@@ -629 +629 @@
 */
 
-void pafpu3(char *bf, char *ad, struct patch *pp)
+void pafpu3(int8_t *bf, int8_t *ad, struct patch *pp)
 {
         sprintf(bf, "%s %s    %s", ad, stdata[pp->padat1], dfpdat(pp));
@@ -644 +644 @@
 */
 
-void dspdest(char *buf, struct patch *pp)
+void dspdest(int8_t *buf, struct patch *pp)
 {
-        unsigned short chan, osc, port, stim, vg, vgt, vgn, vp1, vp2, sgn;
-        short val;
-        char buf2[16], *rtype;
+        uint16_t chan, osc, port, stim, vg, vgt, vgn, vp1, vp2, sgn;
+        int16_t val;
+        int8_t buf2[16], *rtype;
 
         port = (pp->pasuba >> 11) & 0x0003;             /* for trg types */