Changeset 7c5def4 in buchla-68k

Timestamp:

11/15/2017 06:13:13 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

72741f4

Parents:

2ff1367

Message:

Minor fixes and cleanups.

Location:

ram

Files:

• barbadj.c (modified) (1 diff)
• im700.c (modified) (1 diff)
• instdsp.c (modified) (2 diffs)
• instdsp.x (modified) (1 diff)
• showcfg.c (modified) (2 diffs)
• tundsp.c (modified) (1 diff)

ram/barbadj.c

@@ -159 +159 @@
 
                 while (barpos++ LE newbar)      /* write new dots */
-                        LCD_WD = (uint8_t)bardot;
+                        LCD_WD = bardot;
 
                 while (barpos++ < BTop)         /* erase old dots */

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, 2 * NCTRLS); /* clear MIDI controller values */
+        memsetw(mctlval, 0, NCTRLS);    /* clear MIDI controller values */
 
         memsetw(grpmode, 0, 12);        /* set all groups to PLAY */

ram/instdsp.c

@@ -431 +431 @@
 */
 
-void pltws(uint16_t ws[], int16_t pen)
+void pltws(int16_t ws[], int16_t pen)
 {
         register int16_t i, x, y;
@@ -438 +438 @@
 
                 x = 382 + (i >> 1);
-                y = 348 - (int16_t)((ws[i] ^ 0x8000) / 676);
+                y = 348 - (int16_t)(((uint16_t)ws[i] ^ 0x8000) / 676);
 
                 idpoint(x, y, pen);

ram/instdsp.x

@@ -45 +45 @@
 extern  int16_t         irand(int16_t range);
 extern  void            oscdsp(int16_t row, int16_t val, int16_t n, int8_t *lbl, int16_t frq);
-extern  void            pltws(uint16_t ws[], int16_t pen);
+extern  void            pltws(int16_t ws[], int16_t pen);
 extern  void            reshowi(void);
 extern  int16_t         xgetran(int16_t mlt);

ram/showcfg.c

@@ -368 +368 @@
 void dispws(int16_t ws)
 {
-        register uint16_t *wsp;
+        register int16_t *wsp;
         register int16_t i, x, y;
         int8_t buf[64];
@@ -385 +385 @@
 
                 x = LftEdge + (i >> 1);
-                y = BotEdge - (int16_t)((wsp[i] ^ 0x8000) / 676);
+                y = BotEdge - (int16_t)(((uint16_t)wsp[i] ^ 0x8000) / 676);
 
                 idpoint(x, y, WSBFC);

ram/tundsp.c

@@ -340 +340 @@
         bfs[0] = (int8_t)(bfs[0] + '0');
         bfs[1] = (int8_t)(bfs[1] + 'A');
-        bfs[2] = (int8_t)(bfs[2] + sfdsp[bfs[2] - 7]);
+        bfs[2] = sfdsp[bfs[2] - 7];
         bfs[3] = (int8_t)(bfs[3] + '0');
         bfs[4] = (int8_t)(bfs[4] + '0');