Use CONFIG_ prefix for Kconfig variables; use BUILD_ for others.

Rename remaining "build" settings in config.h that used the CONFIG_
prefix to use a BUILD_ prefix.

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

diff --git a/src/acpi.c b/src/acpi.c
index 7575fc6b792b558c28dd1b79ffd56d51b54d5604..c7177c300369090ecf41769a481d858772e40af6 100644 (file)
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -221,11 +221,11 @@ build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev)
     h->signature = sig;
     h->length = cpu_to_le32(len);
     h->revision = rev;
-    memcpy(h->oem_id, CONFIG_APPNAME6, 6);
-    memcpy(h->oem_table_id, CONFIG_APPNAME4, 4);
+    memcpy(h->oem_id, BUILD_APPNAME6, 6);
+    memcpy(h->oem_table_id, BUILD_APPNAME4, 4);
     memcpy(h->oem_table_id + 4, (void*)&sig, 4);
     h->oem_revision = cpu_to_le32(1);
-    memcpy(h->asl_compiler_id, CONFIG_APPNAME4, 4);
+    memcpy(h->asl_compiler_id, BUILD_APPNAME4, 4);
     h->asl_compiler_revision = cpu_to_le32(1);
     h->checksum -= checksum(h, len);
 }
@@ -879,7 +879,7 @@ acpi_setup(void)
     }
     memset(rsdp, 0, sizeof(*rsdp));
     rsdp->signature = RSDP_SIGNATURE;
-    memcpy(rsdp->oem_id, CONFIG_APPNAME6, 6);
+    memcpy(rsdp->oem_id, BUILD_APPNAME6, 6);
     rsdp->rsdt_physical_address = cpu_to_le32((u32)rsdt);
     rsdp->checksum -= checksum(rsdp, 20);
     RsdpAddr = rsdp;

diff --git a/src/block.c b/src/block.c
index 9ea4ca7449824786b852c79209560bdcedfece73..af7363056ae04f791aadf75c2cd2559acf0ab82f 100644 (file)
--- a/src/block.c
+++ b/src/block.c
@@ -16,7 +16,7 @@
 
 u8 FloppyCount VARFSEG;
 u8 CDCount;
-struct drive_s *IDMap[3][CONFIG_MAX_EXTDRIVE] VARFSEG;
+struct drive_s *IDMap[3][BUILD_MAX_EXTDRIVE] VARFSEG;
 u8 *bounce_buf_fl VARFSEG;
 struct dpte_s DefaultDPTE VARLOW;
 

diff --git a/src/cdrom.c b/src/cdrom.c
index 01eb87a4773a545aaff18dc8ef5f903e49fb8e50..b2811cd09a1e12530ca387757c4e909350182f8b 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -13,7 +13,7 @@
 #include "blockcmd.h" // CDB_CMD_REQUEST_SENSE
 
 // Locks for removable devices
-u8 CDRom_locks[CONFIG_MAX_EXTDRIVE] VARLOW;
+u8 CDRom_locks[BUILD_MAX_EXTDRIVE] VARLOW;
 
 
 /****************************************************************

diff --git a/src/config.h b/src/config.h
index f3918773d76b601607b6eb26c4f69120a4475f1e..0b9b1aba4b9acc5ce122346e02560a9a4f14b501 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,27 +5,27 @@
 
 // Configuration definitions.
 
-//#define CONFIG_APPNAME  "QEMU"
-//#define CONFIG_CPUNAME8 "QEMUCPU "
-//#define CONFIG_APPNAME6 "QEMU  "
-//#define CONFIG_APPNAME4 "QEMU"
-#define CONFIG_APPNAME  "Bochs"
-#define CONFIG_CPUNAME8 "BOCHSCPU"
-#define CONFIG_APPNAME6 "BOCHS "
-#define CONFIG_APPNAME4 "BXPC"
+//#define BUILD_APPNAME  "QEMU"
+//#define BUILD_CPUNAME8 "QEMUCPU "
+//#define BUILD_APPNAME6 "QEMU  "
+//#define BUILD_APPNAME4 "QEMU"
+#define BUILD_APPNAME  "Bochs"
+#define BUILD_CPUNAME8 "BOCHSCPU"
+#define BUILD_APPNAME6 "BOCHS "
+#define BUILD_APPNAME4 "BXPC"
 
 // Maximum number of map entries in the e820 map
-#define CONFIG_MAX_E820 32
+#define BUILD_MAX_E820 32
 // Space to reserve in high-memory for tables
-#define CONFIG_MAX_HIGHTABLE (64*1024)
+#define BUILD_MAX_HIGHTABLE (64*1024)
 // Largest supported externaly facing drive id
-#define CONFIG_MAX_EXTDRIVE 16
+#define BUILD_MAX_EXTDRIVE 16
 // Number of bytes the smbios may be and still live in the f-segment
 #define BUILD_MAX_SMBIOS_FSEG     600
 
-#define CONFIG_MODEL_ID      0xFC
-#define CONFIG_SUBMODEL_ID   0x00
-#define CONFIG_BIOS_REVISION 0x01
+#define BUILD_MODEL_ID      0xFC
+#define BUILD_SUBMODEL_ID   0x00
+#define BUILD_BIOS_REVISION 0x01
 
 // Various memory addresses used by the code.
 #define BUILD_STACK_ADDR          0x7000

diff --git a/src/csm.c b/src/csm.c
index 8882ee5ef8c8c789a6e0655c25bb66af04b98ff2..68f8830b9dd03b482b7ea84d647abc4ee8c21499 100644 (file)
--- a/src/csm.c
+++ b/src/csm.c
@@ -134,9 +134,9 @@ handle_csm_0002(struct bregs *regs)
     for (i=0; i < csm_compat_table.E820Length / sizeof(struct e820entry); i++)
         add_e820(p[i].start, p[i].size, p[i].type);
 
-    if (csm_init_table->HiPmmMemorySizeInBytes > CONFIG_MAX_HIGHTABLE) {
+    if (csm_init_table->HiPmmMemorySizeInBytes > BUILD_MAX_HIGHTABLE) {
         u32 hi_pmm_end = csm_init_table->HiPmmMemory + csm_init_table->HiPmmMemorySizeInBytes;
-        add_e820(hi_pmm_end - CONFIG_MAX_HIGHTABLE, CONFIG_MAX_HIGHTABLE, E820_RESERVED);
+        add_e820(hi_pmm_end - BUILD_MAX_HIGHTABLE, BUILD_MAX_HIGHTABLE, E820_RESERVED);
     }
 
     // For PCIBIOS 1ab10e

diff --git a/src/memmap.c b/src/memmap.c
index f029ce2496ac16670bbee3affc71fd9a7b05f73d..d617b8185c2557fdcbcece13d004d8b505a44ecd 100644 (file)
--- a/src/memmap.c
+++ b/src/memmap.c
@@ -5,7 +5,7 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "memmap.h" // struct e820entry
-#include "config.h" // CONFIG_*
+#include "config.h" // BUILD_MAX_E820
 #include "util.h" // dprintf.h
 
 
@@ -14,7 +14,7 @@
  ****************************************************************/
 
 // Info on e820 map location and size.
-struct e820entry e820_list[CONFIG_MAX_E820] VARFSEG;
+struct e820entry e820_list[BUILD_MAX_E820] VARFSEG;
 int e820_count VARFSEG;
 
 // Remove an entry from the e820_list.
@@ -30,7 +30,7 @@ remove_e820(int i)
 static void
 insert_e820(int i, u64 start, u64 size, u32 type)
 {
-    if (e820_count >= CONFIG_MAX_E820) {
+    if (e820_count >= BUILD_MAX_E820) {
         warn_noalloc();
         return;
     }

diff --git a/src/misc.c b/src/misc.c
index a34405cae1e6f2baa68ba050e60faf77a9b6bf5e..def31f8a5b1b9976a6af87a09c6202eb8d9d4c6e 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -106,9 +106,9 @@ handle_75(void)
 
 struct bios_config_table_s BIOS_CONFIG_TABLE VAR16FIXED(0xe6f5) = {
     .size     = sizeof(BIOS_CONFIG_TABLE) - 2,
-    .model    = CONFIG_MODEL_ID,
-    .submodel = CONFIG_SUBMODEL_ID,
-    .biosrev  = CONFIG_BIOS_REVISION,
+    .model    = BUILD_MODEL_ID,
+    .submodel = BUILD_SUBMODEL_ID,
+    .biosrev  = BUILD_BIOS_REVISION,
     .feature1 = (
         CBT_F1_2NDPIC | CBT_F1_RTC | CBT_F1_EBDA
         | (CONFIG_KBD_CALL_INT15_4F ? CBT_F1_INT154F : 0)),
@@ -174,7 +174,7 @@ char BiosCopyright[] VAR16FIXED(0xff00) =
 // BIOS build date
 char BiosDate[] VAR16FIXED(0xfff5) = "06/23/99";
 
-u8 BiosModelId VAR16FIXED(0xfffe) = CONFIG_MODEL_ID;
+u8 BiosModelId VAR16FIXED(0xfffe) = BUILD_MODEL_ID;
 
 u8 BiosChecksum VAR16FIXED(0xffff);
 

diff --git a/src/mptable.c b/src/mptable.c
index fc160960f26ad72a95dc94b8dc9dd2ce14bc779b..0f2d756b01dfd5819b6472d8a5973aaaf1e6add4 100644 (file)
--- a/src/mptable.c
+++ b/src/mptable.c
@@ -28,7 +28,7 @@ mptable_setup(void)
     memset(config, 0, sizeof(*config));
     config->signature = MPCONFIG_SIGNATURE;
     config->spec = 4;
-    memcpy(config->oemid, CONFIG_CPUNAME8, sizeof(config->oemid));
+    memcpy(config->oemid, BUILD_CPUNAME8, sizeof(config->oemid));
     memcpy(config->productid, "0.1         ", sizeof(config->productid));
     config->lapic = BUILD_APIC_ADDR;
 

diff --git a/src/pmm.c b/src/pmm.c
index dbe34a1db9995e4bcc9dfe0324a62e8ef3ff2a19..f02cf62699bd43ab875b58b14983f20343de9291 100644 (file)
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -240,7 +240,7 @@ malloc_preinit(void)
             continue;
         u32 s = en->start, e = end;
         if (!highram) {
-            u32 newe = ALIGN_DOWN(e - CONFIG_MAX_HIGHTABLE, MALLOC_MIN_ALIGN);
+            u32 newe = ALIGN_DOWN(e - BUILD_MAX_HIGHTABLE, MALLOC_MIN_ALIGN);
             if (newe <= e && newe >= s) {
                 highram = newe;
                 e = newe;
@@ -253,8 +253,8 @@ malloc_preinit(void)
     addSpace(&ZoneTmpLow, (void*)BUILD_STACK_ADDR, (void*)BUILD_EBDA_MINIMUM);
     if (highram) {
         addSpace(&ZoneHigh, (void*)highram
-                 , (void*)highram + CONFIG_MAX_HIGHTABLE);
-        add_e820(highram, CONFIG_MAX_HIGHTABLE, E820_RESERVED);
+                 , (void*)highram + BUILD_MAX_HIGHTABLE);
+        add_e820(highram, BUILD_MAX_HIGHTABLE, E820_RESERVED);
     }
 }
 
@@ -263,10 +263,10 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
 {
     ASSERT32FLAT();
 
-    if (hi_pmm_size > CONFIG_MAX_HIGHTABLE) {
+    if (hi_pmm_size > BUILD_MAX_HIGHTABLE) {
         void *hi_pmm_end = (void *)hi_pmm + hi_pmm_size;
-        addSpace(&ZoneTmpHigh, (void *)hi_pmm, hi_pmm_end - CONFIG_MAX_HIGHTABLE);
-        addSpace(&ZoneHigh, hi_pmm_end - CONFIG_MAX_HIGHTABLE, hi_pmm_end);
+        addSpace(&ZoneTmpHigh, (void *)hi_pmm, hi_pmm_end - BUILD_MAX_HIGHTABLE);
+        addSpace(&ZoneHigh, hi_pmm_end - BUILD_MAX_HIGHTABLE, hi_pmm_end);
     } else {
         addSpace(&ZoneTmpHigh, (void *)hi_pmm, (void *)hi_pmm + hi_pmm_size);
     }

diff --git a/src/smbios.c b/src/smbios.c
index f0b83b32b34f0b2291a938e6c1d9e78ab94e1a19..fd63afb5ad1b08828a78f45a0a320e37a07ecf32 100644 (file)
--- a/src/smbios.c
+++ b/src/smbios.c
@@ -171,8 +171,8 @@ smbios_init_type_0(void *start)
     p->header.length = sizeof(struct smbios_type_0);
     p->header.handle = 0;
 
-    load_str_field_with_default(0, vendor_str, CONFIG_APPNAME);
-    load_str_field_with_default(0, bios_version_str, CONFIG_APPNAME);
+    load_str_field_with_default(0, vendor_str, BUILD_APPNAME);
+    load_str_field_with_default(0, bios_version_str, BUILD_APPNAME);
 
     p->bios_starting_address_segment = 0xe800;
 
@@ -219,8 +219,8 @@ smbios_init_type_1(void *start)
     p->header.length = sizeof(struct smbios_type_1);
     p->header.handle = 0x100;
 
-    load_str_field_with_default(1, manufacturer_str, CONFIG_APPNAME);
-    load_str_field_with_default(1, product_name_str, CONFIG_APPNAME);
+    load_str_field_with_default(1, manufacturer_str, BUILD_APPNAME);
+    load_str_field_with_default(1, product_name_str, BUILD_APPNAME);
     load_str_field_or_skip(1, version_str);
     load_str_field_or_skip(1, serial_number_str);
 
@@ -255,7 +255,7 @@ smbios_init_type_3(void *start)
     p->header.length = sizeof(struct smbios_type_3);
     p->header.handle = 0x300;
 
-    load_str_field_with_default(3, manufacturer_str, CONFIG_APPNAME);
+    load_str_field_with_default(3, manufacturer_str, BUILD_APPNAME);
     set_field_with_default(3, type, 0x01); /* other */
 
     load_str_field_or_skip(3, version_str);
@@ -310,7 +310,7 @@ smbios_init_type_4(void *start, unsigned int cpu_number)
     set_field_with_default(4, processor_type, 0x03); /* CPU */
     set_field_with_default(4, processor_family, 0x01); /* other */
 
-    load_str_field_with_default(4, processor_manufacturer_str, CONFIG_APPNAME);
+    load_str_field_with_default(4, processor_manufacturer_str, BUILD_APPNAME);
 
     if (!get_field(4, offsetof(struct smbios_type_4, processor_id)
                    , p->processor_id)) {