Changeset bf89cfb in buchla-68k for include

Timestamp:

07/15/2017 11:15:58 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

c80943f

Parents:

09d1345

Message:

No more warnings in vlib.

Location:

include

Files:

• glcdefs.h (modified) (2 diffs)
• instdsp.h (modified) (1 diff)
• objdefs.h (modified) (3 diffs)
• smdefs.h (modified) (1 diff)

include/glcdefs.h

@@ -10 +10 @@
 #include "stdint.h"
 
-#define G_INIT          (int8_t)0x40
-#define G_MWRITE        (int8_t)0x42
-#define G_MREAD         (int8_t)0x43
-#define G_SETSAD        (int8_t)0x44
-#define G_CRSWR         (int8_t)0x46
-#define G_CRSRD         (int8_t)0x47
-#define G_CRSMRT        (int8_t)0x4C
-#define G_CRSMLT        (int8_t)0x4D
-#define G_CRSMUP        (int8_t)0x4E
-#define G_CRSMDN        (int8_t)0x4F
-#define G_ERASE         (int8_t)0x52
-#define G_SLEEP         (int8_t)0x53
-#define G_DSPCTL        (int8_t)0x58
-#define G_HSCRL         (int8_t)0x5A
-#define G_OVRLAY        (int8_t)0x5B
-#define G_CGRAM         (int8_t)0x5C
-#define G_CRSFRM        (int8_t)0x5D
+#define G_INIT          0x40
+#define G_MWRITE        0x42
+#define G_MREAD         0x43
+#define G_SETSAD        0x44
+#define G_CRSWR         0x46
+#define G_CRSRD         0x47
+#define G_CRSMRT        0x4C
+#define G_CRSMLT        0x4D
+#define G_CRSMUP        0x4E
+#define G_CRSMDN        0x4F
+#define G_ERASE         0x52
+#define G_SLEEP         0x53
+#define G_DSPCTL        0x58
+#define G_HSCRL         0x5A
+#define G_OVRLAY        0x5B
+#define G_CGRAM         0x5C
+#define G_CRSFRM        0x5D
 
 #define LCD_WC          lcd_a1
@@ -33 +33 @@
 #define LCD_RD          lcd_a1
 
-#define G_PLANE1        (uint16_t)0x0000
-#define G_PLANE2        (uint16_t)0x2000
+#define G_PLANE1        0x0000
+#define G_PLANE2        0x2000
 
 #define G_OFF           0               /* off */

include/instdsp.h

@@ -110 +110 @@
 
         struct  pflent  *nextpf;        /* next entry pointer */
-        uint16_t        pftrig;         /* trigger number */
-        uint16_t        pfvpval;        /* voice / parameter number */
+        int16_t         pftrig;         /* trigger number */
+        int16_t         pfvpval;        /* voice / parameter number */
         int32_t         d1reg;          /* D1 register contents */
         int32_t         d2reg;          /* D2 register contents */

include/objdefs.h

@@ -19 +19 @@
         int32_t         F_Res1;         /* Reserved area #1 */
         int32_t         F_Res2;         /* Reserved area #2 -- text origin */
-        uint16_t        F_Res3;         /* Reserved area #3 -- flag word */
+        int16_t         F_Res3;         /* Reserved area #3 -- flag word */
 
                                         /* data origin - long */
@@ -25 +25 @@
 };
 
-#define F_R_C   0x601A          /* Magic for contiguous file */
-#define F_R_D   0x601B          /* Magic for discontiguous file */
+#define F_R_C   0x601Au         /* Magic for contiguous file */
+#define F_R_D   0x601Bu         /* Magic for discontiguous file */
 
 struct SYMBOL {                 /* Symbol table entry -- 14 bytes */
@@ -35 +35 @@
 };
 
-#define S_Def   0x8000          /* Defined */
-#define S_Equ   0x4000          /* Equated */
-#define S_Glb   0x2000          /* Global */
-#define S_Reg   0x1000          /* Equated register */
-#define S_Ext   0x0800          /* External reference */
-#define S_Data  0x0400          /* Data based relocatable */
-#define S_Text  0x0200          /* Text based relocatable */
-#define S_BSS   0x0100          /* BSS based relocatable */
+#define S_Def   0x8000u         /* Defined */
+#define S_Equ   0x4000u         /* Equated */
+#define S_Glb   0x2000u         /* Global */
+#define S_Reg   0x1000u         /* Equated register */
+#define S_Ext   0x0800u         /* External reference */
+#define S_Data  0x0400u         /* Data based relocatable */
+#define S_Text  0x0200u         /* Text based relocatable */
+#define S_BSS   0x0100u         /* BSS based relocatable */

include/smdefs.h

@@ -14 +14 @@
         struct  sment   *nxt;
         struct  sment   *prv;
-        uint16_t        vp;
-        uint16_t        sm;
+        int16_t         vp;
+        int16_t         sm;
 };