Merge remote-tracking branch 'origin/master' into obsdobsd

3 files changed, 20 insertions, 22 deletions

diff --git a/src/cim/cim_gp.c b/src/cim/cim_gp.c
index 2085d4f..4ab909f 100644
--- a/src/cim/cim_gp.c
+++ b/src/cim/cim_gp.c
@@ -2642,7 +2642,7 @@ gp_masked_blt(unsigned long dstoffset, unsigned long width,
     unsigned long total_dwords, size_dwords;
     unsigned long dword_count, byte_count;
     unsigned long srcoffset, size;
-    unsigned long i, ch3_offset, base;
+    unsigned long j, ch3_offset, base;
     unsigned long flags = 0;
 
     if (gp3_blt_flags & CIMGP_BLTFLAGS_INVERTMONO)
@@ -2688,7 +2688,7 @@ gp_masked_blt(unsigned long dstoffset, unsigned long width,
     WRITE_GP32(GP3_CMD_WRITE, gp3_cmd_next);
     gp3_cmd_current = gp3_cmd_next;
 
-    for (i = 0; i < height; i++) {
+    for (j = 0; j < height; j++) {
         /* UPDATE THE COMMAND POINTER
          * The WRITE_COMMANDXX macros use a pointer to the current buffer
          * space.  This is created by adding gp3_cmd_current to the base
@@ -2880,7 +2880,7 @@ gp_screen_to_screen_masked(unsigned long dstoffset, unsigned long srcoffset,
     unsigned long total_dwords, size_dwords;
     unsigned long dword_count, byte_count;
     unsigned long srcoff, size;
-    unsigned long i, base;
+    unsigned long j, base;
     unsigned long flags = 0;
 
     if (gp3_blt_flags & CIMGP_BLTFLAGS_INVERTMONO)
@@ -2926,7 +2926,7 @@ gp_screen_to_screen_masked(unsigned long dstoffset, unsigned long srcoffset,
     WRITE_GP32(GP3_CMD_WRITE, gp3_cmd_next);
     gp3_cmd_current = gp3_cmd_next;
 
-    for (i = 0; i < height; i++) {
+    for (j = 0; j < height; j++) {
         /* UPDATE THE COMMAND POINTER
          * The WRITE_COMMANDXX macros use a pointer to the current buffer
          * space. This is created by adding gp3_cmd_current to the base
diff --git a/src/cim/cim_msr.c b/src/cim/cim_msr.c
index d43bc4b..0d3c571 100644
--- a/src/cim/cim_msr.c
+++ b/src/cim/cim_msr.c
@@ -35,7 +35,7 @@
 /* as well as a lookup table for easy device addressing.        */
 /*--------------------------------------------------------------*/
 
-GEODELINK_NODE gliu_nodes[24];
+GEODELINK_NODE gliu_node_list[24];
 GEODELINK_NODE msr_dev_lookup[MSR_DEVICE_EMPTY];
 
 #define GET_DEVICE_ID(macrohigh, macrolow) ((macrolow >> 12) & 0xFF)
@@ -79,7 +79,7 @@ msr_init_table(void)
     if (return_value == CIM_STATUS_OK) {
         /* BUILD LOCAL COPY OF THE GEODELINK BUS */
 
-        msr_create_geodelink_table(gliu_nodes);
+        msr_create_geodelink_table(gliu_node_list);
 
         /* CLEAR TABLE STATUS */
 
@@ -107,7 +107,7 @@ msr_init_table(void)
         for (i = 0; i < MSR_DEVICE_EMPTY; i++) {
             if (msr_dev_lookup[i].device_id == MSR_DEVICE_NOTFOUND) {
                 for (j = 0; j < 24; j++) {
-                    if (gliu_nodes[j].device_id == i)
+                    if (gliu_node_list[j].device_id == i)
                         break;
                 }
 
@@ -116,7 +116,7 @@ msr_init_table(void)
                 else {
                     msr_dev_lookup[i].device_id = MSR_DEVICE_PRESENT;
                     msr_dev_lookup[i].address_from_cpu =
-                        gliu_nodes[j].address_from_cpu;
+                        gliu_node_list[j].address_from_cpu;
                 }
             }
         }
@@ -125,8 +125,8 @@ msr_init_table(void)
         /* ERROR OUT THE GEODELINK TABLES */
 
         for (i = 0; i < 24; i++) {
-            gliu_nodes[i].address_from_cpu = 0xFFFFFFFF;
-            gliu_nodes[i].device_id = MSR_DEVICE_EMPTY;
+            gliu_node_list[i].address_from_cpu = 0xFFFFFFFF;
+            gliu_node_list[i].device_id = MSR_DEVICE_EMPTY;
         }
 
         for (i = 0; i < MSR_DEVICE_EMPTY; i++) {
diff --git a/src/cim/cim_vg.c b/src/cim/cim_vg.c
index 46984b5..a8a875b 100644
--- a/src/cim/cim_vg.c
+++ b/src/cim/cim_vg.c
@@ -1381,8 +1381,6 @@ vg_get_current_display_mode(VG_DISPLAY_MODE * current_display, int *bpp)
     /* Cimarron when returning the current mode information.          */
 
     if (vg3_panel_enable) {
-        Q_WORD msr_value;
-
         flags |= VG_MODEFLAG_PANELOUT;
 
         current_display->panel_width = vg3_panel_width;
@@ -2736,7 +2734,7 @@ vg_save_state(VG_SAVE_RESTORE * vg_state)
 int
 vg_restore_state(VG_SAVE_RESTORE * vg_state)
 {
-    unsigned long irqfilt, i;
+    unsigned long irqfilt, j;
     unsigned long memoffset;
 
     /* TEMPORARILY UNLOCK ALL REGISTERS */
@@ -2801,27 +2799,27 @@ vg_restore_state(VG_SAVE_RESTORE * vg_state)
     /* RESTORE THE PALETTE */
 
     WRITE_REG32(DC3_PAL_ADDRESS, 0);
-    for (i = 0; i < 261; i++)
-        WRITE_REG32(DC3_PAL_DATA, vg_state->palette[i]);
+    for (j = 0; j < 261; j++)
+        WRITE_REG32(DC3_PAL_DATA, vg_state->palette[j]);
 
     /* RESTORE THE HORIZONTAL FILTER COEFFICIENTS */
 
     irqfilt = READ_REG32(DC3_IRQ_FILT_CTL);
     irqfilt |= DC3_IRQFILT_H_FILT_SEL;
 
-    for (i = 0; i < 256; i++) {
-        WRITE_REG32(DC3_IRQ_FILT_CTL, ((irqfilt & 0xFFFFFF00L) | i));
-        WRITE_REG32(DC3_FILT_COEFF1, vg_state->h_coeff[(i << 1)]);
-        WRITE_REG32(DC3_FILT_COEFF2, vg_state->h_coeff[(i << 1) + 1]);
+    for (j = 0; j < 256; j++) {
+        WRITE_REG32(DC3_IRQ_FILT_CTL, ((irqfilt & 0xFFFFFF00L) | j));
+        WRITE_REG32(DC3_FILT_COEFF1, vg_state->h_coeff[(j << 1)]);
+        WRITE_REG32(DC3_FILT_COEFF2, vg_state->h_coeff[(j << 1) + 1]);
     }
 
     /* RESTORE VERTICAL COEFFICIENTS */
 
     irqfilt &= ~DC3_IRQFILT_H_FILT_SEL;
 
-    for (i = 0; i < 256; i++) {
-        WRITE_REG32(DC3_IRQ_FILT_CTL, ((irqfilt & 0xFFFFFF00L) | i));
-        WRITE_REG32(DC3_FILT_COEFF1, vg_state->v_coeff[i]);
+    for (j = 0; j < 256; j++) {
+        WRITE_REG32(DC3_IRQ_FILT_CTL, ((irqfilt & 0xFFFFFF00L) | j));
+        WRITE_REG32(DC3_FILT_COEFF1, vg_state->v_coeff[j]);
     }
 
     /* RESTORE THE CURSOR DATA */