Changeset 7258c6a in buchla-68k for vlib/glcinit.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:

• vlib/glcinit.c (modified) (8 diffs)

vlib/glcinit.c

@@ -63 +63 @@
 #include "glcdefs.h"
 
-unsigned        lcdbase;        /* LCD graphics base address */
-unsigned        lcdbit;         /* LCD graphics pixel bit mask */
-unsigned        lcdcol;         /* LCD text column */
-unsigned        lcdctl1;        /* LCD display control -- command */
-unsigned        lcdctl2;        /* LCD display control -- data */
-unsigned        lcdcurs;        /* LCD graphics pixel byte address */
-unsigned        lcdrow;         /* LCD text row */
-unsigned        lcdx;           /* LCD graphics x */
-unsigned        lcdy;           /* LCD graphics y */
+uint16_t        lcdbase;        /* LCD graphics base address */
+uint16_t        lcdbit;         /* LCD graphics pixel bit mask */
+uint16_t        lcdcol;         /* LCD text column */
+uint16_t        lcdctl1;        /* LCD display control -- command */
+uint16_t        lcdctl2;        /* LCD display control -- data */
+uint16_t        lcdcurs;        /* LCD graphics pixel byte address */
+uint16_t        lcdrow;         /* LCD text row */
+uint16_t        lcdx;           /* LCD graphics x */
+uint16_t        lcdy;           /* LCD graphics y */
 
 /* GLC initialization values */
 
-char glc_is1[] = { 0x12, 0x05, 0x07, 0x54, 0x58, 0x3F, 0x55, 0x00 };
-char glc_is2[] = { 0x00, 0x00, 0x3F, 0x00, 0x20, 0x3F, 0x00, 0x00 };
+int8_t glc_is1[] = { 0x12, 0x05, 0x07, 0x54, 0x58, 0x3F, 0x55, 0x00 };
+int8_t glc_is2[] = { 0x00, 0x00, 0x3F, 0x00, 0x20, 0x3F, 0x00, 0x00 };
 
 /* 
@@ -89 +89 @@
 */
 
-void GLCdisp(short dsp, short crs, short blk1, short blk2, short blk3)
-{
-        register short val;
+void GLCdisp(int16_t dsp, int16_t crs, int16_t blk1, int16_t blk2, int16_t blk3)
+{
+        register int16_t val;
 
         val = ((blk3 & 3) << 6) | ((blk2 & 3) << 4) | ((blk1 & 3) << 2) |
@@ -110 +110 @@
 */
 
-void GLCcurs(short crs)
+void GLCcurs(int16_t crs)
 {
         lcdctl2 = (crs & 3) | (lcdctl2 & ~3);
@@ -131 +131 @@
 void GLCinit(void)
 {
-        register int    i;
-        register long ic;
-        register char *gp;
+        register int16_t        i;
+        register int32_t ic;
+        register int8_t *gp;
 
         lcdbase = G_PLANE2;     /* set defaults for graphics variables */
@@ -205 +205 @@
 */
 
-unsigned GLCcrc(unsigned row, unsigned col)
-{
-        unsigned curad;
+uint16_t GLCcrc(uint16_t row, uint16_t col)
+{
+        uint16_t curad;
 
         curad = col + (row * 85);       /* calculate cursor location */
@@ -235 +235 @@
 */
 
-unsigned GLCcxy(unsigned x, unsigned y)
-{
-        register unsigned curad, xby6;
+uint16_t GLCcxy(uint16_t x, uint16_t y)
+{
+        register uint16_t curad, xby6;
 
         /* calculate cursor address */
@@ -277 +277 @@
 */
 
-void GLCwrts(char *s)
+void GLCwrts(int8_t *s)
 {
         LCD_WC = G_CRSMRT;      /* set cursor motion =  right */
@@ -304 +304 @@
 */
 
-void GLCtext(unsigned row, unsigned col, char *s)
-{
-        register unsigned curad;
+void GLCtext(uint16_t row, uint16_t col, int8_t *s)
+{
+        register uint16_t curad;
 
         curad = col + (row * 85);       /* calculate cursor address */