- cleaned up VBE memory size definitions (removed duplicate defines, main

  definition now in vbetables-gen.c)

4 files changed, 7 insertions, 8 deletions

diff --git a/vbe.c b/vbe.c
index ce5c62e..f85ec99 100644
--- a/vbe.c
+++ b/vbe.c
@@ -38,6 +38,7 @@
 #include "vbe.h"
 #include "vbetables.h"
 
+#define VBE_TOTAL_VIDEO_MEMORY_DIV_64K (VBE_DISPI_TOTAL_VIDEO_MEMORY_MB*1024/64)
 
 // The current OEM Software Revision of this VBE Bios
 #define VBE_OEM_SOFTWARE_REV 0x0002;
diff --git a/vbe.h b/vbe.h
index aefc009..60434ac 100644
--- a/vbe.h
+++ b/vbe.h
@@ -275,8 +275,6 @@ typedef struct ModeInfoListItem
 //        like 0xE0000000
 
 
-  #define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8
-
   #define VBE_DISPI_BANK_ADDRESS          0xA0000
   #define VBE_DISPI_BANK_SIZE_KB          64
   
@@ -312,8 +310,4 @@ typedef struct ModeInfoListItem
   
   #define VBE_DISPI_LFB_PHYSICAL_ADDRESS  0xE0000000
 
-
-#define VBE_TOTAL_VIDEO_MEMORY_DIV_64K                  (VBE_DISPI_TOTAL_VIDEO_MEMORY_MB*1024/64)
-
-
 #endif
diff --git a/vbe_display_api.txt b/vbe_display_api.txt
index afd988b..ddec277 100644
--- a/vbe_display_api.txt
+++ b/vbe_display_api.txt
@@ -84,7 +84,10 @@ Abbreviations
 
 #defines
 --------
+vbetables-gen.c
   #define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8
+
+vbe.h
   #define VBE_DISPI_BANK_ADDRESS          0xA0000
   #define VBE_DISPI_BANK_SIZE_KB          64
   
@@ -207,7 +210,7 @@ API
     The new flag VBE_DISPI_8BIT_DAC switches the DAC to 8 bit mode.
 
 [0xb0c4]
-  * VBE_DISPI_TOTAL_VIDEO_MEMORY_MB set to 8
+  * VBE_DISPI_TOTAL_VIDEO_MEMORY_MB set to 8 (moved to auto-generated vbetables.h)
 
 Displaying GFX (banked mode)
 --------------
diff --git a/vbetables-gen.c b/vbetables-gen.c
index 97243a8..be11bb1 100644
--- a/vbetables-gen.c
+++ b/vbetables-gen.c
@@ -66,7 +66,8 @@ int main(int argc, char **argv)
   const char *str;
   long vram_size = VBE_DISPI_TOTAL_VIDEO_MEMORY_MB * 1024 * 1024;
 
-  printf("/* THIS FILE IS AUTOMATICALLY GENERATED - DO NOT EDIT */\n");
+  printf("/* THIS FILE IS AUTOMATICALLY GENERATED - DO NOT EDIT */\n\n");
+  printf("#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB %d\n\n", VBE_DISPI_TOTAL_VIDEO_MEMORY_MB);
   printf("static ModeInfoListItem mode_info_list[]=\n");
   printf("{\n");
   for (pm = modes; pm->mode != 0; pm++) {