Changeset 432327d in buchla-68k for ram/tundsp.c

Timestamp:

09/17/2017 09:27:29 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

6099cac

Parents:

8c8b4e5

Message:

Fix conversion warnings.

File:

• ram/tundsp.c (modified) (6 diffs)

ram/tundsp.c

@@ -242 +242 @@
 void td_trcp(int16_t mode)
 {
-        register uint16_t cx;
-
-        cx = exp_c(mode ? TDSELD : tdbox[6][4]);
+        register int16_t cx;
+
+        cx = mode ? TDSELD : tdbox[6][4];
         vbank(0);
         vcputsv(tunob, 64, cx, tdbox[6][5],  9, 54, "Transpose", 14);
@@ -258 +258 @@
 void td_incr(int16_t mode)
 {
-        register uint16_t cx;
-
-        cx = exp_c(mode ? TDSELD : tdbox[6][4]);
+        register int16_t cx;
+
+        cx = mode ? TDSELD : tdbox[6][4];
         vbank(0);
         vcputsv(tunob, 64, cx, tdbox[6][5],  12, 54, "Increment", 14);
@@ -273 +273 @@
 void td_intp(int16_t mode)
 {
-        register uint16_t cx;
-
-        cx = exp_c(mode ? TDSELD : tdbox[6][4]);
+        register int16_t cx;
+
+        cx = mode ? TDSELD : tdbox[6][4];
         vbank(0);
         vcputsv(tunob, 64, cx, tdbox[6][5],  14, 54, "Intrpolat", 14);
@@ -334 +334 @@
 */
 
-void dsttval(int16_t row, int16_t col, int16_t val, uint16_t fg, uint16_t bg)
-{
-        register uint16_t cfg, cbg;
-
-        cfg = exp_c(fg);
-        cbg = exp_c(bg);
-
+void dsttval(int16_t row, int16_t col, int16_t val, int16_t fg, int16_t bg)
+{
         cnvc2p(bfs, (val >> 1));
 
-        bfs[0] += '0';
-        bfs[1] += 'A';
-        bfs[2] = sfdsp[bfs[2] - 7];
-        bfs[3] += '0';
-        bfs[4] += '0';
+        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[3] = (int8_t)(bfs[3] + '0');
+        bfs[4] = (int8_t)(bfs[4] + '0');
         bfs[5] = '\0';
 
         vbank(0);
-        vcputsv(tunob, 64, cfg, cbg, row, col, bfs, 14);
+        vcputsv(tunob, 64, fg, bg, row, col, bfs, 14);
 }
 
@@ -362 +357 @@
 void tdswin(int16_t n)
 {
-        register int16_t cx, i, tv;
+        uint16_t cx;
+        int16_t i, tv;
         int8_t ts;
 
@@ -476 +472 @@
 
                 tsplot4(tunob, 64, tdbox[n][4], 24, 54, "Table #", 14);
-                bfs[0] = curtun + '0';
+                bfs[0] = (int8_t)(curtun + '0');
                 bfs[1] = '\0';
                 tsplot4(tunob, 64, tunmod ? TDCHGD : tdbox[n][4],