Changeset 3c45656 in buchla-68k

Timestamp:

11/15/2017 08:17:05 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

0b23063

Parents:

8d0af8a

Message:

Fixed constant overflow warnings.

Location:

ram

Files:

• asgvce.c (modified) (3 diffs)
• etimlt.c (modified) (2 diffs)
• etiosc.c (modified) (1 diff)
• etival.c (modified) (1 diff)
• ettrns.c (modified) (2 diffs)
• m7menu.c (modified) (1 diff)
• midas.c (modified) (1 diff)
• msm.c (modified) (4 diffs)

ram/asgvce.c

@@ -83 +83 @@
                         DB_CMNT("ne_end - enter note end");
                         ep->e_time  = t_cur;
-                        ep->e_type  = EV_NEND | 0x80;
+                        ep->e_type  = (int8_t)(EV_NEND | 0x80);
                         ep->e_note  = (int8_t)nn;
                         ep->e_group = (int8_t)grp;
@@ -132 +132 @@
                                         DB_CMNT("ne_end - enter note end");
                                         ep->e_time  = t_cur;
-                                        ep->e_type  = EV_NEND | 0x80;
+                                        ep->e_type  = (int8_t)(EV_NEND | 0x80);
                                         ep->e_note  = (int8_t)nn;
                                         ep->e_group = (int8_t)grp;
@@ -245 +245 @@
                         DB_CMNT("ne_bgn - enter note begin");
                         ep->e_time  = t_cur;
-                        ep->e_type  = EV_NBEG | 0x80;
+                        ep->e_type  = (int8_t)(EV_NBEG | 0x80);
                         ep->e_note  = (int8_t)key;
                         ep->e_group = (int8_t)grp;

ram/etimlt.c

@@ -27 +27 @@
                 mltstr[1] = '.';
         else
-                mltstr[1] = SP_1P;
+                mltstr[1] = (int8_t)SP_1P;
 
         mltstr[2] = mlttmp[1];          /* 2nd digit */
@@ -251 +251 @@
 
                         ebuf[1] = '1';
-                        dspbuf[0] = SP_1P;      /* setup display buffer */
+                        dspbuf[0] = (int8_t)SP_1P;      /* setup display buffer */
 
                 } else

ram/etiosc.c

@@ -23 +23 @@
 int16_t shrpflt[] = {  0, -100,    100};
 
-int8_t  sfdsp[]   = {' ', D_FLAT,  D_SHARP};
+int8_t  sfdsp[]   = {' ', (int8_t)D_FLAT, (int8_t)D_SHARP};
 
 static  int8_t  intstr[] = "+0000";

ram/etival.c

@@ -252 +252 @@
 
                         ebuf[6] = '1';
-                        dspbuf[0] = SP_1P;
+                        dspbuf[0] = (int8_t)SP_1P;
 
                 } else

ram/ettrns.c

@@ -136 +136 @@
 
                 if (dspbuf[0] EQ '1')
-                        dspbuf[0] = SP_M1;      /* -1 */
+                        dspbuf[0] = (int8_t)SP_M1;      /* -1 */
                 else
                         dspbuf[0] = '-';
@@ -143 +143 @@
 
                 if (dspbuf[0] EQ '1')
-                        dspbuf[0] = SP_P1;      /* +1 */
+                        dspbuf[0] = (int8_t)SP_P1;      /* +1 */
                 else
                         dspbuf[0] = '+';

ram/m7menu.c

@@ -24 +24 @@
 static int8_t   ml01[61], ml02[61], ml03[61], ml04[61], ml05[61];
 
-static int8_t mlc01[] = {1, 0xBA,  58, 0xB1,  1, 0xBB,  -1};
-static int8_t mlc02[] = {1, 0xB6,  29, 0xB1,  1, 0xB7,  28, 0xB1,  1, 0xB4,  -1};
-static int8_t mlc03[] = {1, 0xB6,  29, 0xB1,  1, 0xB2,  28, 0xB1,  1, 0xB4,  -1};
-static int8_t mlc04[] = {1, 0xB6,  29, 0xB1,  1, 0xB5,  28, 0xB1,  1, 0xB4,  -1};
-static int8_t mlc05[] = {1, 0xB9,  58, 0xB1,  1, 0xB8,  -1};
+static int8_t mlc01[] = {1, (int8_t)0xBA,  58, (int8_t)0xB1,  1, (int8_t)0xBB,  -1};
+static int8_t mlc02[] = {1, (int8_t)0xB6,  29, (int8_t)0xB1,  1, (int8_t)0xB7,  28, (int8_t)0xB1,  1, (int8_t)0xB4,  -1};
+static int8_t mlc03[] = {1, (int8_t)0xB6,  29, (int8_t)0xB1,  1, (int8_t)0xB2,  28, (int8_t)0xB1,  1, (int8_t)0xB4,  -1};
+static int8_t mlc04[] = {1, (int8_t)0xB6,  29, (int8_t)0xB1,  1, (int8_t)0xB5,  28, (int8_t)0xB1,  1, (int8_t)0xB4,  -1};
+static int8_t mlc05[] = {1, (int8_t)0xB9,  58, (int8_t)0xB1,  1, (int8_t)0xB8,  -1};
 
 static int8_t   *mtexts[] = {

ram/midas.c

@@ -10 +10 @@
 #include "ram.h"
 
-#define LCD_TIME        ((int32_t)(800 * 240))  /* LCD backlight 'on' time */
+#define LCD_TIME        ((int32_t)800 * (int32_t)240)   /* LCD backlight 'on' time */
 
 #if     DEBUGIT

ram/msm.c

@@ -129 +129 @@
                                                 case 6:         /* active sensing */
 
-                                                        masens[miport] |= 0x00FF;
+                                                        masens[miport] |= (int8_t)0x00FF;
                                                         break;
 
@@ -219 +219 @@
                                                 case 6:         /* active sensing */
 
-                                                        masens[miport] |= 0x00FF;
+                                                        masens[miport] |= (int8_t)0x00FF;
                                                         break;
 
@@ -385 +385 @@
                                                 case 6:         /* active sensing */
 
-                                                        masens[miport] |= 0x00FF;
+                                                        masens[miport] |= (int8_t)0x00FF;
                                                         break;
 
@@ -480 +480 @@
                                                 case 6:         /* active sensing */
 
-                                                        masens[miport] |= 0x00FF;
+                                                        masens[miport] |= (int8_t)0x00FF;
                                                         break;