vgabios: Move static_functionality[] from vgatables.c to vgabios.c.

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

diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 84b112cb1483a075262c3bd8a6307ab7c0144caf..cd39cf1311a910e4e69ca6080d8a242bdabdab60 100644 (file)
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -1010,6 +1010,22 @@ handle_101a(struct bregs *regs)
 }
 
 
+static u8 static_functionality[0x10] VAR16 = {
+ /* 0 */ 0xff,  // All modes supported #1
+ /* 1 */ 0xe0,  // All modes supported #2
+ /* 2 */ 0x0f,  // All modes supported #3
+ /* 3 */ 0x00, 0x00, 0x00, 0x00,  // reserved
+ /* 7 */ 0x07,  // 200, 350, 400 scan lines
+ /* 8 */ 0x02,  // mamimum number of visible charsets in text mode
+ /* 9 */ 0x08,  // total number of charset blocks in text mode
+ /* a */ 0xe7,  // Change to add new functions
+ /* b */ 0x0c,  // Change to add new functions
+ /* c */ 0x00,  // reserved
+ /* d */ 0x00,  // reserved
+ /* e */ 0x00,  // Change to add new functions
+ /* f */ 0x00   // reserved
+};
+
 struct funcInfo {
     struct segoff_s static_functionality;
     u8 bda_0x49[30];

diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index d0af248b9503c13ce7bf73fd883d9125d3942e65..3f86146db778dfea2d76ac53347e3b3e4a99739b 100644 (file)
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -53,7 +53,6 @@ struct vgamode_s {
 // vgatables.c
 void build_video_param(void);
 extern struct VideoSavePointer_s video_save_pointer_table;
-extern u8 static_functionality[];
 
 // vgafonts.c
 extern u8 vgafont8[];

diff --git a/vgasrc/vgatables.c b/vgasrc/vgatables.c
index e62b11ebd7dabe5b54c5bdfe97824f6a7a15b967..11e20e4ef5f4234f0e9cb612e749496b80b50a02 100644 (file)
--- a/vgasrc/vgatables.c
+++ b/vgasrc/vgatables.c
@@ -396,24 +396,3 @@ stdvga_find_mode(int mode)
     }
     return NULL;
 }
-
-
-/****************************************************************
- * Static functionality table
- ****************************************************************/
-
-u8 static_functionality[0x10] VAR16 = {
- /* 0 */ 0xff,  // All modes supported #1
- /* 1 */ 0xe0,  // All modes supported #2
- /* 2 */ 0x0f,  // All modes supported #3
- /* 3 */ 0x00, 0x00, 0x00, 0x00,  // reserved
- /* 7 */ 0x07,  // 200, 350, 400 scan lines
- /* 8 */ 0x02,  // mamimum number of visible charsets in text mode
- /* 9 */ 0x08,  // total number of charset blocks in text mode
- /* a */ 0xe7,  // Change to add new functions
- /* b */ 0x0c,  // Change to add new functions
- /* c */ 0x00,  // reserved
- /* d */ 0x00,  // reserved
- /* e */ 0x00,  // Change to add new functions
- /* f */ 0x00   // reserved
-};