aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2013-09-14 22:29:32 -0400
committerKevin O'Connor <kevin@koconnor.net>2013-09-18 20:48:34 -0400
commit2e57c81f1d2b14b88ea0b1003f14140bf7fd71fb (patch)
tree46d5e2eb4cf0af820524a54d7ac4a3c7032e5351
parent8fb3a5edf3ca4e55d51c6555b8f7810fdfc4451c (diff)
downloadseabios-2e57c81f1d2b14b88ea0b1003f14140bf7fd71fb.tar.gz
Move vbe.h to std/vbe.h.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/bootsplash.c2
-rw-r--r--src/std/vbe.h (renamed from src/vbe.h)0
-rw-r--r--vgasrc/bochsvga.c2
-rw-r--r--vgasrc/vbe.c2
-rw-r--r--vgasrc/vgabios.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/src/bootsplash.c b/src/bootsplash.c
index b7b3eb8..3c08f5d 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -15,9 +15,9 @@
#include "output.h" // dprintf
#include "romfile.h" // romfile_loadfile
#include "stacks.h" // call16_int
+#include "std/vbe.h" // struct vbe_info
#include "string.h" // memset
#include "util.h" // enable_bootsplash
-#include "vbe.h" // struct vbe_info
/****************************************************************
diff --git a/src/vbe.h b/src/std/vbe.h
index 94b4ad8..94b4ad8 100644
--- a/src/vbe.h
+++ b/src/std/vbe.h
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 4eda887..750624a 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -12,8 +12,8 @@
#include "hw/pci.h" // pci_config_readl
#include "hw/pci_regs.h" // PCI_BASE_ADDRESS_0
#include "output.h" // dprintf
+#include "std/vbe.h" // VBE_CAPABILITY_8BIT_DAC
#include "stdvga.h" // VGAREG_SEQU_ADDRESS
-#include "vbe.h" // VBE_CAPABILITY_8BIT_DAC
#include "vgabios.h" // struct vbe_modeinfo
diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index 9026b77..f7e2203 100644
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -10,8 +10,8 @@
#include "bregs.h" // struct bregs
#include "config.h" // CONFIG_*
#include "output.h" // dprintf
+#include "std/vbe.h" // struct vbe_info
#include "string.h" // memset_far
-#include "vbe.h" // struct vbe_info
#include "vgabios.h" // handle_104f
#include "vgahw.h" // vgahw_set_mode
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index a07fc91..0769330 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -13,10 +13,10 @@
#include "hw/pci_regs.h" // PCI_VENDOR_ID
#include "output.h" // dprintf
#include "std/optionrom.h" // struct pci_data
+#include "std/vbe.h" // VBE_RETURN_STATUS_FAILED
#include "stdvga.h" // stdvga_set_cursor_shape
#include "string.h" // memset_far
#include "util.h" // VERSION
-#include "vbe.h" // VBE_RETURN_STATUS_FAILED
#include "vgabios.h" // calc_page_size
#include "vgahw.h" // vgahw_set_mode