Changeset a3eb131 in buchla-68k for ram

Timestamp:

11/12/2017 08:06:17 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

2da8254

Parents:

7f5fa1b

Message:

Fixed ptfield.c.

Location:

ram

Files:

• ptfield.c (modified) (10 diffs)
• ptfield.x (modified) (1 diff)

ram/ptfield.c

@@ -180 +180 @@
 void ptxkey(void)
 {
-        register int16_t i, cp, pp, sp, stm;
+        int16_t i, cp, pp, sp;
+        uint16_t stm;
 
         if (NOT astat)                          /* only on key closures ... */
@@ -401 +402 @@
 {
         static int8_t buf[32];
-        uint16_t sgn, vp1, vp2;
+        int16_t sgn, vp1, vp2;
+        uint16_t vp3;
         int16_t val;
 
-        val = pp->padat2;
+        val = (int16_t)pp->padat2;
 
         switch (pp->padat1) {
@@ -452 +454 @@
                 }
 
-                sprintf(buf, "%c%u.%02u", sgn, vp1, vp2);
+                sprintf(buf, "%c%d.%02d", sgn, vp1, vp2);
                 break;
 
         case PSA_TIM:           /* time */
 
-                vp1 = fromfpu(val);
-
-                sprintf(buf, "%5u", vp1);
+                vp3 = fromfpu((uint16_t)val);
+
+                sprintf(buf, "%5u", vp3);
                 break;
 
@@ -488 +490 @@
 */
 
-void pafpu1(int8_t *bf, int8_t *ad, uint16_t gt, uint16_t gn, struct patch *pp)
+void pafpu1(int8_t *bf, int8_t *ad, int16_t gt, int16_t gn, struct patch *pp)
 {
         sprintf(bf, "%s %s %c%c %s", ad, stdata[pp->padat1], gt, gn, dfpdat(pp));
@@ -501 +503 @@
 */
 
-void pafpu2(int8_t *bf, int8_t *ad, uint16_t os, uint16_t gt, uint16_t gn, struct patch *pp)
+void pafpu2(int8_t *bf, int8_t *ad, int16_t os, int16_t gt, int16_t gn, struct patch *pp)
 {
         sprintf(bf, "%s %d %s %c%c %s", ad, os, stdata[pp->padat1], gt, gn, dfpdat(pp));
@@ -527 +529 @@
 void dspdest(int8_t *buf, struct patch *pp)
 {
-        uint16_t chan, osc, port, stim, vg, vgt, vgn, vp1, vp2, sgn;
+        int16_t chan, osc, port, stim, vg, vgt, vgn, vp1, vp2, sgn;
         int16_t val;
         int8_t buf2[16], *rtype;
@@ -535 +537 @@
         stim =  pp->pasuba        & 0x007F;
 
-        vg   = (pp->pasuba >>  8) & 0x00FF;             /* for vg types */
-        osc  = (pp->pasuba        & 0x00FF) + 1;
+        vg   = (int16_t)((pp->pasuba >>  8) & 0x00FF);  /* for vg types */
+        osc  = (int16_t)((pp->pasuba        & 0x00FF) + 1);
 
         if (vg > 11) {
@@ -549 +551 @@
         }
 
-        vgn = vgn + ((vgn > 9) ? '\242' : '0');
+        vgn = vgn + ((vgn > 9) ? (uint8_t)'\242' : '0');
 
 
@@ -642 +644 @@
                 } else {
 
-                        if ((val = pp->padat2) < 0) {
+                        if ((val = (int16_t)pp->padat2) < 0) {
 
                                 sgn = '-';
@@ -668 +670 @@
         case PA_OSC:
 
-                val = pp->padat2 >> 1;
+                val = (int16_t)(pp->padat2 >> 1);
 
                 switch (pp->padat1) {

ram/ptfield.x

@@ -33 +33 @@
 extern  void            dspdest(int8_t *buf, struct patch *pp);
 extern  void            dspdfst(int8_t *buf, uint16_t val);
-extern  void            pafpu1(int8_t *bf, int8_t *ad, uint16_t gt, uint16_t gn, struct patch *pp);
-extern  void            pafpu2(int8_t *bf, int8_t *ad, uint16_t os, uint16_t gt, uint16_t gn, struct patch *pp);
+extern  void            pafpu1(int8_t *bf, int8_t *ad, int16_t gt, int16_t gn, struct patch *pp);
+extern  void            pafpu2(int8_t *bf, int8_t *ad, int16_t os, int16_t gt, int16_t gn, struct patch *pp);
 extern  void            pafpu3(int8_t *bf, int8_t *ad, struct patch *pp);
 extern  void            ptekey(void);