Move function definitions for output.c from util.h to new file output.h.

Also, sort the order of include files in the c files.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

7 files changed, 32 insertions, 31 deletions

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index fcdf7e90..4eda887f 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -6,15 +6,15 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgabios.h" // struct vbe_modeinfo
-#include "vbe.h" // VBE_CAPABILITY_8BIT_DAC
+#include "biosvar.h" // GET_GLOBAL
 #include "bochsvga.h" // bochsvga_set_mode
-#include "util.h" // dprintf
 #include "config.h" // CONFIG_*
-#include "biosvar.h" // GET_GLOBAL
-#include "stdvga.h" // VGAREG_SEQU_ADDRESS
 #include "hw/pci.h" // pci_config_readl
 #include "hw/pci_regs.h" // PCI_BASE_ADDRESS_0
+#include "output.h" // dprintf
+#include "stdvga.h" // VGAREG_SEQU_ADDRESS
+#include "vbe.h" // VBE_CAPABILITY_8BIT_DAC
+#include "vgabios.h" // struct vbe_modeinfo
 
 
 /****************************************************************
diff --git a/vgasrc/clext.c b/vgasrc/clext.c
index 6fc63376..93085cf1 100644
--- a/vgasrc/clext.c
+++ b/vgasrc/clext.c
@@ -5,15 +5,15 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "clext.h" // clext_setup
-#include "vgabios.h" // VBE_VENDOR_STRING
 #include "biosvar.h" // GET_GLOBAL
-#include "util.h" // dprintf
 #include "bregs.h" // struct bregs
-#include "stdvga.h" // VGAREG_SEQU_ADDRESS
+#include "clext.h" // clext_setup
 #include "hw/pci.h" // pci_config_readl
 #include "hw/pci_regs.h" // PCI_BASE_ADDRESS_0
+#include "output.h" // dprintf
+#include "stdvga.h" // VGAREG_SEQU_ADDRESS
 #include "string.h" // memset16_far
+#include "vgabios.h" // VBE_VENDOR_STRING
 
 
 /****************************************************************
diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c
index 4a63068e..f8f61c3a 100644
--- a/vgasrc/geodevga.c
+++ b/vgasrc/geodevga.c
@@ -6,14 +6,14 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "geodevga.h" // geodevga_setup
-#include "farptr.h" // SET_FARVAR
 #include "biosvar.h" // GET_BDA
-#include "vgabios.h" // VGAREG_*
-#include "util.h" // dprintf
-#include "stdvga.h" // stdvga_crtc_write
+#include "farptr.h" // SET_FARVAR
+#include "geodevga.h" // geodevga_setup
 #include "hw/pci.h" // pci_config_readl
 #include "hw/pci_regs.h" // PCI_BASE_ADDRESS_0
+#include "output.h" // dprintf
+#include "stdvga.h" // stdvga_crtc_write
+#include "vgabios.h" // VGAREG_*
 
 
 /****************************************************************
diff --git a/vgasrc/stdvgamodes.c b/vgasrc/stdvgamodes.c
index f22f82c9..dda35db1 100644
--- a/vgasrc/stdvgamodes.c
+++ b/vgasrc/stdvgamodes.c
@@ -5,11 +5,11 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgabios.h" // struct VideoParamTableEntry_s
 #include "biosvar.h" // GET_GLOBAL
-#include "util.h" // warn_internalerror
+#include "output.h" // warn_internalerror
 #include "stdvga.h" // stdvga_find_mode
 #include "string.h" // memcpy_far
+#include "vgabios.h" // struct VideoParamTableEntry_s
 
 
 /****************************************************************
diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index 8595e692..9026b77d 100644
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -6,14 +6,14 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgabios.h" // handle_104f
-#include "config.h" // CONFIG_*
+#include "biosvar.h" // GET_GLOBAL
 #include "bregs.h" // struct bregs
+#include "config.h" // CONFIG_*
+#include "output.h" // dprintf
+#include "string.h" // memset_far
 #include "vbe.h" // struct vbe_info
-#include "util.h" // dprintf
-#include "biosvar.h" // GET_GLOBAL
+#include "vgabios.h" // handle_104f
 #include "vgahw.h" // vgahw_set_mode
-#include "string.h" // memset_far
 
 u32 VBE_total_memory VAR16 = 256 * 1024;
 u32 VBE_capabilities VAR16;
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 12cd782f..5206da92 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -5,19 +5,20 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "bregs.h" // struct bregs
 #include "biosvar.h" // GET_BDA
-#include "util.h" // dprintf
-#include "vgabios.h" // calc_page_size
-#include "optionroms.h" // struct pci_data
-#include "config.h" // CONFIG_*
-#include "stdvga.h" // stdvga_set_cursor_shape
+#include "bregs.h" // struct bregs
 #include "clext.h" // clext_1012
-#include "vgahw.h" // vgahw_set_mode
-#include "vbe.h" // VBE_RETURN_STATUS_FAILED
+#include "config.h" // CONFIG_*
 #include "hw/pci.h" // pci_config_readw
 #include "hw/pci_regs.h" // PCI_VENDOR_ID
+#include "optionroms.h" // struct pci_data
+#include "output.h" // dprintf
+#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
 
 // Standard Video Save Pointer Table
 struct VideoSavePointer_s {
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index 1fa11b55..815d54b5 100644
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -5,12 +5,12 @@
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
-#include "vgabios.h" // vgafb_scroll
 #include "biosvar.h" // GET_BDA
-#include "util.h" // dprintf
 #include "byteorder.h" // cpu_to_be16
+#include "output.h" // dprintf
 #include "stdvga.h" // stdvga_planar4_plane
 #include "string.h" // memset_far
+#include "vgabios.h" // vgafb_scroll
 
 
 /****************************************************************