geodevga: Rename defines to better match a well defined naming schema

The following nameing schema is used:
    PART_REGISTER_BIT_DESCRIPTION

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>

diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c
index cf1382d444eae8c43e7103fea5af1312af5ddf73..7d780c24b22541a2da142c78cc64f04b868aface 100644 (file)
--- a/vgasrc/geodevga.c
+++ b/vgasrc/geodevga.c
@@ -206,8 +206,8 @@ static void dc_setup(void)
     if (geode_dc_read(DC_GLIU0_MEM_OFFSET) != fb)
         geode_dc_write(DC_GLIU0_MEM_OFFSET, fb);
 
-    geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, DC_GDEN|DC_TRUP);
-    geode_dc_write(DC_GENERAL_CFG, DC_VGAE);
+    geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, DC_DISPLAY_CFG_GDEN|DC_DISPLAY_CFG_TRUP);
+    geode_dc_write(DC_GENERAL_CFG, DC_DISPLAY_CFG_VGAE);
 
     geode_dc_write(DC_UNLOCK, DC_LOCK_LOCK);
 
@@ -241,13 +241,13 @@ static void vp_setup(void)
 
     u32 reg = geode_vp_read(VP_MISC);
     dprintf(1,"VP_SETUP VP_MISC=0x%08x\n",reg);
-    geode_vp_write(VP_MISC, VP_BYP_BOTH);
+    geode_vp_write(VP_MISC, VP_DCFG_BYP_BOTH);
     reg = geode_vp_read(VP_MISC);
     dprintf(1,"VP_SETUP VP_MISC=0x%08x\n",reg);
 
     reg = geode_vp_read(VP_DCFG);
     dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg);
-    geode_vp_mask(VP_DCFG, 0, VP_CRT_EN|VP_HSYNC_EN|VP_VSYNC_EN|VP_DAC_BL_EN|VP_CRT_SKEW);
+    geode_vp_mask(VP_DCFG, 0, VP_DCFG_CRT_EN|VP_DCFG_HSYNC_EN|VP_DCFG_VSYNC_EN|VP_DCFG_DAC_BL_EN|VP_DCFG_CRT_SKEW);
     reg = geode_vp_read(VP_DCFG);
     dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg);
 }

diff --git a/vgasrc/geodevga.h b/vgasrc/geodevga.h
index 14e33d63b2c312853a1d13949646588d0a53a1be..0fc8cfe94c44c73b13c561eceb13b2a79dfabcec 100644 (file)
--- a/vgasrc/geodevga.h
+++ b/vgasrc/geodevga.h
@@ -49,17 +49,17 @@
 
 
 /* DC bits */
-#define DC_VGAE                         (1 << 7)
-#define DC_GDEN                         (1 << 3)
-#define DC_TRUP                         (1 << 6)
+#define DC_DISPLAY_CFG_VGAE             (1 << 7)
+#define DC_DISPLAY_CFG_GDEN             (1 << 3)
+#define DC_DISPLAY_CFG_TRUP             (1 << 6)
 
 /* VP bits */
-#define VP_CRT_EN                       (1 << 0)
-#define VP_HSYNC_EN                     (1 << 1)
-#define VP_VSYNC_EN                     (1 << 2)
-#define VP_DAC_BL_EN                    (1 << 3)
-#define VP_CRT_SKEW                     (1 << 16)
-#define VP_BYP_BOTH                     (1 << 0)
+#define VP_DCFG_CRT_EN                  (1 << 0)
+#define VP_DCFG_HSYNC_EN                (1 << 1)
+#define VP_DCFG_VSYNC_EN                (1 << 2)
+#define VP_DCFG_DAC_BL_EN               (1 << 3)
+#define VP_DCFG_CRT_SKEW                (1 << 16)
+#define VP_DCFG_BYP_BOTH                (1 << 0)
 
 /* Mask */
 #define DC_CFG_MSK                      0xf000a6