Changeset 5c977dd in buchla-68k

Timestamp:

11/11/2017 10:35:13 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

f537c48

Parents:

572daa7

Message:

Fixed etioas.c.

File:

• ram/etioas.c (modified) (13 diffs)

ram/etioas.c

@@ -59 +59 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_ASGN, -1, -1))) {
 
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
 
                         ep->e_type  = EV_ASGN;
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
                         ep->e_time  = t_cur;
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -109 +109 @@
 
         ec = stccol - cfetp->flcol;
-        ebuf[ec]  = k + '0';
+        ebuf[ec]  = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)
@@ -135 +135 @@
         (void)n;
 
-        ebuf[0] = '0' + curtun;
+        ebuf[0] = (int8_t)('0' + curtun);
         ebuf[1] = '\0';
         ebflag = TRUE;
@@ -163 +163 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_TUNE, -1, -1))) {
 
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
 
                         ep->e_type = EV_TUNE;
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
                         ep->e_time = t_cur;
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -209 +209 @@
         (void)n;
 
-        ebuf[0]  = k + '0';
+        ebuf[0]  = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)
@@ -269 +269 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_TMPO, -1, -1))) {
 
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
 
                         ep->e_type  = EV_TMPO;
-                        ep->e_data1 = ival;
+                        ep->e_data1 = (int8_t)ival;
                         ep->e_time  = t_cur;
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -320 +320 @@
 
         ec = stccol - cfetp->flcol;
-        ebuf[ec]  = k + '0';
+        ebuf[ec]  = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)
@@ -353 +353 @@
         sf = 100L;
         tt = fromfpu(curintp);
-        th = tt / sc;
-        tl = (tt - (th * sc)) / sf;
+        th = (int16_t)(tt / sc);
+        tl = (int16_t)((tt - (th * sc)) / sf);
 
         sprintf(ebuf, "%02d.%d", th, tl);
@@ -382 +382 @@
 
         for (i = 0; i < 2; i++)         /* convert from ASCII to binary */
-                tmpval = (tmpval * 10) + (ebuf[i] - '0');
-
-        tmpval = ((tmpval * 10) + (ebuf[3] - '0')) * 100;
+                tmpval = (tmpval * 10) + (uint16_t)(ebuf[i] - '0');
+
+        tmpval = ((tmpval * 10) + (uint16_t)(ebuf[3] - '0')) * 100;
 
         if (tmpval > (uint16_t)64900)
@@ -398 +398 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_INTP, -1, -1))) {
 
-                        ep->e_data1 = (curintp >> 8);
-                        ep->e_data2 = 0x00FF & curintp;
+                        ep->e_data1 = (int8_t)(curintp >> 8);
+                        ep->e_data2 = (int8_t)(0x00FF & curintp);
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE3))) {
@@ -405 +405 @@
                         ep->e_type  = EV_INTP;
                         ep->e_time  = t_cur;
-                        ep->e_data1 = (curintp >> 8);
-                        ep->e_data2 = 0x00FF & curintp;
+                        ep->e_data1 = (int8_t)(curintp >> 8);
+                        ep->e_data2 = (int8_t)(0x00FF & curintp);
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
                         eh_ins(ep, EH_INTP);
@@ -434 +434 @@
         sf = 100L;
         tt = fromfpu(curintp);
-        th = tt / sc;
-        tl = (tt - (th * sc)) / sf;
+        th = (int16_t)(tt / sc);
+        tl = (int16_t)((tt - (th * sc)) / sf);
 
         sprintf(dspbuf, "%02d.%d", th, tl);     /* convert to ASCII */
@@ -469 +469 @@
                 return(FAILURE);
 
-        ebuf[ec] = k + '0';
+        ebuf[ec] = (int8_t)(k + '0');
         ebuf[2] = '.';
         ebuf[4] = '\0';
 
-        dspbuf[0] = k + '0';
+        dspbuf[0] = (int8_t)(k + '0');
         dspbuf[1] = '\0';