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

ram/etadyn.c

@@ -20 +20 @@
         grp = 0x00FF & (n >> 8);
 
-        ebuf[0] = grpdyn[grp] + '0';
+        ebuf[0] = (int8_t)(grpdyn[grp] + '0');
         ebuf[1] = '\0';
 
@@ -40 +40 @@
         struct idfnhdr *fp;
         uint16_t fpmant, fpexp;
-        int16_t oldsr;
+        uint16_t oldsr;
         int16_t nop;
 
@@ -47 +47 @@
         g = grp + 1;
 
-        fpmant = (((int32_t)curintp & 0x0000FFF0L) *
-                  ((int32_t)timemlt & 0x0000FFFFL)) >> 15;
+        fpmant = (uint16_t)((((int32_t)curintp & 0x0000FFF0L) *
+                  ((int32_t)timemlt & 0x0000FFFFL)) >> 15);
 
         fpexp = expbit[curintp & 0x000F];
@@ -70 +70 @@
 
                         if (fp->idftmd & I_VNSUBN)
-                                *(fpu + (int32_t)FPU_TNV1) = val;
+                                *(fpu + (int32_t)FPU_TNV1) = (uint16_t)val;
                         else
-                                *(fpu + (int32_t)FPU_TNV0) = val;
+                                *(fpu + (int32_t)FPU_TNV0) = (uint16_t)val;
 
                         ++nop;  ++nop;  ++nop;
 
                         *(fpu + (int32_t)FPU_TCTL) =
-                                (fp->idftmd & (I_NRATIO | I_NVBITS)) | 0x0001;
+                                (uint16_t)((fp->idftmd & (I_NRATIO | I_NVBITS)) | 0x0001);
 
                         setsr(oldsr);
@@ -121 +121 @@
         grp = 0x00FF & (nn >> 8);
 
-        dspbuf[0] = grpdyn[grp] + '0';
+        dspbuf[0] = (int8_t)(grpdyn[grp] + '0');
         dspbuf[1] = '\0';
 
@@ -143 +143 @@
         n = nn & 0xFF;
 
-        dspbuf[0] = ebuf[0] = k + '0';
+        dspbuf[0] = ebuf[0] = (int8_t)(k + '0');
         dspbuf[1] = ebuf[1] = '\0';