Merge https://github.com/cc65/cc65

[cc65] / include / _suzy.h

diff --git a/include/_suzy.h b/include/_suzy.h
index 36789b81c148c12e2334381fd2cc7a461c7a7054..8ab7f68dd92ad075eeba4c6aef5a78b1859f8aa7 100644 (file)
--- a/include/_suzy.h
+++ b/include/_suzy.h
@@ -97,9 +97,9 @@ typedef struct SCB_REHVST_PAL {             // SCB with all attributes
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
   unsigned int stretch;
@@ -112,9 +112,9 @@ typedef struct SCB_REHVST {                  // SCB without pallette
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
   unsigned int stretch;
@@ -126,9 +126,9 @@ typedef struct SCB_REHV {                 // SCB without stretch/tilt
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
 } SCB_REHV;
@@ -138,9 +138,9 @@ typedef struct SCB_REHV_PAL {             // SCB without str/tilt, w/ penpal
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
   unsigned char penpal[8];
@@ -151,9 +151,9 @@ typedef struct SCB_REHVS {                // SCB w/o tilt & penpal
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
   unsigned int stretch;
@@ -164,9 +164,9 @@ typedef struct SCB_REHVS_PAL {            // SCB w/o tilt w/penpal
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned int hsize;
   unsigned int vsize;
   unsigned int stretch;
@@ -178,9 +178,9 @@ typedef struct SCB_RENONE {                 // SCB w/o size/stretch/tilt/pal
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
 } SCB_RENONE;
 
 typedef struct SCB_RENONE_PAL {             // SCB w/o size/str/tilt w/penpal
@@ -188,12 +188,27 @@ typedef struct SCB_RENONE_PAL {             // SCB w/o size/str/tilt w/penpal
   unsigned char sprctl1;
   unsigned char sprcoll;
   char *next;
-  char *data;
-  unsigned int hpos;
-  unsigned int vpos;
+  unsigned char *data;
+  signed int hpos;
+  signed int vpos;
   unsigned char penpal[8];
 } SCB_RENONE_PAL;
 
+typedef struct PENPAL_4 {
+  unsigned char penpal[8];
+} PENPAL_4;
+
+typedef struct PENPAL_3 {
+  unsigned char penpal[4];
+} PENPAL_3;
+
+typedef struct PENPAL_2 {
+  unsigned char penpal[2];
+} PENPAL_2;
+
+typedef struct PENPAL_1 {
+  unsigned char penpal[1];
+} PENPAL_1;
 
 /* Misc system defines */
 
@@ -295,7 +310,7 @@ struct __suzy {
   unsigned char parstat;        // 0xFCC2  parallel port status
   unsigned char pardata;        // 0xFCC3  parallel port data
   unsigned char howie;          // 0xFCC4  howie (?)
-                                                               // 0xFCC5 - 0xFCFF  unused
+                                // 0xFCC5 - 0xFCFF  unused
 };