Changeset 5289d7c in buchla-68k for ram

Timestamp:

11/12/2017 07:35:23 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

908b6ab

Parents:

3fcb810

Message:

Fixed msl.c.

File:

• ram/msl.c (modified) (8 diffs)

ram/msl.c

@@ -57 +57 @@
         struct s_entry *ep;
         int16_t i, ti, val;
-        uint16_t chan, crel, oldsr, port, trg, trig, vel;
+        uint16_t crel, oldsr;
+        int16_t chan, port, trg, trig, vel;
         int16_t esi, newsig, oldclk, oldrec;
         int32_t fctemp;
@@ -251 +252 @@
                                                                                 ep->e_time = t_cur;
                                                                                 ep->e_type = EV_ANVL;
-                                                                                ep->e_data1 = i;
+                                                                                ep->e_data1 = (int8_t)i;
                                                                                 ep->e_dn = (struct s_entry *)((int32_t)val << 16);
                                                                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -286 +287 @@
                                                                                 ep->e_time = t_cur;
                                                                                 ep->e_type = EV_ANVL;
-                                                                                ep->e_data1 = 0x0010 | i;
+                                                                                ep->e_data1 = (int8_t)(0x0010 | i);
                                                                                 ep->e_dn = (struct s_entry *)((int32_t)val << 16);
                                                                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -329 +330 @@
                                                                                 ep->e_time = t_cur;
                                                                                 ep->e_type = EV_ANVL;
-                                                                                ep->e_data1 = 0x0020 | i;
+                                                                                ep->e_data1 = (int8_t)(0x0020 | i);
                                                                                 ep->e_dn = (struct s_entry *)((int32_t)val << 16);
                                                                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -393 +394 @@
                                         ti  = (int16_t)( (19200000L / ti) - 1);
 #endif
-                                        TIME_T2H = ti >> 8;
-                                        TIME_T2L = ti & 0x00FF;
+                                        TIME_T2H = (uint8_t)(ti >> 8);
+                                        TIME_T2L = (uint8_t)(ti & 0x00FF);
 
                                         if (tmpomlt EQ 50) {    /* 0 */
@@ -476 +477 @@
                                 case 76:                /* amplitude */
 
-                                aval += aval >> 2;
-
-                                if (aval > 127)
-                                        aval = 127;
-
-                                amplval = (aval << 9) ^ 0x8000;
+                                        aval += aval >> 2;
+
+                                        if (aval > 127)
+                                                aval = 127;
+
+                                        amplval = (aval << 9) ^ (int16_t)0x8000;
                                         sendval(0, 0, amplval);
                                         break;
@@ -502 +503 @@
                                                                                 ep->e_time = t_cur;
                                                                                 ep->e_type = EV_ANVL;
-                                                                                ep->e_data1 = 0x0040 | i;
+                                                                                ep->e_data1 = (int8_t)(0x0040 | i);
                                                                                 ep->e_dn = (struct s_entry *)((int32_t)val << 16);
                                                                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -538 +539 @@
                                                                                 ep->e_time = t_cur;
                                                                                 ep->e_type = EV_ANVL;
-                                                                                ep->e_data1 = 0x0030 | i;
+                                                                                ep->e_data1 = (int8_t)(0x0030 | i);
                                                                                 ep->e_dn = (struct s_entry *)((int32_t)val << 16);
                                                                                 p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;