Changeset 2a87ef3 in buchla-68k

Timestamp:

11/12/2017 05:27:43 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

66072f0

Parents:

6f49665

Message:

Fixed lcdlbls.c.

Files:

• include/smdefs.h (modified) (1 diff)
• ram/lcdlbls.c (modified) (15 diffs)

include/smdefs.h

@@ -22 +22 @@
         struct  sment   *nxt;
         struct  sment   *prv;
-        uint16_t        val;
+        int16_t         val;
 };
 

ram/lcdlbls.c

@@ -821 +821 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_ASGN, -1, -1))) {
 
-                        ep->e_data1 = n;        /* update old event */
+                        ep->e_data1 = (int8_t)n;        /* update old event */
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
 
                         ep->e_type  = EV_ASGN;  /* create new event */
-                        ep->e_data1 = n;
+                        ep->e_data1 = (int8_t)n;
                         ep->e_time  = t_cur;
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -1020 +1020 @@
 void selins(int16_t ival)
 {
-        register int16_t n;
-        register struct s_entry *ep;
+        int16_t n;
+        struct s_entry *ep;
 
         for (n = 0; n < 12; n++) {
@@ -1028 +1028 @@
                         continue;
 
-                ins2grp[n] = ival | (ins2grp[n] & 0xFF00);
+                ins2grp[n] = ival | (ins2grp[n] & (int16_t)0xFF00);
                 setv2gi(n);
 
@@ -1035 +1035 @@
                         if (E_NULL NE (ep = findev(p_cur, t_cur, EV_INST, n, -1))) {
 
-                                ep->e_data2 = ival;
+                                ep->e_data2 = (int8_t)ival;
 
                         } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
 
                                 ep->e_type  = EV_INST;
-                                ep->e_data1 = n;
-                                ep->e_data2 = ival;
+                                ep->e_data1 = (int8_t)n;
+                                ep->e_data2 = (int8_t)ival;
                                 ep->e_time  = t_cur;
                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -1212 +1212 @@
 /* ++++++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++ */
 
-                        *(fpu + (smp->vp << 4) + FPU_TCV1) = val;
+                        *(fpu + (smp->vp << 4) + FPU_TCV1) = (uint16_t)val;
 
                         setipl(oldi);
@@ -1236 +1236 @@
         int16_t gs;
         int16_t oldi;
-        int16_t vmask, var;
+        uint16_t vmask;
+        int16_t var;
 
         gs  = (grp << 4) | src;                 /* calculate grp/src index */
@@ -1246 +1247 @@
                 /* see if we have a change in the selected significant bits */
 
-                if (((val = valents[gs].val) & vmask) EQ (ival & vmask)) {
+                if (((uint16_t)(val = valents[gs].val) & vmask) EQ ((uint16_t)ival & vmask)) {
 
                         /* make sure we always see a change to zero */
@@ -1296 +1297 @@
 /* ++++++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++ */
 
-                *(fpu + (smp->vp << 4) + FPU_TCV1) = val;
+                *(fpu + (smp->vp << 4) + FPU_TCV1) = (uint16_t)val;
 
                 setipl(oldi);
@@ -1364 +1365 @@
 /* ++++++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++ */
 
-                *(fpu + (smp->vp << 4) + FPU_TCV1) = val;
+                *(fpu + (smp->vp << 4) + FPU_TCV1) = (uint16_t)val;
 
                 setipl(oldi);
@@ -1602 +1603 @@
                 for (i = 0; i < 14; i++) {
 
-                        sendeq(i, gain2eq(0));
+                        sendeq((int8_t)i, gain2eq(0));
                         BarCset(i, BGeq[i] = 0);
                 }
@@ -1619 +1620 @@
 {
         volatile uint16_t *fpu;
-        int16_t val, oldi, mult;
+        int16_t val, oldi;
+        uint16_t mult;
         int16_t nop;
 
@@ -1663 +1665 @@
 /* ++++++++++++++++++++++++++++ FPU interrupts disabled +++++++++++++++++++++ */
 
-        *(fpu + FPU_TCV2) = val;
+        *(fpu + FPU_TCV2) = (uint16_t)val;
         ++nop;  ++nop;  ++nop;
         *(fpu + FPU_TSF2) = mult;
@@ -1767 +1769 @@
                 barval = (((slval >> 5) - 500) << 6) / 252;
                 BGeq[bar] = barval;
-                sendeq(bar, gain2eq(SL2GAIN(slval)));
+                sendeq((int8_t)bar, gain2eq(SL2GAIN(slval)));
                 BarCadj(bar, barval);
 
@@ -1790 +1792 @@
         timeval  = ( ( (tmpomlt + 50) * tmpoval) / 100);
         timeval  = (int16_t)( (192000L / timeval) - 1);
-        TIME_T2H = timeval >> 8;
-        TIME_T2L = timeval & 0x00FF;
+        TIME_T2H = (uint8_t)(timeval >> 8);
+        TIME_T2L = (uint8_t)(timeval & 0x00FF);
 }
 
@@ -1802 +1804 @@
 void settune(void)
 {
-        int16_t oldi, i, grp;
+        uint16_t oldi;
+        int16_t i, grp;
         volatile uint16_t *fpu;
         int32_t trval, trmax;