Index: branches/JrCs/i386/libsaio/console.c =================================================================== --- branches/JrCs/i386/libsaio/console.c (revision 20) +++ branches/JrCs/i386/libsaio/console.c (revision 21) @@ -49,8 +49,8 @@ extern int vprf(const char * fmt, va_list ap); -BOOL gVerboseMode; -BOOL gErrors; +bool gVerboseMode; +bool gErrors; /* * write one character to console Index: branches/JrCs/i386/libsaio/ext2fs.c =================================================================== --- branches/JrCs/i386/libsaio/ext2fs.c (revision 20) +++ branches/JrCs/i386/libsaio/ext2fs.c (revision 21) @@ -13,7 +13,7 @@ #define EX2ProbeSize 2048 -BOOL EX2Probe (const void *buf) +bool EX2Probe (const void *buf) { return (OSReadLittleInt16(buf+0x438,0)==0xEF53); } @@ -38,4 +38,4 @@ str[strMaxLen]=0; strncpy (str, buf+0x478, min (strMaxLen, 16)); free (buf); -} \ No newline at end of file +} Index: branches/JrCs/i386/libsaio/hfs.c =================================================================== --- branches/JrCs/i386/libsaio/hfs.c (revision 20) +++ branches/JrCs/i386/libsaio/hfs.c (revision 21) @@ -125,7 +125,7 @@ free(ih); } -BOOL +bool HFSProbe (const void *buf) { const HFSMasterDirectoryBlock *mdb; Index: branches/JrCs/i386/libsaio/ext2fs.h =================================================================== --- branches/JrCs/i386/libsaio/ext2fs.h (revision 20) +++ branches/JrCs/i386/libsaio/ext2fs.h (revision 21) @@ -7,5 +7,5 @@ * */ -extern BOOL EX2Probe (const void *buf); +extern bool EX2Probe (const void *buf); extern void EX2GetDescription(CICell ih, char *str, long strMaxLen); Index: branches/JrCs/i386/libsaio/hfs.h =================================================================== --- branches/JrCs/i386/libsaio/hfs.h (revision 20) +++ branches/JrCs/i386/libsaio/hfs.h (revision 21) @@ -30,4 +30,4 @@ extern long HFSGetFileBlock(CICell ih, char *str, unsigned long long *firstBlock); extern long HFSGetUUID(CICell ih, char *uuidStr); extern void HFSFree(CICell ih); -extern BOOL HFSProbe (const void *buf); \ No newline at end of file +extern bool HFSProbe (const void *buf); Index: branches/JrCs/i386/libsaio/smbios_patcher.c =================================================================== --- branches/JrCs/i386/libsaio/smbios_patcher.c (revision 20) +++ branches/JrCs/i386/libsaio/smbios_patcher.c (revision 21) @@ -297,7 +297,7 @@ int origsmbiosnum=0; int i, j; int tablespresent[256]; - BOOL do_auto=1; + bool do_auto=1; getBoolForKey("SMBIOSdefaults",&do_auto,&bootInfo->bootConfig); @@ -438,7 +438,7 @@ uint16_t nexthandle=0; int i, j; int tablespresent[256]; - BOOL do_auto=1; + bool do_auto=1; getBoolForKey("SMBIOSdefaults",&do_auto,&bootInfo->bootConfig); Index: branches/JrCs/i386/libsaio/usb.c =================================================================== --- branches/JrCs/i386/libsaio/usb.c (revision 20) +++ branches/JrCs/i386/libsaio/usb.c (revision 21) @@ -29,8 +29,8 @@ uint8_t eecp; uint8_t legacy[8]; - BOOL isOwnershipConflict; - BOOL alwaysHardBIOSReset; + bool isOwnershipConflict; + bool alwaysHardBIOSReset; if (!getBoolForKey("EHCIhard", &alwaysHardBIOSReset, &bootInfo->bootConfig)) alwaysHardBIOSReset = 1; Index: branches/JrCs/i386/libsaio/dsdt_patcher.c =================================================================== --- branches/JrCs/i386/libsaio/dsdt_patcher.c (revision 20) +++ branches/JrCs/i386/libsaio/dsdt_patcher.c (revision 21) @@ -124,8 +124,8 @@ { struct acpi_2_fadt *fadt_mod; - BOOL fadt_rev2_needed = NO; - BOOL fix_restart; + bool fadt_rev2_needed = NO; + bool fix_restart; // Restart Fix if (Platform.CPU.Vendor == 0x756E6547) { /* Intel */ @@ -224,7 +224,7 @@ DBG("New DSDT Loaded in memory\n"); { - BOOL tmp; + bool tmp; drop_ssdt=getBoolForKey("DropSSDT",&tmp, &bootInfo->bootConfig)&&tmp; } Index: branches/JrCs/i386/libsaio/ntfs.c =================================================================== --- branches/JrCs/i386/libsaio/ntfs.c (revision 20) +++ branches/JrCs/i386/libsaio/ntfs.c (revision 21) @@ -295,9 +295,9 @@ return; } -BOOL NTFSProbe(const void * buffer) +bool NTFSProbe(const void * buffer) { - BOOL result = FALSE; + bool result = FALSE; const struct bootfile * part_bootfile = buffer; // NTFS boot sector structure Index: branches/JrCs/i386/libsaio/nvidia.c =================================================================== --- branches/JrCs/i386/libsaio/nvidia.c (revision 20) +++ branches/JrCs/i386/libsaio/nvidia.c (revision 21) @@ -728,7 +728,7 @@ devprop_add_value(device, "model", (uint8_t*)model, (strlen(model) + 1)); devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, (strlen(biosVersion) + 1)); - BOOL set_vbios_prop = false; + bool set_vbios_prop = false; getBoolForKey("VBIOS", &set_vbios_prop, &bootInfo->bootConfig); if (set_vbios_prop) devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512)); Index: branches/JrCs/i386/libsaio/sys.c =================================================================== --- branches/JrCs/i386/libsaio/sys.c (revision 20) +++ branches/JrCs/i386/libsaio/sys.c (revision 21) @@ -111,7 +111,7 @@ // zef - ramdisk variables extern BVRef gRAMDiskVolume; -extern BOOL gRAMDiskBTAliased; +extern bool gRAMDiskBTAliased; //static BVRef getBootVolumeRef( const char * path, const char ** outPath ); static BVRef newBootVolumeRef( int biosdev, int partno ); @@ -700,9 +700,9 @@ BVRef selectBootVolume( BVRef chain ) { - BOOL filteredChain = FALSE; - BOOL foundPrimary = FALSE; - BVRef bvr, bvr1 = 0, bvr2 = 0; + bool filteredChain = FALSE; + bool foundPrimary = FALSE; + BVRef bvr, bvr1 = 0, bvr2 = 0; if (chain->filtered) filteredChain = TRUE; Index: branches/JrCs/i386/libsaio/load.c =================================================================== --- branches/JrCs/i386/libsaio/load.c (revision 20) +++ branches/JrCs/i386/libsaio/load.c (revision 21) @@ -38,7 +38,7 @@ static unsigned long gBinaryAddress; -BOOL gHaveKernelCache; +bool gHaveKernelCache; cpu_type_t archCpuType=CPU_TYPE_I386; // Public Functions @@ -250,7 +250,7 @@ } if (vmsize && (strcmp(segname, "__PRELINK") == 0)) - gHaveKernelCache = 1; + gHaveKernelCache = true; // Copy from file load area. if (vmsize>0 && filesize>0) Index: branches/JrCs/i386/libsaio/ntfs.h =================================================================== --- branches/JrCs/i386/libsaio/ntfs.h (revision 20) +++ branches/JrCs/i386/libsaio/ntfs.h (revision 21) @@ -21,5 +21,5 @@ */ extern void NTFSGetDescription(CICell ih, char *str, long strMaxLen); -extern BOOL NTFSProbe (const void *buf); +extern bool NTFSProbe (const void *buf); Index: branches/JrCs/i386/libsaio/disk.c =================================================================== --- branches/JrCs/i386/libsaio/disk.c (revision 20) +++ branches/JrCs/i386/libsaio/disk.c (revision 21) @@ -218,7 +218,7 @@ // Return: // 0 on success, or an error code from INT13/F2 or INT13/F42 BIOS call. -static BOOL cache_valid = FALSE; +static bool cache_valid = FALSE; static int Biosread( int biosdev, unsigned long long secno ) { @@ -1678,7 +1678,7 @@ //========================================================================== -void getBootVolumeDescription( BVRef bvr, char * str, long strMaxLen, BOOL verbose ) +void getBootVolumeDescription( BVRef bvr, char * str, long strMaxLen, bool verbose ) { unsigned char type = (unsigned char) bvr->part_type; char *p; Index: branches/JrCs/i386/libsaio/pci_setup.c =================================================================== --- branches/JrCs/i386/libsaio/pci_setup.c (revision 20) +++ branches/JrCs/i386/libsaio/pci_setup.c (revision 21) @@ -12,7 +12,7 @@ void setup_pci_devs(pci_dt_t *pci_dt) { char *devicepath; - BOOL do_eth_devprop, do_gfx_devprop, fix_ehci, fix_uhci, fix_usb, do_enable_hpet; + bool do_eth_devprop, do_gfx_devprop, fix_ehci, fix_uhci, fix_usb, do_enable_hpet; pci_dt_t *current = pci_dt; do_eth_devprop = do_gfx_devprop = fix_ehci = fix_uhci = fix_usb = do_enable_hpet = false; Index: branches/JrCs/i386/libsaio/stringTable.c =================================================================== --- branches/JrCs/i386/libsaio/stringTable.c (revision 20) +++ branches/JrCs/i386/libsaio/stringTable.c (revision 21) @@ -81,7 +81,7 @@ static void eatThru(char val, const char **table_p) { register const char *table = *table_p; - register BOOL found = NO; + register bool found = NO; while (*table && !found) { @@ -97,7 +97,7 @@ /* Remove key and its associated value from the table. */ -BOOL +bool removeKeyFromTable(const char *key, char *table) { register int len; @@ -198,7 +198,7 @@ } -BOOL getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size) +bool getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size) { if (config->dictionary != 0 ) { // Look up key in XML dictionary @@ -308,11 +308,11 @@ return line; } -BOOL getValueForBootKey(const char *line, const char *match, const char **matchval, int *len) +bool getValueForBootKey(const char *line, const char *match, const char **matchval, int *len) { const char *key, *value; int key_len, value_len; - BOOL retval = NO; + bool retval = NO; while (*line) { /* look for keyword or argument */ @@ -342,7 +342,7 @@ * The boolean value of the key is stored in 'val'. */ -BOOL getBoolForKey( const char *key, BOOL *result_val, config_file_t *config ) +bool getBoolForKey( const char *key, bool *result_val, config_file_t *config ) { const char *key_val; int size; @@ -358,11 +358,11 @@ return NO; } -BOOL getIntForKey( const char *key, int *value, config_file_t *config ) +bool getIntForKey( const char *key, int *value, config_file_t *config ) { const char *val; int size, sum; - BOOL negative = NO; + bool negative = NO; if (getValueForKey(key, &val, &size, config)) { @@ -397,15 +397,15 @@ * */ -BOOL getDimensionForKey( const char *key, unsigned int *value, config_file_t *config, unsigned int dimension_max, unsigned int object_size ) +bool getDimensionForKey( const char *key, unsigned int *value, config_file_t *config, unsigned int dimension_max, unsigned int object_size ) { const char *val; int size = 0; int sum = 0; - BOOL negative = NO; - BOOL percentage = NO; + bool negative = NO; + bool percentage = NO; if (getValueForKey(key, &val, &size, config)) { @@ -459,7 +459,7 @@ * get color value from plist format #RRGGBB */ -BOOL getColorForKey( const char *key, unsigned int *value, config_file_t *config ) +bool getColorForKey( const char *key, unsigned int *value, config_file_t *config ) { const char *val; int size; @@ -476,11 +476,11 @@ return NO; } -BOOL getValueForKey( const char *key, const char **val, int *size, config_file_t *config ) +bool getValueForKey( const char *key, const char **val, int *size, config_file_t *config ) { const char *overrideVal; int overrideSize; - BOOL override, ret; + bool override, ret; if (getValueForBootKey(bootArgs->CommandLine, key, val, size)) return YES; @@ -729,7 +729,7 @@ char * ptr = *argPtr; const char * strStart; int len = 0; - BOOL isQuoted = FALSE; + bool isQuoted = FALSE; *val = '\0'; Index: branches/JrCs/i386/libsaio/biosfn.c =================================================================== --- branches/JrCs/i386/libsaio/biosfn.c (revision 20) +++ branches/JrCs/i386/libsaio/biosfn.c (revision 21) @@ -770,13 +770,13 @@ #endif /* APM_SUPPORT */ #ifdef EISA_SUPPORT -BOOL +bool eisa_present( void ) { - static BOOL checked; - static BOOL isEISA; + static bool checked; + static bool isEISA; if (!checked) { if (strncmp((char *)0xfffd9, "EISA", 4) == 0) Index: branches/JrCs/i386/libsaio/saio_types.h =================================================================== --- branches/JrCs/i386/libsaio/saio_types.h (revision 20) +++ branches/JrCs/i386/libsaio/saio_types.h (revision 21) @@ -31,6 +31,7 @@ #include "bios.h" #include "nbp_cmd.h" #include +#include #if DEBUG #define DEBUG_DISK(x) printf x @@ -38,9 +39,8 @@ #define DEBUG_DISK(x) #endif -typedef char BOOL; -#define NO 0 -#define YES 1 +#define NO (bool)0 +#define YES (bool)1 typedef unsigned long entry_t; @@ -68,7 +68,7 @@ typedef struct { char plist[4096]; // buffer for plist TagPtr dictionary; // buffer for xml dictionary - BOOL canOverride; // flag to mark a dictionary can be overriden + bool canOverride; // flag to mark a dictionary can be overriden } config_file_t; /* @@ -190,8 +190,8 @@ uint32_t modTime; char label[BVSTRLEN]; /* partition volume label */ char altlabel[BVSTRLEN]; /* partition volume label */ - BOOL filtered; /* newFilteredBVChain() will set to TRUE */ - BOOL visible; /* will shown in the device list */ + bool filtered; /* newFilteredBVChain() will set to TRUE */ + bool visible; /* will shown in the device list */ }; enum { Index: branches/JrCs/i386/libsaio/saio_internal.h =================================================================== --- branches/JrCs/i386/libsaio/saio_internal.h (revision 20) +++ branches/JrCs/i386/libsaio/saio_internal.h (revision 21) @@ -39,7 +39,7 @@ /* biosfn.c */ #ifdef EISA_SUPPORT -extern BOOL eisa_present(void); +extern bool eisa_present(void); #endif extern int bgetc(void); extern int biosread(int dev, int cyl, int head, int sec, int num); @@ -86,8 +86,8 @@ long length, long cache); /* console.c */ -extern BOOL gVerboseMode; -extern BOOL gErrors; +extern bool gVerboseMode; +extern bool gErrors; extern void putchar(int ch); extern int getchar(void); extern int printf(const char *format, ...); @@ -123,7 +123,7 @@ u_int16_t *ucslen, u_int32_t bufsize, int byte_order ); /* load.c */ -extern char gHaveKernelCache; +extern bool gHaveKernelCache; extern long ThinFatFile(void **binary, unsigned long *length); extern long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize); @@ -144,16 +144,16 @@ /* stringTable.c */ extern char * newStringFromList(char **list, int *size); extern int stringLength(const char *table, int compress); -extern BOOL getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size); -extern BOOL removeKeyFromTable(const char *key, char *table); +extern bool getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size); +extern bool removeKeyFromTable(const char *key, char *table); extern char * newStringForStringTableKey(config_file_t *config, char *key); extern char * newStringForKey(char *key, config_file_t *configBuff); -extern BOOL getValueForBootKey(const char *line, const char *match, const char **matchval, int *len); -extern BOOL getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff); -extern BOOL getBoolForKey(const char *key, BOOL *val, config_file_t *configBuff); -extern BOOL getIntForKey(const char *key, int *val, config_file_t *configBuff); -extern BOOL getColorForKey(const char *key, unsigned int *val, config_file_t *configBuff); -extern BOOL getDimensionForKey( const char *key, unsigned int *value, config_file_t *config, unsigned int dimension_max, unsigned int object_size ); +extern bool getValueForBootKey(const char *line, const char *match, const char **matchval, int *len); +extern bool getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff); +extern bool getBoolForKey(const char *key, bool *val, config_file_t *configBuff); +extern bool getIntForKey(const char *key, int *val, config_file_t *configBuff); +extern bool getColorForKey(const char *key, unsigned int *val, config_file_t *configBuff); +extern bool getDimensionForKey( const char *key, unsigned int *value, config_file_t *config, unsigned int dimension_max, unsigned int object_size ); extern int loadConfigFile(const char *configFile, config_file_t *configBuff); extern int loadSystemConfig(config_file_t *configBuff); extern int loadHelperConfig(config_file_t *configBuff); @@ -193,7 +193,7 @@ extern void scanBootVolumes(int biosdev, int *count); extern void scanDisks(int biosdev, int *count); extern BVRef selectBootVolume(BVRef chain); -extern void getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, BOOL verbose); +extern void getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose); extern void setRootVolume(BVRef volume); extern void setBootGlobals(BVRef chain); Index: branches/JrCs/i386/boot2/ramdisk.h =================================================================== --- branches/JrCs/i386/boot2/ramdisk.h (revision 20) +++ branches/JrCs/i386/boot2/ramdisk.h (revision 21) @@ -18,11 +18,11 @@ // extern BVRef gRAMDiskVolume; -extern BOOL gRAMDiskBTAliased; +extern bool gRAMDiskBTAliased; -extern void setRAMDiskBTHook(BOOL mode); +extern void setRAMDiskBTHook(bool mode); extern int mountRAMDisk(const char * param); extern void processRAMDiskCommand(char ** argPtr, const char * cmd); extern int loadPrebootRAMDisk(); -#endif /* !__BOOT_RAMDISK_H */ \ No newline at end of file +#endif /* !__BOOT_RAMDISK_H */ Index: branches/JrCs/i386/boot2/boot.c =================================================================== --- branches/JrCs/i386/boot2/boot.c (revision 20) +++ branches/JrCs/i386/boot2/boot.c (revision 21) @@ -59,15 +59,15 @@ #include "gui.h" long gBootMode; /* defaults to 0 == kBootModeNormal */ -BOOL gOverrideKernel; +bool gOverrideKernel; static char gBootKernelCacheFile[512]; static char gCacheNameAdler[64 + 256]; char *gPlatformName = gCacheNameAdler; char gRootDevice[512]; char gMKextName[512]; char gMacOSVersion[8]; -BOOL gEnableCDROMRescan; -BOOL gScanSingleDrive; +bool gEnableCDROMRescan; +bool gScanSingleDrive; int bvCount = 0; //int menucount = 0; @@ -76,7 +76,7 @@ BVRef bvr; BVRef menuBVR; BVRef bvChain; -BOOL useGUI = TRUE; +bool useGUI = true; //static void selectBiosDevice(void); @@ -84,7 +84,7 @@ unsigned long Adler32(unsigned char *buffer, long length); -static BOOL gUnloadPXEOnExit = 0; +static bool gUnloadPXEOnExit = false; /* * How long to wait (in seconds) to load the @@ -182,7 +182,7 @@ } } - BOOL dummyVal; + bool dummyVal; if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) { @@ -254,10 +254,10 @@ int status; char *bootFile; unsigned long adler32; - BOOL quiet; - BOOL firstRun = YES; - BOOL instantMenu; - BOOL rescanPrompt; + bool quiet; + bool firstRun = YES; + bool instantMenu; + bool rescanPrompt; unsigned int allowBVFlags = kBVFlagSystemVolume|kBVFlagForeignBoot; unsigned int denyBVFlags = kBVFlagEFISystem; @@ -374,9 +374,9 @@ long flags, cachetime, kerneltime, exttime, sleeptime, time; int ret = -1; void *binary = (void *)kLoadAddr; - BOOL tryresume; - BOOL tryresumedefault; - BOOL forceresume; + bool tryresume; + bool tryresumedefault; + bool forceresume; config_file_t systemVersion; // system.plist of booting partition Index: branches/JrCs/i386/boot2/boot.h =================================================================== --- branches/JrCs/i386/boot2/boot.h (revision 20) +++ branches/JrCs/i386/boot2/boot.h (revision 21) @@ -83,16 +83,16 @@ */ extern int gBIOSDev; extern long gBootMode; -extern BOOL sysConfigValid; +extern bool sysConfigValid; extern char bootBanner[]; extern char bootPrompt[]; -extern BOOL gOverrideKernel; +extern bool gOverrideKernel; extern char *gPlatformName; extern char gMKextName[]; extern char gRootDevice[]; -extern BOOL gEnableCDROMRescan; -extern BOOL gScanSingleDrive; -extern BOOL useGUI; +extern bool gEnableCDROMRescan; +extern bool gScanSingleDrive; +extern bool useGUI; // Boot Modes enum { @@ -150,10 +150,10 @@ /* * options.c */ -extern int getBootOptions(BOOL firstRun); +extern int getBootOptions(bool firstRun); extern int processBootOptions(); extern int selectAlternateBootDevice(int bootdevice); -extern BOOL promptForRescanOption(void); +extern bool promptForRescanOption(void); void showHelp(); void showTextFile(); Index: branches/JrCs/i386/boot2/gui.c =================================================================== --- branches/JrCs/i386/boot2/gui.c (revision 20) +++ branches/JrCs/i386/boot2/gui.c (revision 21) @@ -143,12 +143,12 @@ int loadGraphics(); void makeRoundedCorners(pixmap_t *p); -BOOL testForQemu(); +bool testForQemu(); int infoMenuSelection = 0; int infoMenuItemsCount = sizeof(infoMenuItems)/sizeof(infoMenuItems[0]); -BOOL infoMenuNativeBoot = 0; +bool infoMenuNativeBoot = false; unsigned long screen_params[4]; // here we store the used screen resolution @@ -245,9 +245,9 @@ memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 ); } -void loadThemeValues(config_file_t *theme, BOOL overide) +void loadThemeValues(config_file_t *theme, bool overide) { - BOOL themeEnabled; + bool themeEnabled; if ( (getBoolForKey("Enabled", &themeEnabled, theme ) ) || ( overide ) ) { @@ -1191,7 +1191,7 @@ int start = 0, end = 0, count = 0, space = 0; - BOOL monospaced = NO; + bool monospaced = NO; font->height = data->image->height; @@ -1682,7 +1682,7 @@ uint8_t *bootImageData = NULL; -BOOL usePngImage = YES; +bool usePngImage = YES; //========================================================================== // loadBootGraphics @@ -1713,7 +1713,7 @@ int pos; int length; const char *dummyVal; - BOOL legacy_logo; + bool legacy_logo; uint16_t x, y; if (getBoolForKey("Legacy Logo", &legacy_logo, &bootInfo->bootConfig) && legacy_logo) @@ -1785,7 +1785,7 @@ return; } -BOOL testForQemu() +bool testForQemu() { char *buffer = getVBEInfoString(); char qemutext[] = "Bochs/Plex86"; Index: branches/JrCs/i386/boot2/gui.h =================================================================== --- branches/JrCs/i386/boot2/gui.h (revision 20) +++ branches/JrCs/i386/boot2/gui.h (revision 21) @@ -57,8 +57,8 @@ typedef struct { position_t pos; char *text; - BOOL enabled; - BOOL expandable; + bool enabled; + bool expandable; } menuitem_t; /* @@ -95,7 +95,7 @@ uint32_t fgcolor; // Foreground color AARRGGBB uint32_t font_small_color; // Color for small font AARRGGBB uint32_t font_console_color; // Color for consle font AARRGGBB - BOOL draw; // Draw flag + bool draw; // Draw flag } window_t; /* @@ -121,8 +121,8 @@ window_t debug; // Debug - BOOL initialised; // Initialised - BOOL redraw; // Redraw flag + bool initialised; // Initialised + bool redraw; // Redraw flag } gui_t; @@ -161,4 +161,4 @@ void drawStr(char *ch, font_t *font, pixmap_t *blendInto, position_t p); void drawStrCenteredAt(char *ch, font_t *font, pixmap_t *blendInto, position_t p); -#endif /* !__BOOT2_GUI_H */ \ No newline at end of file +#endif /* !__BOOT2_GUI_H */ Index: branches/JrCs/i386/boot2/ramdisk.c =================================================================== --- branches/JrCs/i386/boot2/ramdisk.c (revision 20) +++ branches/JrCs/i386/boot2/ramdisk.c (revision 21) @@ -13,7 +13,7 @@ // gRAMDiskVolume holds the bvr for the mounted ramdisk image. BVRef gRAMDiskVolume = NULL; -BOOL gRAMDiskBTAliased = 0; +bool gRAMDiskBTAliased = 0; char gRAMDiskFile[512]; void umountRAMDisk() @@ -121,7 +121,7 @@ return error; } -void setRAMDiskBTHook(BOOL mode) +void setRAMDiskBTHook(bool mode) { gRAMDiskBTAliased = mode; if (mode == 1) @@ -224,4 +224,4 @@ getc(); setActiveDisplayPage(0); } -} \ No newline at end of file +} Index: branches/JrCs/i386/boot2/options.c =================================================================== --- branches/JrCs/i386/boot2/options.c (revision 20) +++ branches/JrCs/i386/boot2/options.c (revision 21) @@ -82,9 +82,9 @@ * characters was F8. */ -static BOOL flushKeyboardBuffer() +static bool flushKeyboardBuffer() { - BOOL status = FALSE; + bool status = FALSE; while ( readKeyboardStatus() ) { if (bgetc() == 0x4200) status = TRUE; @@ -191,7 +191,7 @@ //========================================================================== -static void showBootPrompt( int row, BOOL visible ) +static void showBootPrompt( int row, bool visible ) { extern char bootPrompt[]; extern char bootRescanPrompt[]; @@ -656,7 +656,7 @@ extern void lspci(const char *booterParam); int -getBootOptions(BOOL firstRun) +getBootOptions(bool firstRun) { int i; int key; @@ -665,7 +665,7 @@ int bvCount; BVRef bvr; BVRef menuBVR; - BOOL showPrompt, newShowPrompt, isCDROM; + bool showPrompt, newShowPrompt, isCDROM; // Initialize default menu selection entry. gBootVolume = menuBVR = selectBootVolume(bvChain); @@ -876,7 +876,7 @@ if ( ! ( gBootMode & kBootModeQuiet ) ) { - BOOL showBootBanner = YES; + bool showBootBanner = YES; // Check if "Boot Banner"=N switch is present in config file. getBoolForKey( kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); @@ -1108,7 +1108,7 @@ extern unsigned char chainbootdev; extern unsigned char chainbootflag; -BOOL +bool copyArgument(const char *argName, const char *val, int cnt, char **argP, int *cntRemainingP) { int argLen = argName ? strlen(argName) : 0; @@ -1138,7 +1138,7 @@ // // Returns TRUE if an argument was copied, FALSE otherwise -BOOL +bool processBootArgument( const char *argName, // The argument to search for const char *userString, // Typed-in boot arguments @@ -1151,7 +1151,7 @@ { const char *val; int cnt; - BOOL found = NO; + bool found = NO; if (getValueForBootKey(userString, argName, &val, &cnt)) { // Don't copy; these values will be copied at the end of argument processing. @@ -1183,7 +1183,7 @@ int cntRemaining; char * argP; char uuidStr[64]; - BOOL uuidSet = NO; + bool uuidSet = NO; char * configKernelFlags; char * valueBuffer; @@ -1571,10 +1571,10 @@ } -BOOL promptForRescanOption(void) +bool promptForRescanOption(void) { int key; - BOOL result = FALSE; + bool result = FALSE; printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n"); key = getc(); @@ -1587,4 +1587,4 @@ } return result; -} \ No newline at end of file +}