Changeset bf89cfb in buchla-68k for vlib/glcinit.c

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.

File:

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

vlib/glcinit.c

@@ -9 +9 @@
                 Initializes the GLC.
 
-        unsigned
         GLCcrc(row, col)
-        unsigned row, col;
 
                 Positions the GLC cursor at ('row', 'col') preparatory
                 to writing text.  Returns the calculated cursor address.
 
-        unsigned
         GLCcxy(x, y)
-        unsigned x, y;
 
                 Positions the GLC cursor at ('x', 'y') preparatory to
@@ -26 +22 @@
 
         GLCwrts(s)
-        char *s;
 
                 Writes the character string pointed to by 's' at the
@@ -34 +29 @@
 
         GLCtext(row, col, s)
-        unsigned row, col;
-        char *s;
 
                 Sets the GLC cursor to ('row', 'col'), then writes the
@@ -43 +36 @@
 
         GLCdisp(dsp, crs, blk1, blk2, blk3)
-        short dsp, crs, blk1, blk2, blk3;
 
                 Sets the overall display, cursor and block status values.
 
         GLCcurs(crs)
-        short crs;
 
                 Turns the cursor on or off.
@@ -56 +47 @@
 #include "ram.h"
 
-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 */
+int32_t         lcdbase;        /* LCD graphics base address */
+int16_t         lcdbit;         /* LCD graphics pixel bit mask */
+int16_t         lcdcol;         /* LCD text column */
+int16_t         lcdctl1;        /* LCD display control -- command */
+int16_t         lcdctl2;        /* LCD display control -- data */
+int32_t         lcdcurs;        /* LCD graphics pixel byte address */
+int16_t         lcdrow;         /* LCD text row */
+int16_t         lcdx;           /* LCD graphics x */
+int16_t         lcdy;           /* LCD graphics y */
 
 /* GLC initialization values */
 
-int8_t glc_is1[] = { 0x12, 0x05, 0x07, 0x54, 0x58, 0x3F, 0x55, 0x00 };
-int8_t glc_is2[] = { 0x00, 0x00, 0x3F, 0x00, 0x20, 0x3F, 0x00, 0x00 };
+uint8_t glc_is1[] = { 0x12, 0x05, 0x07, 0x54, 0x58, 0x3F, 0x55, 0x00 };
+uint8_t glc_is2[] = { 0x00, 0x00, 0x3F, 0x00, 0x20, 0x3F, 0x00, 0x00 };
 
 /*
@@ -88 +79 @@
         lcdctl2 = val;
 
-        LCD_WC = lcdctl1;
-        LCD_WD = lcdctl2;
+        LCD_WC = (uint8_t)lcdctl1;
+        LCD_WD = (uint8_t)lcdctl2;
 
 }
@@ -103 +94 @@
         lcdctl2 = (crs & 3) | (lcdctl2 & ~3);
 
-        LCD_WC = lcdctl1;
-        LCD_WD = lcdctl2;
+        LCD_WC = (uint8_t)lcdctl1;
+        LCD_WD = (uint8_t)lcdctl2;
 }
 
@@ -118 +109 @@
         register int16_t        i;
         register int32_t ic;
-        register int8_t *gp;
+        register uint8_t *gp;
 
         lcdbase = G_PLANE2;     /* set defaults for graphics variables */
@@ -135 +126 @@
 
         for (i = 0; i < 8; i++)
-                LCD_WD= *gp++;
+                LCD_WD = *gp++;
 
         LCD_WC = G_SETSAD;      /* setup scroll registers */
@@ -184 +175 @@
 */
 
-uint16_t GLCcrc(uint16_t row, uint16_t col)
-{
-        uint16_t curad;
+int16_t GLCcrc(int16_t row, int16_t col)
+{
+        int16_t curad;
 
         curad = col + (row * 85);       /* calculate cursor location */
 
         LCD_WC = G_CRSWR;               /* send cursor address to GLC */
-        LCD_WD = curad & 0xFF;
-        LCD_WD = (curad >> 8) & 0xFF;
+        LCD_WD = (uint8_t)(curad & 0xFF);
+        LCD_WD = (uint8_t)((curad >> 8) & 0xFF);
 
         lcdrow = row;                   /* set text cursor variables */
@@ -210 +201 @@
 */
 
-uint16_t GLCcxy(uint16_t x, uint16_t y)
-{
-        register uint16_t curad, xby6;
+int16_t GLCcxy(int16_t x, int16_t y)
+{
+        register int32_t curad, xby6;
 
         /* calculate cursor address */
@@ -223 +214 @@
 
         LCD_WC = G_CRSWR;
-        LCD_WD = curad & 0xFF;
-        LCD_WD = (curad >> 8) & 0xFF;
+        LCD_WD = (uint8_t)(curad & 0xFF);
+        LCD_WD = (uint8_t)((curad >> 8) & 0xFF);
 
         /* set graphics variables */
@@ -256 +247 @@
         while (*s) {            /* write string to GLC */
 
-                LCD_WD = *s++;
+                LCD_WD = (uint8_t)*s++;
                 lcdcol++;       /* keep column variable up to date */
         }
@@ -271 +262 @@
 */
 
-void GLCtext(uint16_t row, uint16_t col, int8_t *s)
-{
-        register uint16_t curad;
+void GLCtext(int16_t row, int16_t col, int8_t *s)
+{
+        register int16_t curad;
 
         curad = col + (row * 85);       /* calculate cursor address */
 
         LCD_WC = G_CRSWR;               /* send cursor address to GLC */
-        LCD_WD = curad & 0xFF;
-        LCD_WD = (curad >> 8) & 0xFF;
+        LCD_WD = (uint8_t)(curad & 0xFF);
+        LCD_WD = (uint8_t)((curad >> 8) & 0xFF);
 
         lcdrow = row;                   /* set GLC text cursor variables */
@@ -290 +281 @@
         while (*s) {                    /* write string to GLC */
 
-                LCD_WD = *s++;
+                LCD_WD = (uint8_t)*s++;
                 lcdcol++;               /* keep cursor column up to date */
         }