Changeset c93e44d in buchla-68k for ram

Timestamp:

11/12/2017 06:14:21 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

fa50076

Parents:

3f2d518

Message:

Fixed msm.c.

Location:

ram

Files:

• im700.c (modified) (1 diff)
• msm.c (modified) (3 diffs)
• swinit.c (modified) (1 diff)
• swinit.x (modified) (1 diff)

ram/im700.c

@@ -597 +597 @@
         memset(keystat, 0, 24);         /* clear front panel key status */
         memset(trgtab,  0, NTRIGS);     /* clear trigger status table */
-        memset(mctlval, 0, NCTRLS);     /* clear MIDI controller values */
+        memset(mctlval, 0, 2 * NCTRLS); /* clear MIDI controller values */
 
         memsetw(grpmode, 0, 12);        /* set all groups to PLAY */

ram/msm.c

@@ -277 +277 @@
                                                                                         ep->e_time = t_cur;
                                                                                         ep->e_type = EV_ANVL;
-                                                                                        ep->e_data1 = 0x0050 | i;
+                                                                                        ep->e_data1 = (int8_t)(0x0050 | i);
                                                                                         ep->e_dn = (struct s_entry *)((int32_t)mdb1 << 16);
                                                                                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -515 +515 @@
                                                         prstab[t1] = 0;
 
-                                                        stmproc(t1);    /* process as a patch stimulus */
+                                                        stmproc((uint16_t)t1);  /* process as a patch stimulus */
 
                                                         if (editsw) {   /* edit mode */
@@ -570 +570 @@
                                                         }
 
-                                                        stmproc(0x8000 | t1);   /* process as a patch stimulus */
+                                                        stmproc((uint16_t)0x8000 | (uint16_t)t1);       /* process as a patch stimulus */
                                                 }
 

ram/swinit.c

@@ -115 +115 @@
 int8_t  loadedf[NLTYPES][8];    /* loaded file names */
 int8_t  masens[3];              /* MIDI port active sensing flags */
-int8_t  mctlval[NCTRLS];        /* MIDI controller values */
-int8_t  mdbyte[3];              /* MIDI data byte buffers */
+int16_t mctlval[NCTRLS];        /* MIDI controller values */
+int16_t mdbyte[3];              /* MIDI data byte buffers */
 int8_t  mpsust[48];             /* MIDI sustain status, by port and channel */
-int8_t  mrstat[3];              /* MIDI running status */
+int16_t mrstat[3];              /* MIDI running status */
 int8_t  scname[N_SCORES][16];   /* Score names */
 int8_t  trgtab[NTRIGS];         /* trigger status */

ram/swinit.x

@@ -90 +90 @@
 extern  int8_t          masens[3];
 extern  int16_t         mctlnum[4];
-extern  int8_t          mctlval[NCTRLS];
-extern  int8_t          mdbyte[3];
+extern  int16_t         mctlval[NCTRLS];
+extern  int16_t         mdbyte[3];
 extern  int16_t         mpbend[48];
 extern  int8_t          mpsust[48];
-extern  int8_t          mrstat[3];
+extern  int16_t         mrstat[3];
 extern  int16_t         msmstv[3];
 extern  int32_t         ndbytes;