Changeset ea9a162 in buchla-68k for ram

Timestamp:

11/12/2017 10:44:55 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

2ff1367

Parents:

99fed2e

Message:

Fixed the rest.

Location:

ram

Files:

• dcopy.c (modified) (1 diff)
• dopatch.c (modified) (1 diff)
• etagpt.c (modified) (1 diff)
• etscor.c (modified) (1 diff)
• etsnbt.c (modified) (1 diff)
• etstrn.c (modified) (1 diff)
• etvel.c (modified) (1 diff)
• etwhrv.c (modified) (1 diff)
• im700.c (modified) (1 diff)
• m7menu.c (modified) (1 diff)
• ptwrite.c (modified) (1 diff)
• wscalc.c (modified) (1 diff)

ram/dcopy.c

@@ -41 +41 @@
         mphead.F_Res1   = 0L;                   /* reserved area #1 */
         mphead.F_Res2   = (int32_t)&Lo_RAM;     /* text base */
-        mphead.F_Res3   = 0xFFFF;               /* flag word */
+        mphead.F_Res3   = (int16_t)0xFFFF;      /* flag word */
 
         /* ***** initialize for a (possibly) new disk here ***** */

ram/dopatch.c

@@ -317 +317 @@
         case PA_SLIN:           /* sequence line */
 
-                seqline[suba] = dat1;
+                seqline[suba] = (int16_t)dat1;
                 seqdupd |= ((uint16_t)1 << suba);
                 break;

ram/etagpt.c

@@ -20 +20 @@
         grp = 0x00FF & (n >> 8);
 
-        ebuf[0] = grp2prt[grp][0];
+        ebuf[0] = (int8_t)grp2prt[grp][0];
         ebuf[1] = '\0';
 

ram/etscor.c

@@ -88 +88 @@
 
         ec = stccol - cfetp->flcol;
-        ebuf[ec]  = k + '0';
+        ebuf[ec] = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)

ram/etsnbt.c

@@ -109 +109 @@
 
         ec = stccol - cfetp->flcol;
-        ebuf[ec]  = k + '0';
+        ebuf[ec] = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)

ram/etstrn.c

@@ -101 +101 @@
                 k += '0';
 
-        ebuf[ec] = k;
+        ebuf[ec] = (int8_t)k;
 
         if (v_regs[5] & 0x0180)

ram/etvel.c

@@ -98 +98 @@
 
         ec = stccol - cfetp->flcol;     /* setup edit buffer column */
-        ebuf[ec]  = k + '0';
+        ebuf[ec]  = (int8_t)(k + '0');
 
         if (v_regs[5] & 0x0180)

ram/etwhrv.c

@@ -145 +145 @@
         } else {
 
-                ebuf[ec] = dspbuf[0] = k + '0';
+                ebuf[ec] = dspbuf[0] = (int8_t)(k + '0');
                 ebuf[4]  = dspbuf[1] = '\0';
         }

ram/im700.c

@@ -716 +716 @@
 
         for (i = 0; i < 12; i++)        /* setup default values for gtctab */
-                gtctab[i] = ((i+3) << 12) | ((i+3) << 8) | ((i+3) << 4) | (i+3);
+                gtctab[i] = (uint16_t)
+                        (((i+3) << 12) | ((i+3) << 8) | ((i+3) << 4) | (i+3));
 
         editsw  = FALSE;                /* setup edit switch state */

ram/m7menu.c

@@ -403 +403 @@
                 vbank(0);
 
-        vbfill4(menuob, 128, 0, 0, 511, 349, mbak);
+        vbfill4(menuob, 128, 0, 0, 511, 349, exp_c(mbak));
 
         vcputsv(menuob, 64, mlcv, mbak,  1,  2,   ml01, 14);

ram/ptwrite.c

@@ -114 +114 @@
 #endif
 
-                        switch (cb = (PE_SPEC & patches[pp].paspec)) {
+                        switch (cb = (int8_t)(PE_SPEC & patches[pp].paspec)) {
 
                         case PA_KEY:

ram/wscalc.c

@@ -108 +108 @@
 
         for (wspnt = 0; wspnt < NUMWPCAL; wspnt++)
-                wsbuf[wspnt] = (hwave[wspnt] * hfac) >> 16;
+                wsbuf[wspnt] = (int16_t)((hwave[wspnt] * hfac) >> 16);
 }