Chameleon

Chameleon Commit Details

Date:2010-09-09 08:31:15 (13 years 7 months ago)
Author:Azimutz
Commit:511
Parents: 510
Message:Adding "Key" termination to some #define'ed identifiers. The rest will follow...
Changes:
M/branches/azimutz/Chazi/i386/boot2/options.c
M/branches/azimutz/Chazi/i386/libsaio/sys.c
M/branches/azimutz/Chazi/i386/libsaio/saio_types.h
M/branches/azimutz/Chazi/i386/libsaio/disk.c
M/branches/azimutz/Chazi/i386/boot2/boot.h
M/branches/azimutz/Chazi/i386/libsaio/device_inject.c

File differences

branches/azimutz/Chazi/i386/libsaio/device_inject.c
5555
5656
5757
58
58
5959
6060
6161
/* Use the static "device-properties" boot config key contents if available,␊
* otheriwse use the generated one.␊
*/ ␊
if (!getValueForKey(kDeviceProperties, &val, &cnt, &bootInfo->bootConfig) && string)␊
if (!getValueForKey(kRenamePartitionKey, &val, &cnt, &bootInfo->bootConfig) && string)␊
{␊
val = (const char*)string;␊
cnt = strlength * 2;␊
branches/azimutz/Chazi/i386/libsaio/sys.c
825825
826826
827827
828
828
829829
830830
831831
␉ * to override the default selection.␊
␉ * We accept only kBVFlagSystemVolume or kBVFlagForeignBoot volumes.␊
␉ */␊
␉char *val = XMLDecode(getStringForKey(kDefaultPartition, &bootInfo->bootConfig));␊
␉char *val = XMLDecode(getStringForKey(kDefaultPartitionKey, &bootInfo->bootConfig));␊
if (val) {␊
for ( bvr = chain; bvr; bvr = bvr->next ) {␊
if (matchVolumeToString(bvr, val, false)) {␊
branches/azimutz/Chazi/i386/libsaio/disk.c
15661566
15671567
15681568
1569
1569
15701570
15711571
15721572
......
17431743
17441744
17451745
1746
1746
17471747
17481748
17491749
char* val = 0;␊
int len;␊
␊
getValueForKey(kHidePartition, &raw, &len, &bootInfo->bootConfig);␊
getValueForKey(kHidePartitionKey, &raw, &len, &bootInfo->bootConfig);␊
if(raw)␊
{␊
val = XMLDecode(raw); ␊
if ( !str || strMaxLen <= 0)␊
return false;␊
␊
aliasList = XMLDecode(getStringForKey(kRenamePartition, &bootInfo->bootConfig));␊
aliasList = XMLDecode(getStringForKey(kRenamePartitionKey, &bootInfo->bootConfig));␊
if ( !aliasList )␊
return false;␊
␊
branches/azimutz/Chazi/i386/libsaio/saio_types.h
231231
232232
233233
234
234235
235236
236237
DEV_EN = 3␊
};␊
␊
//Azi: change this stuff back to upercase??␊
#define max(a,b) ((a) > (b) ? (a) : (b))␊
#define min(a,b) ((a) < (b) ? (a) : (b))␊
␊
branches/azimutz/Chazi/i386/boot2/boot.h
7575
7676
7777
78
78
7979
8080
8181
8282
8383
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103103
104104
105105
106
106
107107
108
108
109109
110110
111111
......
138138
139139
140140
141
141
142142
143143
144144
*/␊
␊
/*␊
* Internal or Boot.plist only keys (firstrun) - these end with "Key" (key/value pair).??␊
* Internal or "default" Boot.plist only keys (firstrun) - these end with "Key".␊
*␊
* keys that make no sense on "override" Boot.plist or at boot prompt;␊
* like so, they won't be present on BootHelp.txt.␊
*␊
*/␊
//␉␉identifier␉␉␉string␉␉␉␉location␊
#define kTextModeKey␉␉"Text Mode"␉␉␉// graphics.c␊
#define kProductVersion␉␉"ProductVersion"␉// boot.c␊
#define kDefaultPartition␉"Default Partition"␉// sys.c␊
#define kHidePartition␉␉"Hide Partition"␉// disk.c␊
#define kRenamePartition␉"Rename Partition"␉// disk.c␊
#define kInstantMenuKey␉␉"Instant Menu"␉␉// boot.c␊
#define kQuietBootKey␉␉"Quiet Boot"␉␉// boot.c␊
#define kTimeoutKey␉␉␉"Timeout"␉␉␉// options.c␊
#define kThemeNameKey␉␉"Theme"␉␉␉␉// gui.c␉␉␉␉getValFK??␊
#define kGUIKey␉␉␉␉"GUI"␉␉␉␉// boot.c␊
#define kBootBannerKey␉␉"Boot Banner"␉␉// options.c␊
#define kDebugInfoKey␉␉"DebugInfo"␉␉␉// gui.c, graphics.c␊
#define kCDROMPromptKey␉␉"CD-ROM Prompt"␉␉// options.c␊
#define kCDROMOptionKey␉␉"CD-ROM Option Key"␉// options.c␊
#define kRescanPromptKey␉"Rescan Prompt"␉␉// boot.c␊
#define kRescanKey␉␉ "Rescan"␉␉␉// boot.c␊
#define kScanSingleDriveKey␉"Scan Single Drive"␉// boot.c␊
#define kDeviceProperties␉"device-properties"␉// device_inject.c␊
//␉␉identifier␉␉␉ string␉␉␉␉ location␊
#define kTextModeKey␉␉ "Text Mode"␉␉ // graphics.c␊
#define kProductVersionKey␉ "ProductVersion"␉ // options.c (boot.c on trunk)␊
#define kDefaultPartitionKey "Default Partition" // sys.c␊
#define kHidePartitionKey␉ "Hide Partition"␉ // disk.c␊
#define kRenamePartitionKey␉ "Rename Partition"␉ // disk.c␊
#define kInstantMenuKey␉␉ "Instant Menu"␉␉ // boot.c␊
#define kQuietBootKey␉␉ "Quiet Boot"␉␉ // boot.c␊
#define kTimeoutKey␉␉␉ "Timeout"␉␉␉ // options.c␊
#define kThemeNameKey␉␉ "Theme"␉␉␉ // gui.c␊
#define kGUIKey␉␉␉␉ "GUI"␉␉␉␉ // boot.c␊
#define kBootBannerKey␉␉ "Boot Banner"␉␉ // options.c␊
#define kDebugInfoKey␉␉ "DebugInfo"␉␉ // gui.c, graphics.c␊
#define kCDROMPromptKey␉␉ "CD-ROM Prompt"␉ // options.c␊
#define kCDROMOptionKey␉␉ "CD-ROM Option Key" // options.c␊
#define kRescanPromptKey␉ "Rescan Prompt"␉ // boot.c␊
#define kRescanKey␉␉ "Rescan"␉␉␉ // boot.c␊
#define kScanSingleDriveKey␉ "Scan Single Drive" // boot.c␊
#define kRenamePartitionKey␉ "device-properties" // device_inject.c␊
␊
␊
/*␊
* Prompt or Boot.plist keys (secondrun) - these end with "Key"??␊
* Prompt or Boot.plist keys (secondrun) - these end with "Key".␊
*␊
* Keys that make some or all sense at boot prompt.␊
* Keys that make some/all sense at boot prompt or any Boot.plist.␊
*␊
*/␊
#define kWaitForKeypressKey␉"Wait"␉␉␉␉// boot.c␊
#define kGeneratePStates␉"GeneratePStates"␉// acpi_patcher.c␊
#define kGenerateCStates␉"GenerateCStates"␉// acpi_patcher.c␊
#define kEnableC4States␉␉"EnableC4State"␉␉// acpi_patcher.c␊
#define kUseMemDetect␉␉"UseMemDetect"␉ // platform.c - change name-->memDetect?␊
#define kUseMemDetect␉␉"UseMemDetect"␉ // platform.c␊
#define kSMBIOSdefaults␉␉"SMBIOSdefaults"␉// smbios_patcher.c␊
#define kSMBIOSKey␉␉␉"SMBIOS"␉␉␉// fake_efi.c␊
#define kSystemID␉␉␉"SystemId"␉␉␉// fake_efi.c␊
branches/azimutz/Chazi/i386/boot2/options.c
14471447
14481448
14491449
1450
1450
14511451
14521452
14531453
␊
␉if (valid)␊
␉{␊
␉␉if (getValueForKey(kProductVersion, &val, &len, &systemVersion))␊
␉␉if (getValueForKey(kProductVersionKey, &val, &len, &systemVersion))␊
␉␉{␊
␉␉␉// getValueForKey uses const char for val␊
␉␉␉// so copy it and trim␊

Archive Download the corresponding diff file

Revision: 511