Changeset 7258c6a in buchla-68k for ram/gcurpos.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/gcurpos.c (modified) (13 diffs)

ram/gcurpos.c

@@ -17 +17 @@
 #define XOFF    14      /* x pixel offset */
 
-extern  short   sgcsw;
+extern  int16_t sgcsw;
 
 /* 4 bit pixel patterns */
@@ -38 +38 @@
 #define AW_F    0xFFFF
 
-extern  void    objclr(unsigned obj);
-extern  void    SetPri(int obj, int pri);
-extern  void    vbank(unsigned b);
-
-extern  unsigned        exp_c(unsigned c);
-
-extern  short   stcrow, stccol;
-
-/* 
-
-*/
-
-static  int     ar_ule[] = {            /* upper left even pixel arrow */
+extern  void    objclr(uint16_t obj);
+extern  void    SetPri(int16_t obj, int16_t pri);
+extern  void    vbank(uint16_t b);
+
+extern  uint16_t        exp_c(uint16_t c);
+
+extern  int16_t stcrow, stccol;
+
+/* 
+
+*/
+
+static  int16_t ar_ule[] = {            /* upper left even pixel arrow */
 
         AW_F, AW_0, AW_0, AW_0,         /* 0 */
@@ -70 +70 @@
 };
 
-static  int     ar_ulo[] = {            /* upper left odd pixel arrow */
+static  int16_t ar_ulo[] = {            /* upper left odd pixel arrow */
 
         AW_7, AW_8, AW_0, AW_0,         /* 0 */
@@ -94 +94 @@
 */
 
-static  int     ar_ure[] = {            /* upper right even pixel arrow */
+static  int16_t ar_ure[] = {            /* upper right even pixel arrow */
 
         AW_0, AW_0, AW_1, AW_E,         /* 0 */
@@ -114 +114 @@
 };
 
-static  int     ar_uro[] = {            /* upper right odd pixel arrow */
+static  int16_t ar_uro[] = {            /* upper right odd pixel arrow */
 
         AW_0, AW_0, AW_0, AW_F,         /* 0 */
@@ -138 +138 @@
 */
 
-static  int     ar_lle[] = {            /* lower left even pixel arrow */
+static  int16_t ar_lle[] = {            /* lower left even pixel arrow */
 
         AW_0, AW_0, AW_0, AW_0,         /* 0 */
@@ -158 +158 @@
 };
 
-static  int     ar_llo[] = {            /* lower left odd pixel arrow */
+static  int16_t ar_llo[] = {            /* lower left odd pixel arrow */
 
         AW_0, AW_0, AW_0, AW_0,         /* 0 */
@@ -182 +182 @@
 */
 
-static  int     ar_lre[] = {            /* lower right even pixel arrow */
+static  int16_t ar_lre[] = {            /* lower right even pixel arrow */
 
         AW_0, AW_0, AW_0, AW_0,         /* 0 */
@@ -202 +202 @@
 };
 
-static  int     ar_lro[] = {            /* lower right odd pixel arrow */
+static  int16_t ar_lro[] = {            /* lower right odd pixel arrow */
 
         AW_0, AW_0, AW_0, AW_0,         /* 0 */
@@ -226 +226 @@
 */
 
-static  int     *arrows[] = {   /* arrow pointer table */
+static  int16_t *arrows[] = {   /* arrow pointer table */
 
         v_curs0,        /* 0 - upper left, even pixel */
@@ -253 +253 @@
 */
 
-int gcurpos(int xloc, int yloc)
-{
-        register int ab, xo, yo;
+int16_t gcurpos(int16_t xloc, int16_t yloc)
+{
+        register int16_t ab, xo, yo;
         register struct octent *op;
 
@@ -306 +306 @@
 */
 
-void andcopy(unsigned *to, unsigned *from, unsigned with, short len)
-{
-        register short i;
+void andcopy(uint16_t *to, uint16_t *from, uint16_t with, int16_t len)
+{
+        register int16_t i;
 
         for (i = len; i--; )
@@ -320 +320 @@
 */
 
-void arcurs(unsigned icolor)
-{
-        register short color;
+void arcurs(uint16_t icolor)
+{
+        register int16_t color;
 
         color = exp_c(icolor);