From e1e000b177427bde534ac7e6ca885c2226bb60d6 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Sat, 31 Dec 2011 03:30:40 -0500
Subject: [PATCH] vgabios: Rename vga.c to vgabios.c.

Also, rename vgatables.h to vgabios.h.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 Makefile                          | 2 +-
 vgasrc/bochsvga.c                 | 4 ++--
 vgasrc/bochsvga.h                 | 6 +++---
 vgasrc/clext.c                    | 2 +-
 vgasrc/geodelx.c                  | 2 +-
 vgasrc/{vga.c => vgabios.c}       | 2 +-
 vgasrc/{vgatables.h => vgabios.h} | 8 ++++----
 vgasrc/vgafb.c                    | 2 +-
 vgasrc/vgafonts.c                 | 2 +-
 vgasrc/vgaio.c                    | 2 +-
 vgasrc/vgatables.c                | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)
 rename vgasrc/{vga.c => vgabios.c} (99%)
 rename vgasrc/{vgatables.h => vgabios.h} (98%)

diff --git a/Makefile b/Makefile
index 3d60b88..2346ee3 100644
--- a/Makefile
+++ b/Makefile
@@ -169,7 +169,7 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
 ################ VGA build rules
 
 # VGA src files
-SRCVGA=src/output.c src/util.c vgasrc/vga.c vgasrc/vgafb.c vgasrc/vgaio.c \
+SRCVGA=src/output.c src/util.c vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgaio.c \
     vgasrc/vgatables.c vgasrc/vgafonts.c \
     vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodelx.c
 
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 99d4041..9dd142b 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -1,8 +1,8 @@
-#include "vgatables.h"
+#include "vgabios.h" // struct vbe_modeinfo
 #include "vbe.h"
 #include "bochsvga.h"
 #include "util.h"
-#include "config.h" // CONFIG_
+#include "config.h" // CONFIG_*
 #include "biosvar.h" // SET_BDA
 
 static struct mode
diff --git a/vgasrc/bochsvga.h b/vgasrc/bochsvga.h
index aaa3a97..f0263d7 100644
--- a/vgasrc/bochsvga.h
+++ b/vgasrc/bochsvga.h
@@ -1,5 +1,5 @@
-#ifndef __DISPI_H
-#define __DISPI_H
+#ifndef __BOCHSVGA_H
+#define __BOCHSVGA_H
 
 #include "types.h" // u8
 #include "ioport.h" // outb
@@ -64,4 +64,4 @@ void bochsvga_clear_scr(void);
 int bochsvga_hires_enabled(void);
 u16 bochsvga_curr_mode(void);
 
-#endif
+#endif // bochsvga.h
diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index b2c59fb..40447ff 100644
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -5,7 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgatables.h" // cirrus_init
+#include "vgabios.h" // cirrus_init
 #include "biosvar.h" // GET_GLOBAL
 #include "util.h" // dprintf
 #include "bregs.h" // struct bregs
diff --git a/vgasrc/geodelx.c b/vgasrc/geodelx.c
index 6c0f838..1d58be0 100644
--- a/vgasrc/geodelx.c
+++ b/vgasrc/geodelx.c
@@ -10,7 +10,7 @@
 #include "ioport.h" // outb
 #include "farptr.h" // SET_FARVAR
 #include "biosvar.h" // GET_BDA
-#include "vgatables.h" // VGAREG_*
+#include "vgabios.h" // VGAREG_*
 #include "util.h" // memset
 #include "config.h"
 #include "types.h"
diff --git a/vgasrc/vga.c b/vgasrc/vgabios.c
similarity index 99%
rename from vgasrc/vga.c
rename to vgasrc/vgabios.c
index 9e5884b..2ff677e 100644
--- a/vgasrc/vga.c
+++ b/vgasrc/vgabios.c
@@ -14,7 +14,7 @@
 #include "bregs.h" // struct bregs
 #include "biosvar.h" // GET_BDA
 #include "util.h" // memset
-#include "vgatables.h" // find_vga_entry
+#include "vgabios.h" // find_vga_entry
 #include "optionroms.h" // struct pci_data
 #include "config.h" // CONFIG_*
 #include "vbe.h" // struct vbe_info
diff --git a/vgasrc/vgatables.h b/vgasrc/vgabios.h
similarity index 98%
rename from vgasrc/vgatables.h
rename to vgasrc/vgabios.h
index e0d61c9..913dd88 100644
--- a/vgasrc/vgatables.h
+++ b/vgasrc/vgabios.h
@@ -1,5 +1,5 @@
-#ifndef __VGATABLES_H
-#define __VGATABLES_H
+#ifndef __VGABIOS_H
+#define __VGABIOS_H
 
 #include "types.h" // u8
 #include "farptr.h" // struct segoff_s
@@ -145,7 +145,7 @@ extern u8 vgafont16[];
 extern u8 vgafont14alt[];
 extern u8 vgafont16alt[];
 
-// vga.c
+// vgabios.c
 #define SET_VGA(var, val) SET_FARVAR(get_global_seg(), (var), (val))
 struct carattr {
     u8 car, attr, use_attr;
@@ -222,4 +222,4 @@ struct vbe_modeinfo
     u32 vram_size;
 };
 
-#endif // vgatables.h
+#endif // vgabios.h
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index 1e1943d..f85cd28 100644
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -7,7 +7,7 @@
 
 #include "biosvar.h" // GET_BDA
 #include "util.h" // memset_far
-#include "vgatables.h" // find_vga_entry
+#include "vgabios.h" // find_vga_entry
 
 
 /****************************************************************
diff --git a/vgasrc/vgafonts.c b/vgasrc/vgafonts.c
index 8c1752c..47a6437 100644
--- a/vgasrc/vgafonts.c
+++ b/vgasrc/vgafonts.c
@@ -1,4 +1,4 @@
-#include "vgatables.h" // vgafont8
+#include "vgabios.h" // vgafont8
 
 /*
  * These fonts come from ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip
diff --git a/vgasrc/vgaio.c b/vgasrc/vgaio.c
index 6154076..bc4c968 100644
--- a/vgasrc/vgaio.c
+++ b/vgasrc/vgaio.c
@@ -8,7 +8,7 @@
 #include "ioport.h" // outb
 #include "farptr.h" // SET_FARVAR
 #include "biosvar.h" // GET_BDA
-#include "vgatables.h" // VGAREG_*
+#include "vgabios.h" // VGAREG_*
 
 // TODO
 //  * replace direct in/out calls with wrapper functions
diff --git a/vgasrc/vgatables.c b/vgasrc/vgatables.c
index 47395f2..90ffa89 100644
--- a/vgasrc/vgatables.c
+++ b/vgasrc/vgatables.c
@@ -5,7 +5,7 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgatables.h" // struct VideoParamTableEntry_s
+#include "vgabios.h" // struct VideoParamTableEntry_s
 #include "biosvar.h" // GET_GLOBAL
 #include "util.h" // memcpy_far
 
-- 
2.25.1