Index: branches/azimutz/Chazileon/doc/BootHelp.txt =================================================================== --- branches/azimutz/Chazileon/doc/BootHelp.txt (revision 314) +++ branches/azimutz/Chazileon/doc/BootHelp.txt (revision 315) @@ -57,7 +57,7 @@ Hide Partition Remove unwanted partition(s) from the boot menu. =hd(x,y) [hd(m,n)] only non mac osx boot partitions can be hidden. - Rename Partition Rename partition(s) for the boot menu. + Rename Partition Rename partition(s) for the boot menu. =hd(x,y) [;hd(m,n) ...] GUI=No Disable the GUI (enabled by default). Index: branches/azimutz/Chazileon/i386/libsaio/efi.h =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/efi.h (revision 314) +++ branches/azimutz/Chazileon/i386/libsaio/efi.h (revision 315) @@ -478,7 +478,7 @@ // // //////////////////////////////////////////////////// // Extended EFI Services - ////////////////////////////////////////////////////// + ////////////////////////////////////////////////////// // EFI_PTR64 ReportStatusCode; #endif Index: branches/azimutz/Chazileon/i386/libsaio/smbios_patcher.c =================================================================== --- branches/azimutz/Chazileon/i386/libsaio/smbios_patcher.c (revision 314) +++ branches/azimutz/Chazileon/i386/libsaio/smbios_patcher.c (revision 315) @@ -86,23 +86,7 @@ { "","" } }; -// defaults for a Mac Pro 2,1.. -//Azi: for testing..! -static const SMStrEntryPair const sm_macpro21_defaults[]={ - {"SMbiosvendor", "Apple Computer, Inc." }, - {"SMbiosversion", "MP21.88Z.007F.B06.0608221120" }, - {"SMbiosdate", "04/01/2008" }, - {"SMmanufacter", "Apple Computer, Inc." }, - {"SMproductname", "MacPro2,1" }, - {"SMsystemversion", "1.0" }, - {"SMserial", "SOMESRLNMBR" }, - {"SMfamily", "MacPro" }, - {"SMboardmanufacter", "Apple Computer, Inc." }, - {"SMboardproduct", "Mac-F4208DC8" }, - { "","" } -}; - -// defaults for a Mac Pro 3,1.. Change to/add 4,1? +// defaults for a Mac Pro static const SMStrEntryPair const sm_macpro31_defaults[]={ {"SMbiosvendor", "Apple Computer, Inc." }, {"SMbiosversion", "MP31.88Z.006C.B05.0802291410" }, @@ -150,8 +134,7 @@ sm_defaults=sm_macmini_defaults; break; case 2: - //sm_defaults=sm_imac_defaults; - sm_defaults=sm_macpro21_defaults; //Azi: for testing..! + sm_defaults=sm_imac_defaults; break; default: { @@ -216,7 +199,7 @@ return 0x0301; // Core 2 Duo } -//Azi: warning: ‘sm_get_bus_speed’ defined but not used + static int sm_get_bus_speed(const char *name, int table_num) { if (Platform.CPU.Vendor == 0x756E6547) // Intel Index: branches/azimutz/Chazileon/i386/boot2/boot.h =================================================================== --- branches/azimutz/Chazileon/i386/boot2/boot.h (revision 314) +++ branches/azimutz/Chazileon/i386/boot2/boot.h (revision 315) @@ -91,8 +91,7 @@ */ //definition name location/function description/comment -// Internal use: remove/move, if possible/benefitial?? leave for later... -#define kBootDeviceKey "Boot Device" // options.c, getValFK and this?? +// leave for later... #define kTextModeKey "Text Mode" // graphics.c, getNumberArrayFromProperty textmode resolution?? #define kProductVersion "ProductVersion" // boot.c, getValFK, internal key on SystemVersion.plist @@ -123,7 +122,9 @@ #define kKernelFlagsKey "Kernel Flags" // * options.c, getValFK #define kPatchKernelKey "PatchKernel" // # stringTable.c, getBollFK Meklort -#define kRootDeviceKey "rd" // * options.c, processBootArgument test this +#define kRootDeviceKey "rd" // * options.c, processBootArgument test this, +#define kBootDeviceKey "Boot Device" // options.c, getValFK and this?? + #define kBootUUIDKey "boot-uuid" // options.c, processBootArgument test this #define kHelperRootUUIDKey "Root UUID" // options.c, getValFK can't test this @@ -176,7 +177,7 @@ #define kArchX86_64Flag "64" // # boot.c, getValFK //---------- #define kVerboseModeFlag "-v" // * options.c, getValFK -#define kOldSafeModeFlag "-f" // kIgnoreCacheModeFlag*, options.c, getValFK +#define kOldSafeModeFlag "-f" // kIgnoreCacheModeFlag***, options.c, getValFK #define kSafeModeFlag "-x" // * options.c, getValueFBK (5) & getValFK #define kSingleUserModeFlag "-s" // * options.c, getValFK #define kIgnoreBootFileFlag "-F" // * options.c, getValFBK Index: branches/azimutz/Chazileon/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazileon/i386/boot2/gui.c (revision 314) +++ branches/azimutz/Chazileon/i386/boot2/gui.c (revision 315) @@ -189,8 +189,8 @@ int compareIndex = (upperLimit - lowerLimit) >> 1; // Midpoint int result; - // NOTE: This algorithm assumes that the embeddedImages is sorted. - // This is currently done using the make file. If the array is every + // NOTE: This algorithm assumes that the embedded images are sorted. + // This is currently done using the make file. If the array is ever // manualy generated, this *will* fail to work properly. while((result = strcmp(name, embeddedImages[compareIndex].name)) != 0) { @@ -693,7 +693,7 @@ } else { - // parse screen size parameters + // parse display size parameters if (getIntForKey("screen_width", &val, &bootInfo->themeConfig) && val > 0) { screen_params[0] = val; @@ -1864,7 +1864,7 @@ } else { - // parse boot screen size parameters + // parse display size parameters if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0) { screen_params[0] = pos; Index: branches/azimutz/Chazileon/i386/doc/README =================================================================== --- branches/azimutz/Chazileon/i386/doc/README (revision 314) +++ branches/azimutz/Chazileon/i386/doc/README (revision 315) @@ -51,7 +51,7 @@ stage bootstrap loader "boot2()". In order to be able to load the big kernel image (bigger than 512K or 640K, depends on the memory configuration), the second stage boot loader will run on the protected - mode. This bootstarp loader does not have any stand alone device + mode. This bootstrap loader does not have any stand alone device drivers, all the I/O's are through the BIOS calls. Since the first stage boot code will no longer be used at this moment, the memory location of the first stage boot code (0000:1000H to 0000:1200H) will @@ -62,7 +62,7 @@ and boot data segments must not be greater than 64K. The boot loader loads the kernel image at memory location above 1 MB - to skip the memory hole between 521K??/640K and 1MB. After the kernel + to skip the memory hole between 512K/640K and 1MB. After the kernel is loaded, the boot loader stores the information in the stack and then passes control to kernel. Currently, the three information passed from the boot loader to the kernel are type of the boot device, size Index: branches/azimutz/Chazileon/Makefile =================================================================== --- branches/azimutz/Chazileon/Makefile (revision 314) +++ branches/azimutz/Chazileon/Makefile (revision 315) @@ -116,7 +116,7 @@ @tar -cjf $(SYMROOT)/$(PRODUCT)-src.tar.bz2 ${EXCLUDE} . clean: - rm -rf sym obj dst revision + rm -rf sym obj dst #distclean: clean # @rm -f $(SYMROOT)/$(PRODUCT)-src.*