Changeset 432327d in buchla-68k for ram/asgdsp.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/asgdsp.c (modified) (6 diffs)

ram/asgdsp.c

@@ -238 +238 @@
 */
 
-void keycpyw(volatile uint16_t *dest, volatile uint16_t *src, int16_t len, uint16_t wk, uint16_t bk)
+void keycpyw(volatile uint16_t *dest, volatile uint16_t *src, int16_t len, int16_t wk, int16_t bk)
 {
         uint16_t wkey, bkey, theword;
@@ -358 +358 @@
                 vbank(0);
 
-        vputp(adoct, x, y, exp_c(pen));
+        vputp(adoct, x, y, pen);
 }
 
@@ -389 +389 @@
 void adswin(int16_t n)
 {
-        register int16_t cx, i;
+        uint16_t cx;
+        int16_t i;
         int8_t buf1[4], buf2[4];
 
@@ -512 +513 @@
                         if ((mctlnum[i] NE -1) AND (mctlnum[i] & CTAG1)) {
 
-                                bfs[0] = '2' + i;
+                                bfs[0] = (int8_t)('2' + i);
                                 bfs[1] = '\0';
 
@@ -603 +604 @@
         case 7:         /* port 1 key to group assignments */
 
-                lseg(  8, 153,  15, 153, exp_c(adbox[n][4]));   /* underlines */
-                lseg(496, 153, 503, 153, exp_c(adbox[n][4]));
+                lseg(  8, 153,  15, 153, adbox[n][4]);  /* underlines */
+                lseg(496, 153, 503, 153, adbox[n][4]);
 
                 asgkb();                                        /* icon */
@@ -719 +720 @@
 
         *(psg + PSG_ADDR) = PSG_PRTB;           /* read current psg data */
-        psgdata = *(psg + PSG_READ) & ~AUX_BIT;
+        psgdata = (uint8_t)(*(psg + PSG_READ) & ~AUX_BIT);
 
         *(psg + PSG_ADDR) = PSG_PRTB;           /* send out updated aux data */
-        *(psg + PSG_WRIT) = psgdata | (aux ? 0 : AUX_BIT);
+        *(psg + PSG_WRIT) = (uint8_t)(psgdata | (aux ? 0 : AUX_BIT));
 }