Chameleon Commit Details - 1899 - Chameleon open source boot loader project.

Date:

2012-03-20 10:05:01 (12 years 1 month ago)

Author:

armel cadet-petit

Commit:

1899

Parents:

1898

Message:

bug fixes

Changes:

D	/branches/cparm/artwork/themes/msi_netbook
D	/branches/cparm/artwork/themes/pinktink
D	/branches/cparm/artwork/themes/twilight
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_o_WALL_WINDOWS7.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ntfs_WALL_WINDOWS7.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_WALL_UBUNTU.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_o_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_o_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_lion_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_o_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_sl_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_openbsd_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/font_console_MONOSPACED.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_befs_o_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Animals/device_openbsd_o_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT1.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos/device_freebsd_ALT2.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Logos
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/device_openbsd_o_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_ext3_o_WALL_UBUNTU.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_lion_o_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_lion_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_ml_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/device_freebsd_o_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/device_openbsd_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsplus_sl_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/device_befs_o_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_ml_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - WallpaperStyle/device_hfsraid_sl_o_WALL.png
A	/branches/cparm/artwork/themes/LoginToLion/device_freebsd_alt.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsplus_lion_o_VLADSTUDIOS.png
A	/branches/cparm/artwork/themes/LoginToLion/ALTERNATES/Devices - Silly/device_hfsraid_sl_o_VLADSTUDIOS.png
M	/branches/cparm/i386/modules/HibernateEnabler/graphic_utils.c
M	/branches/cparm/i386/libsaio/bootstruct.h
M	/branches/cparm/i386/util/amlsgn.m
M	/branches/cparm/i386/libsaio/platform.h
M	/branches/cparm/CREDITS
M	/branches/cparm/CHANGES
M	/branches/cparm/artwork/themes/LoginToLion/device_befs_o_alt.png
M	/branches/cparm/artwork/themes/LoginToLion/device_befs_o.png
M	/branches/cparm/i386/libsaio/fake_efi.c
M	/branches/cparm/i386/boot2/boot.c
M	/branches/cparm/Chameleon.xcodeproj/project.pbxproj
M	/branches/cparm/artwork/themes/LoginToLion/device_openbsd_o.png
M	/branches/cparm/i386/libsaio/saio_internal.h
M	/branches/cparm/i386/libsaio/acpi_tools.c
M	/branches/cparm/i386/boot2/options.c
M	/branches/cparm/i386/modules/GUI/GUI_module.c
M	/branches/cparm/artwork/themes/LoginToLion/device_freebsd_o.png
M	/branches/cparm/i386/modules/ACPICodec/acpi_codec.c
M	/branches/cparm/artwork/themes/LoginToLion/device_openbsd.png
M	/branches/cparm/i386/modules/ACPICodec/acpi_codec.h
M	/branches/cparm/i386/boot2/drivers.c
M	/branches/cparm/i386/libsaio/saio_types.h
M	/branches/cparm/artwork/themes/LoginToLion/device_freebsd.png
M	/branches/cparm/i386/modules/GUI/gui.c
M	/branches/cparm/artwork/themes/LoginToLion/device_befs_alt.png
M	/branches/cparm/artwork/themes/LoginToLion/device_befs.png
M	/branches/cparm/i386/modules/GUI/graphic_utils.c
M	/branches/cparm/i386/libsaio/bootstruct.c
M	/branches/cparm/TODO

File differences

-6
7 7
8 8
9 
9
10 10
11 11
12 12
+- Implement a pool allocator, so each module will run and allocate memory in there own pool, de-alloc all allocated memory by the module, ␊
  will be done simply by destroying the pool␊
␊
- (re-)Implement a watchdog library set (clear the watchdog , can avoid infinite loop made for unknow reasons by the compiler or cpu reset) ␊
- Try to sync our prf() with the apple/mach __doprnt() (in Xnu/osfmk/kern/printf.c) to normalize the formating in our printf, sprintf, etc ..., and facilitate bug fixes␊
␊
- Implement a Host like in bits to avoid some return issues␊
␊
 - Implement a pool allocator, so each module will run and allocate memory in there own pool, de-alloc all allocated memory by the module, ␊
   will be done simply by destroying the pool␊
 ␊
-- (re-)Implement a watchdog library set (clear the watchdog , can avoid infinite loop made for unknow reasons by the compiler or cpu reset) ␊
+- Try to sync our prf() with the apple/mach __doprnt() (in Xnu/osfmk/kern/printf.c) to normalize the formating in our printf, sprintf, etc ..., and facilitate bug fixes␊
 ␊
 - Implement a Host like in bits to avoid some return issues␊
 ␊

-
2
3
4
5
1 6
2 7
3 8
+- Sync'd LoginToLion with the last Enzo's update (want more about LoginToLion ? please follow or participate to this thread : http://forum.voodooprojects.org/index.php/topic,2125.0.html)␊
- fixed some bugs␊
- Added an option to change the acpi detection method (only for acpi 64 users) ␊
- Updated amlsgn with more cocoa ␊
␊
- Many security and bug fixes and improvements␊
- Added a workaround for some machines that was unable to enter to the startup options during the countdown␊
- Implemented a new environment platform␊
+- Sync'd LoginToLion with the last Enzo's update (want more about LoginToLion ? please follow or participate to this thread : http://forum.voodooprojects.org/index.php/topic,2125.0.html)␊
+- fixed some bugs␊
+- Added an option to change the acpi detection method (only for acpi 64 users) ␊
+- Updated amlsgn with more cocoa ␊
+␊
 - Many security and bug fixes and improvements␊
 - Added a workaround for some machines that was unable to enter to the startup options during the countdown␊
 - Implemented a new environment platform␊

-113
114 114
115 115
116 
117 
118 
119 
120 
121 
122 
123 
124 
125 
126 
127 
128 
129 
130 
131 
132 116
117
118
133 119
134 120
135 121
... ...
137 123
138 124
139 125
140 
126
141 127
142 
143 
144 128
145 129
146 130
+ to the kernel and are thus located in bootArgs although with different field names.␊
 */␊
typedef struct PrivateBootInfo {␊
    int              convmem;                      // conventional memory␊
    int              extmem;                       // extended memory␊
#if 0␊
    int              numBootDrivers;               // number of drivers loaded␊
#endif␊
    char             bootFile[128];                // kernel file name␉␉␊
    ␊
    unsigned long    memoryMapCount;␊
    MemoryRange      memoryMap[kMemoryMapCountMax];␊
    ␊
#if 0␊
    PCI_bus_info_t   pciInfo;␊
    driver_config_t  driverConfig[NDRIVERS];␊
    char *           configEnd;                    // pointer to end of config files␊
    char             config[CONFIG_SIZE];␉␊
#endif␊
␉␊
    char             bootFile[128];                // kernel file name            ␊
␉␊
    config_file_t    bootConfig;␉␉               // the booter boot.plist␊
    config_file_t    overrideConfig;               // additional boot.plist which can override bootConfig keys␊
␉␊

    ␊
    ␊
    config_file_t    smbiosConfig;␉␉␉␉         // smbios.plist␊
    config_file_t    helperConfig;                 // boot helper partition's boot.plist␊
    config_file_t    helperConfig;                 // boot helper partition's boot.plist␉␊
␉␊
␉unsigned long    adler32;␊
␉␊
␉char uuidStr[64+1];␉␉␉␉␉␉␉␉␉␉//boot device  uuid␊
    ␊
} PrivateBootInfo_t;␊
 ...
  to the kernel and are thus located in bootArgs although with different field names.␊
  */␊
 typedef struct PrivateBootInfo {␊
-    int              convmem;                      // conventional memory␊
-    int              extmem;                       // extended memory␊
-#if 0␊
-    int              numBootDrivers;               // number of drivers loaded␊
-#endif␊
-    char             bootFile[128];                // kernel file name␉␉␊
-    ␊
-    unsigned long    memoryMapCount;␊
-    MemoryRange      memoryMap[kMemoryMapCountMax];␊
-    ␊
-#if 0␊
-    PCI_bus_info_t   pciInfo;␊
-    driver_config_t  driverConfig[NDRIVERS];␊
-    char *           configEnd;                    // pointer to end of config files␊
-    char             config[CONFIG_SIZE];␉␊
-#endif␊
 ␉␊
+    char             bootFile[128];                // kernel file name            ␊
+␉␊
     config_file_t    bootConfig;␉␉               // the booter boot.plist␊
     config_file_t    overrideConfig;               // additional boot.plist which can override bootConfig keys␊
 ␉␊
     ␊
     ␊
     config_file_t    smbiosConfig;␉␉␉␉         // smbios.plist␊
-    config_file_t    helperConfig;                 // boot helper partition's boot.plist␊
+    config_file_t    helperConfig;                 // boot helper partition's boot.plist␉␊
 ␉␊
-␉unsigned long    adler32;␊
-␉␊
 ␉char uuidStr[64+1];␉␉␉␉␉␉␉␉␉␉//boot device  uuid␊
     ␊
 } PrivateBootInfo_t;␊

-112
113 113
114 114
115
115 116
116 117
117 118
+#define envCPUFreq              "CPUFreq"␊
#define envIsServer             "isServer"␊
␊
#define envAdler32␉␉␉␉"adler32"␊
␊
#define envCurrCoef             "CurrCoef"   ␊
#define envCurrDiv              "CurrDiv"   ␊
 #define envCPUFreq              "CPUFreq"␊
 #define envIsServer             "isServer"␊
 ␊
+#define envAdler32␉␉␉␉"adler32"␊
 ␊
 #define envCurrCoef             "CurrCoef"   ␊
 #define envCurrDiv              "CurrDiv"   ␊

-79
80 80
81 81
82
82 83
83 84
84 85
+#define kSystemType␉␉␉"SystemType"␉␉/* fake_efi.c */␊
#define kPCIRootUID␉␉␉"PCIRootUID"␉␉/* pci_root.c */␊
#define kDefaultPartition␉"Default Partition"␉/* sys.c */␊
#define kAcpiMethod␉␉␉"nacpi"␉␉␉␉// 0x2000 (= method 2) for some machines that may hang on acpi 2 (aka acpi 64 bit) detection (replace the old kUnsafeACPI "UnsafeACPI") ␉␊
␊
#define PLATFORM_NAME_LEN 64␊
#define ROOT_PATH_LEN 256␊
 #define kSystemType␉␉␉"SystemType"␉␉/* fake_efi.c */␊
 #define kPCIRootUID␉␉␉"PCIRootUID"␉␉/* pci_root.c */␊
 #define kDefaultPartition␉"Default Partition"␉/* sys.c */␊
+#define kAcpiMethod␉␉␉"nacpi"␉␉␉␉// 0x2000 (= method 2) for some machines that may hang on acpi 2 (aka acpi 64 bit) detection (replace the old kUnsafeACPI "UnsafeACPI") ␉␊
 ␊
 #define PLATFORM_NAME_LEN 64␊
 #define ROOT_PATH_LEN 256␊

-448
449 449
450 450
451
451 452
452 453
453 454
... ...
509 510
510 511
511 512
512 
513
513 514
514 515
515 516
... ...
547 548
548 549
549 550
550 
551
551 552
552 
553
553 554
554 555
555 556
... ...
576 577
577 578
578 579
579 
580
580 581
581 582
582 583
... ...
738 739
739 740
740 741
741 
742 
742
743
744
745
746
747
748
749
750
751
743 752
744 753
745 
754
746 755
747 
748 
749 
750 
751 
752 
753 
754 
755 
756
756 757
757 758
758 759
759 760
760 761
761 
762
762 763
763 
764 
764
765
765 766
766 767
767 768
... ...
837 838
838 839
839 840
840 
841
841 842
842 843
843 844
... ...
1048 1049
1049 1050
1050 1051
1051 
1052 
1052
+static uint64_t     kFSBFrequency;␊
static uint32_t␉␉kHardware_signature;␊
static uint8_t␉␉kType;␊
static uint32_t␉␉kAdler32;␊
␊
EFI_STATUS Register_Acpi_Efi(void* rsd_p, unsigned char rev )␊
{␊

        }        ␊
        ␊
        ret = setupAcpiNoMod();␊
␉␉␉␊
␉␉␊
␉} while (0);␉␊
␉␊
␉return ret;␉␊

{␊
␉if (!GetgPlatformName() && strcmp(key, "SMproductname") == 0)␊
␉␉readSMBIOS(thePlatformName);␊
                ␊
␉␊
␉const char␉*PlatformName =  GetgPlatformName() ;␊
        ␊
␉␊
␉const char␉*src = (strcmp(key, "SMproductname") == 0) ? PlatformName : getStringForKey(key, DEFAULT_SMBIOS_CONFIG);␊
␉␊
␉EFI_CHAR16*␉ dst = 0;␉␊

␉static EFI_CHAR8␉␉ uuid[UUID_LEN];␊
␉int␉␉␉␉␉␉ i, isZero, isOnes;␊
␉SMBByte␉␉␉␉␉*p;␉␉␊
␊
␉␊
    p = (SMBByte*)(uint32_t)get_env(envUUID);␊
    ␊
    if ( p == NULL )␊

␉␉␉// additionally this value can be used by third-party apps or osx components (ex: pre-10.7 kextcache, ...)␊
␉␉␉if (bootInfo->uuidStr[0]) ␉␉␉␊
␉␉␉␉DT__AddProperty(chosenNode, kBootUUIDKey, strlen(bootInfo->uuidStr)+1, bootInfo->uuidStr);␊
␊
␉␉␉␉if (GetgRootDevice())␊
␉␉␉␊
␉␉␉if (GetgRootDevice())␊
␉␉␉{␊
␉␉␉␉␊
␉␉␉␉DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice());␉␉␉␊
␉␉␉␉␊
␉␉␉}␉␉␉␊
#ifdef rootpath␊
␉␉␉else␊
␉␉␉␉if (gRootPath[0])␊
␉␉␉␉{␊
␉␉␉␉␉␊
␉␉␉␉␉DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice());␉␉␉␊
␉␉␉␉␉DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath);␉␉␉␊
␉␉␉␉␉␊
␉␉␉␉}␉␉␉␊
#ifdef rootpath␊
                else␊
                    if (gRootPath[0])␊
                    {␊
                        ␊
                        DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath);␉␉␉␊
                        ␊
                    } ␊
␉␉␉␉} ␊
            ␊
#endif␊
␉␉␉␊
␉␉␉// "boot-file" is not used by kextcache if there is no "boot-device-path" or if there is a valid "rootpath" ,␊
␉␉␉// but i let it by default since it may be used by another service␊
␉␉␉DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile);␊
␉␉␉DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile);␉␉␉␊
␉␉␉␊
␉␉␉if (bootInfo->adler32) ␊
␉␉␉␉DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &bootInfo->adler32);␊
␉␉␉if ((kAdler32 = (uint32_t)get_env(envAdler32))) ␊
␉␉␉␉DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &kAdler32);␊
␉␉␉␊
␉␉}␊
␉}␉␊

␉␉// NOTE WELL: If you do add FSB Frequency detection, make sure to store␊
␉␉// the value in the fsbFrequency global and not an malloc'd pointer␊
␉␉// because the DT_AddProperty function does not copy its args.␊
␉␉     ␊
␉␉␊
        kFSBFrequency = get_env(envFSBFreq);␊
␉␉if (kFSBFrequency != 0)␊
␉␉␉DT__AddProperty(efiPlatformNode, FSB_Frequency_prop, sizeof(uint64_t), &kFSBFrequency);␉␉␊

␉// Add configuration table entries to both the services table and the device tree␊
␉setupEfiConfigurationTable();␉␉␊
␉␊
}␊
␊
}
 ...
 ...
 ...
 ...
 ...
 ...
 static uint64_t     kFSBFrequency;␊
 static uint32_t␉␉kHardware_signature;␊
 static uint8_t␉␉kType;␊
+static uint32_t␉␉kAdler32;␊
 ␊
 EFI_STATUS Register_Acpi_Efi(void* rsd_p, unsigned char rev )␊
 {␊
         }        ␊
         ␊
         ret = setupAcpiNoMod();␊
-␉␉␉␊
+␉␉␊
 ␉} while (0);␉␊
 ␉␊
 ␉return ret;␉␊
 {␊
 ␉if (!GetgPlatformName() && strcmp(key, "SMproductname") == 0)␊
 ␉␉readSMBIOS(thePlatformName);␊
-                ␊
+␉␊
 ␉const char␉*PlatformName =  GetgPlatformName() ;␊
-        ␊
+␉␊
 ␉const char␉*src = (strcmp(key, "SMproductname") == 0) ? PlatformName : getStringForKey(key, DEFAULT_SMBIOS_CONFIG);␊
 ␉␊
 ␉EFI_CHAR16*␉ dst = 0;␉␊
 ␉static EFI_CHAR8␉␉ uuid[UUID_LEN];␊
 ␉int␉␉␉␉␉␉ i, isZero, isOnes;␊
 ␉SMBByte␉␉␉␉␉*p;␉␉␊
-␊
+␉␊
     p = (SMBByte*)(uint32_t)get_env(envUUID);␊
     ␊
     if ( p == NULL )␊
 ␉␉␉// additionally this value can be used by third-party apps or osx components (ex: pre-10.7 kextcache, ...)␊
 ␉␉␉if (bootInfo->uuidStr[0]) ␉␉␉␊
 ␉␉␉␉DT__AddProperty(chosenNode, kBootUUIDKey, strlen(bootInfo->uuidStr)+1, bootInfo->uuidStr);␊
-␊
-␉␉␉␉if (GetgRootDevice())␊
+␉␉␉␊
+␉␉␉if (GetgRootDevice())␊
+␉␉␉{␊
+␉␉␉␉␊
+␉␉␉␉DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice());␉␉␉␊
+␉␉␉␉␊
+␉␉␉}␉␉␉␊
+#ifdef rootpath␊
+␉␉␉else␊
+␉␉␉␉if (gRootPath[0])␊
 ␉␉␉␉{␊
 ␉␉␉␉␉␊
-␉␉␉␉␉DT__AddProperty(chosenNode, "boot-device-path", strlen(GetgRootDevice())+1, GetgRootDevice());␉␉␉␊
+␉␉␉␉␉DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath);␉␉␉␊
 ␉␉␉␉␉␊
-␉␉␉␉}␉␉␉␊
-#ifdef rootpath␊
-                else␊
-                    if (gRootPath[0])␊
-                    {␊
-                        ␊
-                        DT__AddProperty(chosenNode, "rootpath", strlen(gRootPath)+1, gRootPath);␉␉␉␊
-                        ␊
-                    } ␊
+␉␉␉␉} ␊
             ␊
 #endif␊
 ␉␉␉␊
 ␉␉␉// "boot-file" is not used by kextcache if there is no "boot-device-path" or if there is a valid "rootpath" ,␊
 ␉␉␉// but i let it by default since it may be used by another service␊
-␉␉␉DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile);␊
+␉␉␉DT__AddProperty(chosenNode, "boot-file", strlen(bootInfo->bootFile)+1, (EFI_CHAR16*)bootInfo->bootFile);␉␉␉␊
 ␉␉␉␊
-␉␉␉if (bootInfo->adler32) ␊
-␉␉␉␉DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &bootInfo->adler32);␊
+␉␉␉if ((kAdler32 = (uint32_t)get_env(envAdler32))) ␊
+␉␉␉␉DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(unsigned long), &kAdler32);␊
 ␉␉␉␊
 ␉␉}␊
 ␉}␉␊
 ␉␉// NOTE WELL: If you do add FSB Frequency detection, make sure to store␊
 ␉␉// the value in the fsbFrequency global and not an malloc'd pointer␊
 ␉␉// because the DT_AddProperty function does not copy its args.␊
-␉␉     ␊
+␉␉␊
         kFSBFrequency = get_env(envFSBFreq);␊
 ␉␉if (kFSBFrequency != 0)␊
 ␉␉␉DT__AddProperty(efiPlatformNode, FSB_Frequency_prop, sizeof(uint64_t), &kFSBFrequency);␉␉␊
 ␉// Add configuration table entries to both the services table and the device tree␊
 ␉setupEfiConfigurationTable();␉␉␊
 ␉␊
-}␊
-␊
+}

-92
93 93
94 94
95 
96 95
96
97 97
98 98
99 99
+extern void   reserveKern108BootStruct(void);␊
extern void   setBootArgsVideoMode(int mode);␊
extern void         setBootArgsVideoStruct(Boot_Video␉*Video);␊
extern uint32_t     getBootArgsVideoPtrAtOffset(uint32_t offset);␊
extern uint32_t     getVideoMode(void);␊
extern boot_args_common * getBootArgs(void);␊
␊
␊
/* cache.c */␊
 extern void   reserveKern108BootStruct(void);␊
 extern void   setBootArgsVideoMode(int mode);␊
 extern void         setBootArgsVideoStruct(Boot_Video␉*Video);␊
-extern uint32_t     getBootArgsVideoPtrAtOffset(uint32_t offset);␊
 extern uint32_t     getVideoMode(void);␊
+extern boot_args_common * getBootArgs(void);␊
 ␊
 ␊
 /* cache.c */␊

-695
696 696
697 697
698 
698
699 699
700 700
701 701
... ...
711 711
712 712
713 713
714 
714
715 715
716 716
717 717
... ...
721 721
722 722
723 723
724 
724
725 725
726 726
727 727
... ...
733 733
734 734
735 735
736 
736
737 737
738 738
739 739
... ...
767 767
768 768
769 769
770 
770
771 771
772 772
773 773
... ...
878 878
879 879
880 880
881
881 882
882 883
883 884
... ...
949 950
950 951
951 952
952 
953
954
953 955
954 956
955 957
... ...
960 962
961 963
962 964
963 
964 
965
966
967
968
969
970
965 971
966 972
967 
973
968 974
969 975
970 976
971 
972 
977
978
973 979
974 980
975 981
+                    if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat))␊
                    {␊
                        trycache = 0;␊
                        bootInfo->adler32  = 0;␊
                        safe_set_env(envAdler32, 0);␊
                        DBG("No kernel found, kernelcache disabled !!!\n");␊
                        break;␊
                    }␊

␉␉␉␉␉|| (cachetime < kerneltime))␊
␉␉␉␉{␊
␉␉␉␉␉trycache = 0;␊
␉␉␉␉␉bootInfo->adler32  = 0;␊
␉␉␉␉␉safe_set_env(envAdler32, 0);␊
␉␉␉␉␉DBG("Warning: No kernelcache found or kernelcache too old (timestamp of the kernel > timestamp of the cache), kernelcache disabled !!!\n");␊
␊
␉␉␉␉␉break;␉␉␉␉                ␊

␉␉␉␉␉&& (cachetime < exttime))␊
␉␉␉␉{␊
␉␉␉␉␉trycache = 0;␊
␉␉␉␉␉bootInfo->adler32  = 0;␊
␉␉␉␉␉safe_set_env(envAdler32, 0);␊
␉␉␉␉␉DBG("Warning: kernelcache too old, timestamp of S/L/E > timestamp of the cache, kernelcache disabled !!! \n");␊
␊
␉␉␉␉␉break;␊

␉␉␉␉if (cachetime != (exttime + 1))␊
␉␉␉␉{␊
␉␉␉␉␉trycache = 0;␊
␉␉␉␉␉bootInfo->adler32  = 0;␊
␉␉␉␉␉safe_set_env(envAdler32, 0);␊
␉␉␉␉␉DBG("Warning: invalid timestamp, kernelcache disabled !!!\n");␊
␊
␉␉␉␉␉break;␊

                }␊
␉␉␉␉␊
            }␊
␉␉␉bootInfo->adler32  = 0;␊
␉␉␉safe_set_env(envAdler32, 0);␊
            bootFile = bootInfo->bootFile;␊
#ifdef BOOT_HELPER_SUPPORT␊
␉␉␉␊

␉{␊
␉␉const char    *val;␊
␉␉int            len;␊
␉␉unsigned long    Adler32 = 0;␊
␉␉␊
␉␉if (getValueForKey(kKernelCacheKey, &val, &len, DEFAULT_BOOT_CONFIG))␊
␉␉{␊

                    SetgRootPath(platformInfo->rootPath);␊
#endif␊
␉␉␉␉␉␊
␉␉␉␉␉bootInfo->adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo)));␊
␉␉␉␉␉Adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo)));␊
␉␉␉␉␉safe_set_env(envAdler32, Adler32);␊
␉␉␉␉␉␊
␉␉␉␉␉free(platformInfo);␉␊
␉␉␉␉}␊

␉␉␉␉{␊
␉␉␉␉␉long flags, cachetime;␊
␉␉␉␉␉int ret = -1;␊
␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",bootInfo->adler32);␊
␉␉␉␉␉ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime);␊
␉␉␉␉␉␊
␉␉␉␉␉if (Adler32) {␊
␉␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",Adler32);␊
␉␉␉␉␉␉ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime);␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat))␊
␉␉␉␉␉{␊
␉␉␉␉␉␉bootInfo->adler32 = 0;␊
␉␉␉␉␉␉safe_set_env(envAdler32, 0);␊
␉␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s", "/System/Library/Caches/com.apple.kernelcaches/kernelcache"); ␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉} else␊
␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", bootInfo->adler32); //Snow Leopard␊
␉␉␉␉} else if (Adler32)␊
␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", Adler32); //Snow Leopard␊
␉␉␉␉␊
␉␉␉}␉␊
␉␉}␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
                     if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat))␊
                     {␊
                         trycache = 0;␊
-                        bootInfo->adler32  = 0;␊
+                        safe_set_env(envAdler32, 0);␊
                         DBG("No kernel found, kernelcache disabled !!!\n");␊
                         break;␊
                     }␊
 ␉␉␉␉␉|| (cachetime < kerneltime))␊
 ␉␉␉␉{␊
 ␉␉␉␉␉trycache = 0;␊
-␉␉␉␉␉bootInfo->adler32  = 0;␊
+␉␉␉␉␉safe_set_env(envAdler32, 0);␊
 ␉␉␉␉␉DBG("Warning: No kernelcache found or kernelcache too old (timestamp of the kernel > timestamp of the cache), kernelcache disabled !!!\n");␊
 ␊
 ␉␉␉␉␉break;␉␉␉␉                ␊
 ␉␉␉␉␉&& (cachetime < exttime))␊
 ␉␉␉␉{␊
 ␉␉␉␉␉trycache = 0;␊
-␉␉␉␉␉bootInfo->adler32  = 0;␊
+␉␉␉␉␉safe_set_env(envAdler32, 0);␊
 ␉␉␉␉␉DBG("Warning: kernelcache too old, timestamp of S/L/E > timestamp of the cache, kernelcache disabled !!! \n");␊
 ␊
 ␉␉␉␉␉break;␊
 ␉␉␉␉if (cachetime != (exttime + 1))␊
 ␉␉␉␉{␊
 ␉␉␉␉␉trycache = 0;␊
-␉␉␉␉␉bootInfo->adler32  = 0;␊
+␉␉␉␉␉safe_set_env(envAdler32, 0);␊
 ␉␉␉␉␉DBG("Warning: invalid timestamp, kernelcache disabled !!!\n");␊
 ␊
 ␉␉␉␉␉break;␊
                 }␊
 ␉␉␉␉␊
             }␊
-␉␉␉bootInfo->adler32  = 0;␊
+␉␉␉safe_set_env(envAdler32, 0);␊
             bootFile = bootInfo->bootFile;␊
 #ifdef BOOT_HELPER_SUPPORT␊
 ␉␉␉␊
 ␉{␊
 ␉␉const char    *val;␊
 ␉␉int            len;␊
+␉␉unsigned long    Adler32 = 0;␊
 ␉␉␊
 ␉␉if (getValueForKey(kKernelCacheKey, &val, &len, DEFAULT_BOOT_CONFIG))␊
 ␉␉{␊
                     SetgRootPath(platformInfo->rootPath);␊
 #endif␊
 ␉␉␉␉␉␊
-␉␉␉␉␉bootInfo->adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo)));␊
+␉␉␉␉␉Adler32 = OSSwapHostToBigInt32(adler32((unsigned char *)platformInfo, sizeof(*platformInfo)));␊
+␉␉␉␉␉safe_set_env(envAdler32, Adler32);␊
 ␉␉␉␉␉␊
 ␉␉␉␉␉free(platformInfo);␉␊
 ␉␉␉␉}␊
 ␉␉␉␉{␊
 ␉␉␉␉␉long flags, cachetime;␊
 ␉␉␉␉␉int ret = -1;␊
-␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",bootInfo->adler32);␊
-␉␉␉␉␉ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime);␊
+␉␉␉␉␉␊
+␉␉␉␉␉if (Adler32) {␊
+␉␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s.%08lX", "/System/Library/Caches/com.apple.kernelcaches/kernelcache",Adler32);␊
+␉␉␉␉␉␉ret = GetFileInfo(NULL, gBootKernelCacheFile, &flags, &cachetime);␊
+␉␉␉␉␉}␊
+␉␉␉␉␉␊
 ␉␉␉␉␉if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeFlat))␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉bootInfo->adler32 = 0;␊
+␉␉␉␉␉␉safe_set_env(envAdler32, 0);␊
 ␉␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s", "/System/Library/Caches/com.apple.kernelcaches/kernelcache"); ␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉␊
-␉␉␉␉} else␊
-␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", bootInfo->adler32); //Snow Leopard␊
+␉␉␉␉} else if (Adler32)␊
+␉␉␉␉␉sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePath, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", Adler32); //Snow Leopard␊
 ␉␉␉␉␊
 ␉␉␉}␉␊
 ␉␉}␊

-818
819 819
820 820
821 
821
822 822
823 823
824 824
+        }␊
        char* BootKernelCacheFile = (char*)(uint32_t)get_env(envkCache);␊
␉␉if (((get_env(envgBootMode) & kBootModeSafe) == 0) && (BootKernelCacheFile[0] != '\0') && gBootVolume->OSVersion[3] > '6') ␊
␉␉␉bootInfo->adler32 = kernel_header->adler32;␊
␉␉␉safe_set_env(envAdler32, kernel_header->adler32);␊
    }␊
␉␊
␉{␊
         }␊
         char* BootKernelCacheFile = (char*)(uint32_t)get_env(envkCache);␊
 ␉␉if (((get_env(envgBootMode) & kBootModeSafe) == 0) && (BootKernelCacheFile[0] != '\0') && gBootVolume->OSVersion[3] > '6') ␊
-␉␉␉bootInfo->adler32 = kernel_header->adler32;␊
+␉␉␉safe_set_env(envAdler32, kernel_header->adler32);␊
     }␊
 ␉␊
 ␉{␊

-127
128 128
129 129
130 
130
131 131
132 132
133 133
134 
134
135 135
136 136
137 137
... ...
139 139
140 140
141 141
142 
142
143 143
144 144
145 145
... ...
155 155
156 156
157 157
158 
158
159 159
160 160
161 161
... ...
173 173
174 174
175 175
176 
176
177 177
178 178
179 179
... ...
192 192
193 193
194 194
195 
195
196 196
197 197
198 198
... ...
343 343
344 344
345 345
346 
346
347 347
348 348
349 349
... ...
397 397
398 398
399 399
400 
400
401 401
402 402
403 403
404 404
405 
405
406 406
407 407
408 408
... ...
434 434
435 435
436 436
437 
437
438 438
439 439
440 440
... ...
442 442
443 443
444 444
445 
445
446 446
447 447
448 448
... ...
496 496
497 497
498 498
499 
499
500 500
501 501
502 502
... ...
505 505
506 506
507 507
508 
508
509
510
509 511
510 512
511 513
... ...
529 531
530 532
531 533
532 
534
533 535
534 536
535 537
536 538
537 539
538 
540
541
542
539 543
540 544
541 545
... ...
582 586
583 587
584 588
585 
589
586 590
587 591
588 592
... ...
623 627
624 628
625 629
626 
630
627 631
628 632
629 633
... ...
631 635
632 636
633 637
634 
638
635 639
636 640
637 641
... ...
646 650
647 651
648 652
649 
653
650 654
651 655
652 656
... ...
664 668
665 669
666 670
667 
671
668 672
669 673
670 674
... ...
713 717
714 718
715 719
716 
720
717 721
718 722
719 723
... ...
753 757
754 758
755 759
756 
760
757 761
758 762
759 763
... ...
921 925
922 926
923 927
924 
928
925 929
926 930
927 931
... ...
969 973
970 974
971 975
972 
976
973 977
974 978
975 979
... ...
978 982
979 983
980 984
981 
985
982 986
983 987
984 988
... ...
1044 1048
1045 1049
1046 1050
1047 
1051
1048 1052
1049 1053
1050 1054
... ...
1118 1122
1119 1123
1120 1124
1121 
1125
1122 1126
1123 1127
1124 1128
1125 1129
1126 
1130
1127 1131
1128 1132
1129 1133
+␉␊
␉moveCursor( 0, row );␊
␉printf("%s",msg);␊
␊
␉␊
    for ( time = time18(), timeout++; timeout > 0; )␊
    {␊
␉␉if ((ch = readKeyboardStatus())){␊
                *optionKey = ch;            ␊
␉␉␉*optionKey = ch;            ␊
            break;␊
␉␉}␊
        // Count can be interrupted by holding down shift,␊

        if ( ( readKeyboardShiftFlags() & 0x0F ) != 0 )␊
␉␉{␊
            ch = 1;␊
␊
␉␉␉␊
            break;␊
        }␊
␉␉␊

#endif␊
        }␊
    }␊
   ␊
␉␊
    flushKeyboardBuffer();␊
    ␊
    return ch;␊

{␊
␉gBootArgsPtr = gBootArgs;␊
␉memset(gBootArgs, '\0', BOOT_STRING_LEN);    ␊
␊
␉␊
}␊
␊
void addBootArg(const char * argStr)␊

{␉␊
    char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt);␊
    char * bootRescanPrompt = (char*)(uint32_t)get_env(envBootRescanPrompt);␊
␊
␉␊
␉changeCursor( 0, row, kCursorTypeUnderline, 0 );    ␊
␉clearScreenRows( row, kScreenLastRow );␊
␉␊

    int MenuBottom = (int)get_env(envgMenuBottom);␊
    int MenuStart = (int)get_env(envgMenuStart);␊
    int MenuEnd = (int)get_env(envgMenuEnd);␊
␊
␉␊
    union {␊
        struct {␊
            unsigned int␊

            MenuStart--; MenuEnd--;␊
            draw.f.selectionUp = 1;␊
        }        ␊
␊
␉␉␊
        if ( draw.f.selectionUp || draw.f.selectionDown )␊
        {␊
␉␉␉␊
␉␉␉CursorState cursorState;␊
␊
␉␉␉␊
␉␉␉// Set cursor at current position, and clear inverse video.␊
␉␉␉changeCursor( 0, MenuRow + MenuSelection - MenuTop, kCursorTypeHidden, &cursorState );␊
␉␉␉printMenuItem( &gMenuItems[MenuSelection], 0 );␊

        *paramPtr = gMenuItems[MenuSelection].param;        ␊
        moved = 1;␊
    }␊
        ␊
␉␊
    safe_set_env(envgMenuSelection,MenuSelection);␊
    safe_set_env(envgMenuTop,MenuTop );␊
    safe_set_env(envgMenuRow,MenuRow);␊

    safe_set_env(envgMenuBottom,MenuBottom);␊
    safe_set_env(envgMenuStart,MenuStart);␊
    safe_set_env(envgMenuEnd,MenuEnd);␊
␊
␉␊
␉return moved;␊
}␊
␊

{␊
    int line;␊
    unsigned long i;␊
    MemoryRange *mp = bootInfo->memoryMap;␊
    MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap);␊
␉␊
    // Activate and clear page 1␊
    setActiveDisplayPage(1);␊

␉␊
    printf("BIOS reported memory ranges:\n");␊
    line = 1;␊
    for (i=0; i<bootInfo->memoryMapCount; i++) {␊
␉␊
␉int memoryMapCount = (int)get_env(envMemoryMapCnt);␊
    for (i=0; i<memoryMapCount; i++) {␊
        printf("Base 0x%08x%08x, ",␊
               (unsigned long)(mp->base >> 32),␊
               (unsigned long)(mp->base));␊

char *getMemoryInfoString(void)␊
{␊
    unsigned long i;␊
    MemoryRange *mp = bootInfo->memoryMap;␊
    MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap);␊
␉char *buff = malloc(sizeof(char)*1024);␊
␉if(!buff) return 0;␊
␉␊
␉char info[] = "BIOS reported memory ranges:\n";␊
␉sprintf(buff, "%s", info);␊
    for (i=0; i<bootInfo->memoryMapCount; i++) {␊
␉int memoryMapCount = (int)get_env(envMemoryMapCnt);␊
␉␊
    for (i=0; i<memoryMapCount; i++) {␊
        sprintf( buff+strlen(buff), "Base 0x%08x%08x, ",␊
␉␉␉␉(unsigned long)(mp->base >> 32),␊
␉␉␉␉(unsigned long)(mp->base));␊

␉BVRef   menuBVR;␊
␉bool    showPrompt, newShowPrompt, isCDROM;␊
    int     optionKey;␊
␊
␉␊
␉// Initialize default menu selection entry.␊
␉gBootVolume = menuBVR = selectBootVolume(getBvChain());␊
␉␊

␉if (timeout < 0) {␊
␉␉gBootMode |= kBootModeQuiet;␊
        safe_set_env(envgBootMode,gBootMode);␊
␊
␉␉␊
␉}␊
␉␊
␉// If the user is holding down a modifier key, enter safe mode.␊

␉␉␊
␉␉gBootMode |= kBootModeSafe;␊
        safe_set_env(envgBootMode,gBootMode);␊
␊
␉␉␊
␉}␊
␉␊
␉// Checking user pressed keys␊

␉if (f8press) {␊
␉␉gBootMode &= ~kBootModeQuiet;␊
        safe_set_env(envgBootMode,gBootMode);␊
␊
␉␉␊
␉␉timeout = 0;␊
␉}␊
␉// If user typed 'v' or 'V', boot in verbose mode.␊

␉␉// Display banner and show hardware info.␊
        char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
        ␊
␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);       ␊
␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);       ␊
␉}␊
␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
␉msglog("Scanning device %x...", (uint32_t)get_env(envgBIOSDev));␊

        do {␊
            // Hit the option key ?␊
            if (key == optionKey) {␊
␊
␉␉␉␉␊
                if (key != 0x1C0D) {␊
                    gBootMode &= ~kBootModeQuiet;␊
                    safe_set_env(envgBootMode,gBootMode);␊

        ␊
        if (key == 0x1C0D) {␊
            goto done;␊
␊
␉␉␉␊
        } ␊
        else if (key == 0)␊
        {␊

␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
␉}␊
    safe_set_env(envShouldboot, false);␊
␊
␉␊
␉if (menuItems) {␊
␉␉free(menuItems);␊
␉␉menuItems = NULL;␊

␉␉bzero(gBootArgs,sizeof(gBootArgs));␊
␉␉strlcpy(gBootArgs, cp_cache,sizeof(gBootArgs));␊
␉}␊
␊
␉␊
    const char *     cp  = gBootArgs;␊
    const char *     val = 0;␊
    const char *     kernel;␊

    char *           argP;␊
    char *           configKernelFlags;␊
␉int              ArgCntRemaining;␊
␊
␉␊
    skipblanks( &cp );␊
␉␊
    // Update the unit and partition number.␊

    if (( kernel = extractKernelName((char **)&cp) )) {        ␊
␉␉strlcpy( bootInfo->bootFile, kernel, sizeof(bootInfo->bootFile) );␊
        safe_set_env(envgOverrideKernel,true);␊
␊
␉␉␊
    } else {␊
        if ( getValueForKey( kKernelNameKey, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) {␊
            strlcpy( bootInfo->bootFile, val, sizeof(bootInfo->bootFile) );␊

␉␉long gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) ?␊
␉␉kBootModeSafe : kBootModeNormal;␊
        safe_set_env(envgBootMode,gBootMode);␊
␊
␉␉␊
        ␊
        if ( getValueForKey( kIgnoreCachesFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) {␊
            gBootMode = kBootModeSafe;␊
            safe_set_env(envgBootMode,gBootMode);␊
␊
␉␉␉␊
␉␉}␊
␉}␊
␉␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ␉␊
 ␉moveCursor( 0, row );␊
 ␉printf("%s",msg);␊
-␊
+␉␊
     for ( time = time18(), timeout++; timeout > 0; )␊
     {␊
 ␉␉if ((ch = readKeyboardStatus())){␊
-                *optionKey = ch;            ␊
+␉␉␉*optionKey = ch;            ␊
             break;␊
 ␉␉}␊
         // Count can be interrupted by holding down shift,␊
         if ( ( readKeyboardShiftFlags() & 0x0F ) != 0 )␊
 ␉␉{␊
             ch = 1;␊
-␊
+␉␉␉␊
             break;␊
         }␊
 ␉␉␊
 #endif␊
         }␊
     }␊
-   ␊
+␉␊
     flushKeyboardBuffer();␊
     ␊
     return ch;␊
 {␊
 ␉gBootArgsPtr = gBootArgs;␊
 ␉memset(gBootArgs, '\0', BOOT_STRING_LEN);    ␊
-␊
+␉␊
 }␊
 ␊
 void addBootArg(const char * argStr)␊
 {␉␊
     char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt);␊
     char * bootRescanPrompt = (char*)(uint32_t)get_env(envBootRescanPrompt);␊
-␊
+␉␊
 ␉changeCursor( 0, row, kCursorTypeUnderline, 0 );    ␊
 ␉clearScreenRows( row, kScreenLastRow );␊
 ␉␊
     int MenuBottom = (int)get_env(envgMenuBottom);␊
     int MenuStart = (int)get_env(envgMenuStart);␊
     int MenuEnd = (int)get_env(envgMenuEnd);␊
-␊
+␉␊
     union {␊
         struct {␊
             unsigned int␊
             MenuStart--; MenuEnd--;␊
             draw.f.selectionUp = 1;␊
         }        ␊
-␊
+␉␉␊
         if ( draw.f.selectionUp || draw.f.selectionDown )␊
         {␊
 ␉␉␉␊
 ␉␉␉CursorState cursorState;␊
-␊
+␉␉␉␊
 ␉␉␉// Set cursor at current position, and clear inverse video.␊
 ␉␉␉changeCursor( 0, MenuRow + MenuSelection - MenuTop, kCursorTypeHidden, &cursorState );␊
 ␉␉␉printMenuItem( &gMenuItems[MenuSelection], 0 );␊
         *paramPtr = gMenuItems[MenuSelection].param;        ␊
         moved = 1;␊
     }␊
-        ␊
+␉␊
     safe_set_env(envgMenuSelection,MenuSelection);␊
     safe_set_env(envgMenuTop,MenuTop );␊
     safe_set_env(envgMenuRow,MenuRow);␊
     safe_set_env(envgMenuBottom,MenuBottom);␊
     safe_set_env(envgMenuStart,MenuStart);␊
     safe_set_env(envgMenuEnd,MenuEnd);␊
-␊
+␉␊
 ␉return moved;␊
 }␊
 ␊
 {␊
     int line;␊
     unsigned long i;␊
-    MemoryRange *mp = bootInfo->memoryMap;␊
+    MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap);␊
 ␉␊
     // Activate and clear page 1␊
     setActiveDisplayPage(1);␊
 ␉␊
     printf("BIOS reported memory ranges:\n");␊
     line = 1;␊
-    for (i=0; i<bootInfo->memoryMapCount; i++) {␊
+␉␊
+␉int memoryMapCount = (int)get_env(envMemoryMapCnt);␊
+    for (i=0; i<memoryMapCount; i++) {␊
         printf("Base 0x%08x%08x, ",␊
                (unsigned long)(mp->base >> 32),␊
                (unsigned long)(mp->base));␊
 char *getMemoryInfoString(void)␊
 {␊
     unsigned long i;␊
-    MemoryRange *mp = bootInfo->memoryMap;␊
+    MemoryRange *mp = (MemoryRange*)(uint32_t)get_env(envMemoryMap);␊
 ␉char *buff = malloc(sizeof(char)*1024);␊
 ␉if(!buff) return 0;␊
 ␉␊
 ␉char info[] = "BIOS reported memory ranges:\n";␊
 ␉sprintf(buff, "%s", info);␊
-    for (i=0; i<bootInfo->memoryMapCount; i++) {␊
+␉int memoryMapCount = (int)get_env(envMemoryMapCnt);␊
+␉␊
+    for (i=0; i<memoryMapCount; i++) {␊
         sprintf( buff+strlen(buff), "Base 0x%08x%08x, ",␊
 ␉␉␉␉(unsigned long)(mp->base >> 32),␊
 ␉␉␉␉(unsigned long)(mp->base));␊
 ␉BVRef   menuBVR;␊
 ␉bool    showPrompt, newShowPrompt, isCDROM;␊
     int     optionKey;␊
-␊
+␉␊
 ␉// Initialize default menu selection entry.␊
 ␉gBootVolume = menuBVR = selectBootVolume(getBvChain());␊
 ␉␊
 ␉if (timeout < 0) {␊
 ␉␉gBootMode |= kBootModeQuiet;␊
         safe_set_env(envgBootMode,gBootMode);␊
-␊
+␉␉␊
 ␉}␊
 ␉␊
 ␉// If the user is holding down a modifier key, enter safe mode.␊
 ␉␉␊
 ␉␉gBootMode |= kBootModeSafe;␊
         safe_set_env(envgBootMode,gBootMode);␊
-␊
+␉␉␊
 ␉}␊
 ␉␊
 ␉// Checking user pressed keys␊
 ␉if (f8press) {␊
 ␉␉gBootMode &= ~kBootModeQuiet;␊
         safe_set_env(envgBootMode,gBootMode);␊
-␊
+␉␉␊
 ␉␉timeout = 0;␊
 ␉}␊
 ␉// If user typed 'v' or 'V', boot in verbose mode.␊
 ␉␉// Display banner and show hardware info.␊
         char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
         ␊
-␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);       ␊
+␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);       ␊
 ␉}␊
 ␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
 ␉msglog("Scanning device %x...", (uint32_t)get_env(envgBIOSDev));␊
         do {␊
             // Hit the option key ?␊
             if (key == optionKey) {␊
-␊
+␉␉␉␉␊
                 if (key != 0x1C0D) {␊
                     gBootMode &= ~kBootModeQuiet;␊
                     safe_set_env(envgBootMode,gBootMode);␊
         ␊
         if (key == 0x1C0D) {␊
             goto done;␊
-␊
+␉␉␉␊
         } ␊
         else if (key == 0)␊
         {␊
 ␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
 ␉}␊
     safe_set_env(envShouldboot, false);␊
-␊
+␉␊
 ␉if (menuItems) {␊
 ␉␉free(menuItems);␊
 ␉␉menuItems = NULL;␊
 ␉␉bzero(gBootArgs,sizeof(gBootArgs));␊
 ␉␉strlcpy(gBootArgs, cp_cache,sizeof(gBootArgs));␊
 ␉}␊
-␊
+␉␊
     const char *     cp  = gBootArgs;␊
     const char *     val = 0;␊
     const char *     kernel;␊
     char *           argP;␊
     char *           configKernelFlags;␊
 ␉int              ArgCntRemaining;␊
-␊
+␉␊
     skipblanks( &cp );␊
 ␉␊
     // Update the unit and partition number.␊
     if (( kernel = extractKernelName((char **)&cp) )) {        ␊
 ␉␉strlcpy( bootInfo->bootFile, kernel, sizeof(bootInfo->bootFile) );␊
         safe_set_env(envgOverrideKernel,true);␊
-␊
+␉␉␊
     } else {␊
         if ( getValueForKey( kKernelNameKey, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) {␊
             strlcpy( bootInfo->bootFile, val, sizeof(bootInfo->bootFile) );␊
 ␉␉long gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) ?␊
 ␉␉kBootModeSafe : kBootModeNormal;␊
         safe_set_env(envgBootMode,gBootMode);␊
-␊
+␉␉␊
         ␊
         if ( getValueForKey( kIgnoreCachesFlag, &val, &cnt, DEFAULT_BOOT_CONFIG ) ) {␊
             gBootMode = kBootModeSafe;␊
             safe_set_env(envgBootMode,gBootMode);␊
-␊
+␉␉␉␊
 ␉␉}␊
 ␉}␊
 ␉␊

-128
129 129
130 130
131 
131
132 132
133 133
134 134
... ...
2566 2566
2567 2567
2568 2568
2569 
2569
2570 2570
2571 2571
2572 2572
... ...
2654 2654
2655 2655
2656 2656
2657 
2657
2658 2658
2659 2659
2660 2660
... ...
2705 2705
2706 2706
2707 2707
2708 
2708
2709 2709
2710 2710
2711 2711
2712 2712
2713 2713
2714 2714
2715 
2715
2716 2716
2717 2717
2718 2718
+#define MAX(x, y) ((x) > (y) ? (x) : (y))␊
#endif␊
␊
#define VIDEO(x) (bootArgs->Video.v_ ## x)␊
#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x)␊
␊
#define vram VIDEO(baseAddr)␊
␊

␉getGraphicModeParams(screen_params);␊
␉␊
    // Set graphics mode if the booter was in text mode or the screen resolution has changed.␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE␊
␉if (getVideoMode() == VGA_TEXT_MODE␊
␉␉|| (screen_params[0] != (uint32_t)oldScreenWidth && screen_params[1] != (uint32_t)oldScreenHeight) )␊
␉{␊
#if UNUSED␊

␉␊
    flushKeyboardBuffer();␊
␉␊
␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉{␊
␉␉moveCursor( 0, row );␊
␉␉printf(msg);␊

            time += 18;␊
            timeout--;␊
␉␉␉␊
␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉␉{␊
␉␉␉␉moveCursor( col, row );␊
␉␉␉␉printf("(%d) ", timeout);␊
␉␉␉}␊
        }␊
␉␉␊
␉␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
␉␉if( getVideoMode() == GRAPHICS_MODE )␊
␉␉{␊
␉␉␉drawProgressBar( gui.screen.pixmap, 100, gui.progressbar.pos , ( multi * 100 / multi_buff ) );␊
␉␉␉gui.redraw = true;␊
 ...
 ...
 ...
 #define MAX(x, y) ((x) > (y) ? (x) : (y))␊
 #endif␊
 ␊
-#define VIDEO(x) (bootArgs->Video.v_ ## x)␊
+#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x)␊
 ␊
 #define vram VIDEO(baseAddr)␊
 ␊
 ␉getGraphicModeParams(screen_params);␊
 ␉␊
     // Set graphics mode if the booter was in text mode or the screen resolution has changed.␊
-␉if (bootArgs->Video.v_display == VGA_TEXT_MODE␊
+␉if (getVideoMode() == VGA_TEXT_MODE␊
 ␉␉|| (screen_params[0] != (uint32_t)oldScreenWidth && screen_params[1] != (uint32_t)oldScreenHeight) )␊
 ␉{␊
 #if UNUSED␊
 ␉␊
     flushKeyboardBuffer();␊
 ␉␊
-␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉{␊
 ␉␉moveCursor( 0, row );␊
 ␉␉printf(msg);␊
             time += 18;␊
             timeout--;␊
 ␉␉␉␊
-␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉␉{␊
 ␉␉␉␉moveCursor( col, row );␊
 ␉␉␉␉printf("(%d) ", timeout);␊
 ␉␉␉}␊
         }␊
 ␉␉␊
-␉␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
+␉␉if( getVideoMode() == GRAPHICS_MODE )␊
 ␉␉{␊
 ␉␉␉drawProgressBar( gui.screen.pixmap, 100, gui.progressbar.pos , ( multi * 100 / multi_buff ) );␊
 ␉␉␉gui.redraw = true;␊

-196
197 197
198 198
199 
199
200 200
201 201
202 202
... ...
307 307
308 308
309 309
310 
310
311 311
312 312
313 313
... ...
450 450
451 451
452 452
453 
453
454 454
455 455
456 456
... ...
474 474
475 475
476 476
477 
477
478 478
479 479
480 480
... ...
540 540
541 541
542 542
543 
543
544 544
545 545
546 546
... ...
585 585
586 586
587 587
588 
588
589 589
590 590
591 591
... ...
602 602
603 603
604 604
605 
605
606 606
607 607
608 608
... ...
622 622
623 623
624 624
625 
625
626 626
627 627
628 628
... ...
632 632
633 633
634 634
635 
635
636 636
637 637
638 638
... ...
646 646
647 647
648 648
649 
649
650 650
651 651
652 652
... ...
662 662
663 663
664 664
665 
665
666 666
667 667
668 668
... ...
706 706
707 707
708 708
709 
709
710 710
711 711
712 712
... ...
786 786
787 787
788 788
789 
789
790 790
791 791
792 792
... ...
794 794
795 795
796 796
797 
797
798 798
799 799
800 800
... ...
935 935
936 936
937 937
938 
938
939 939
940 940
941 941
... ...
953 953
954 954
955 955
956 
956
957
957 958
958 959
959 960
... ...
972 973
973 974
974 975
975 
976
976 977
977 978
978 979
... ...
985 986
986 987
987 988
988 
989
989 990
990 991
991 992
... ...
1029 1030
1030 1031
1031 1032
1032 
1033
1033 1034
1034 1035
1035 1036
... ...
1040 1041
1041 1042
1042 1043
1043 
1044
1044 1045
1045 1046
1046 1047
... ...
1115 1116
1116 1117
1117 1118
1118 
1119
1119 1120
1120 1121
1121 1122
... ...
1128 1129
1129 1130
1130 1131
1131 
1132
1132 1133
1133 1134
1134 1135
... ...
1169 1170
1170 1171
1171 1172
1172 
1173
1173 1174
1174 1175
1175 1176
... ...
1192 1193
1193 1194
1194 1195
1195 
1196
1196 1197
1197 1198
1198 1199
... ...
1213 1214
1214 1215
1215 1216
1216 
1217
1217 1218
1218 1219
1219 1220
... ...
1248 1249
1249 1250
1250 1251
1251 
1252
1252 1253
1253 1254
1254 1255
... ...
1281 1282
1282 1283
1283 1284
1284 
1285
1285 1286
1286 1287
1287 1288
... ...
1298 1299
1299 1300
1300 1301
1301 
1302
1302 1303
1303 1304
1304 1305
... ...
1307 1308
1308 1309
1309 1310
1310 
1311
1311 1312
1312 1313
1313 1314
+void GUI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4, void* arg5, void* arg6)␊
{␉␉␊
␉// Turn off any GUI elements␊
␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
␉if( getVideoMode() == GRAPHICS_MODE )␊
␉{␊
␉␉gui.devicelist.draw = false;␊
␉␉gui.bootprompt.draw = false;␊

    if ( gMenuItems == NULL )␊
␉␉return 0;␊
␉␊
␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
␉if( getVideoMode() == GRAPHICS_MODE )␊
␉{␊
␉␉int res;␊
␉␉␊

␉␉␉␊
␉␉␉// Set cursor at current position, and clear inverse video.␊
␉␉␉␊
␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉␉{␊
␉␉␉␉changeCursor( 0, (MenuRow + MenuSelection - MenuTop), kCursorTypeHidden, &cursorState );␊
␉␉␉␉printMenuItem( &gMenuItems[MenuSelection], 0 );␊

␉␉␉␉}␊
␉␉␉}␊
␉␉␉␊
␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉␉{␊
␉␉␉␉moveCursor( 0, MenuRow + MenuSelection - MenuTop );␊
␉␉␉␉printMenuItem( &gMenuItems[MenuSelection], 1 );␊

␉␊
␉// Draw the visible items.␊
␉␊
␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
␉if( getVideoMode() == GRAPHICS_MODE )␊
␉{␊
␉␉drawDeviceList(MenuStart, MenuEnd, MenuSelection, menuItems);␊
␉}␊

                }␊
                if (x)␊
␉␉␉␉␉x--;␊
␉␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉␉␉{␊
␉␉␉␉␉setCursorPosition( x, y, 0 );␊
␉␉␉␉␉putca(' ', 0x07, 1);␊

        default:␊
            if ( key >= ' ' && gBootArgsPtr < gBootArgsEnd)␊
            {␊
␉␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉␉␉{␊
␉␉␉␉␉putchar(key);  // echo to screen␊
␉␉␉␉}␊

{␊
␉char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt);␊
␉␊
␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉{␊
␉␉changeCursor( 0, row, kCursorTypeUnderline, 0 );    ␊
␉␉clearScreenRows( row, kScreenLastRow );␊

␉␊
␉if (visible)␊
␉{␊
␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE) ␊
␉␉if (getVideoMode() == VGA_TEXT_MODE) ␊
␉␉{␊
␉␉␉if (get_env(envgEnableCDROMRescan))␊
␉␉␉{␊

␉} ␊
␉else␊
␉{␊
␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉␉if (getVideoMode() == GRAPHICS_MODE)␊
␉␉{␊
␉␉␉clearGraphicBootPrompt();␊
␉␉} ␊

␉gBootArgsPtr = gBootArgs;␊
␉memset(gBootArgs, '\0', BOOT_STRING_LEN);␊
␉␊
␉if (bootArgs->Video.v_display == GRAPHICS_MODE) ␊
␉if (getVideoMode() == GRAPHICS_MODE) ␊
␉{␊
␉␉clearGraphicBootPrompt();␊
␉}␊

␉}␊
␉    ␊
␉// ensure we're in graphics mode if gui is setup␊
␉if (gui.initialised && bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉if (gui.initialised && (getVideoMode() == VGA_TEXT_MODE))␊
␉{␊
#if UNUSED␊
␉␉setVideoMode(GRAPHICS_MODE, 0);␊

␉␉GUI_addBootArg(kSingleUserModeFlag);␊
␉}␊
␉␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉{␊
␉␉setCursorPosition(0, 0, 0);␊
␉␉clearScreenRows(0, kScreenLastRow);␊

␉␉{␊
            char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
␉␉␉// Display banner and show hardware info.␊
␉␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
␉␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
␉␉␉printf(getVBEInfoString());␊
␉␉}␊
␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊

␉␉}␊
␉}␊
␉␊
␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉if (getVideoMode() == GRAPHICS_MODE)␊
␉{␊
␉␉// redraw the background buffer␊
␉␉gui.logo.draw = true;␊

                char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
                ␊
␉␉␉␉// Display banner and show hardware info.␊
␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
␊
␉␉␉}␊
␉␉␉␊
␉␉␉// redraw background␊

␉␊
␉if (devcnt)␊
␉{␊
␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
␉␉{␊
␉␉␉printf("Use \30\31 keys to select the startup volume.");␊
␉␉}␊

␉GUI_showBootPrompt( nextRow, showPrompt );␊
␉␊
␉do {␊
␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉␉if (getVideoMode() == GRAPHICS_MODE)␊
␉␉{␊
␉␉␉// redraw background␊
␉␉␉memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );␊

␉␉␉␉␉ */␊
␉␉␉␉␉if (strcmp( booterCommand, "video" ) == 0)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE)␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉showInfoBox(getVBEInfoString(), getVBEModeInfoString());␊
␉␉␉␉␉␉}␊

␉␉␉␉␉}␊
␉␉␉␉␉else if ( strcmp( booterCommand, "memory" ) == 0)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE ) ␊
␉␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE ) ␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉showInfoBox("Memory Map", getMemoryInfoString());␊
␉␉␉␉␉␉}␊

␉␉␉␉// Only Permitted if started in graphics interface␊
␉␉␉␉if (useGUI)␊
␉␉␉␉{␊
␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE)␊
␉␉␉␉␉{␊
#if UNUSED␊
␉␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊

␉␉␉␉␉␉char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
                        ␊
␉␉␉␉␉␉// Display banner and show hardware info.␊
␉␉␉␉␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
␉␉␉␉␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
␉␉␉␉␉␉printf(getVBEInfoString());␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉clearScreenRows(kMenuTopRow, kMenuTopRow + 2);␊

␉} while (0 == key);␊
␉␊
done:␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉{␊
␉␉clearScreenRows(kMenuTopRow, kScreenLastRow);␊
␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊

    gErrors = true;␊
    va_start(ap, fmt);␊
␉␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉{␊
␉␉prf(fmt, ap, putchar, 0);␊
    }␊

␉␊
    if (gVerboseMode && (KernelStart == false))␊
    {␊
␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉␉{␊
␉␉␉prf(fmt, ap, putchar, 0);␊
␉␉}␊

␉␊
␉if (KernelStart == false) {␊
␉␉␊
␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉␉{␊
␉␉␉prf(fmt, ap, putchar, 0);␊
␉␉}␊

␉printf("\n");␊
␉va_start(ap, fmt);␊
␉␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉if (getVideoMode() == VGA_TEXT_MODE)␊
␉{␊
␉␉prf(fmt, ap, putchar, 0);␊
␉} ␊

␊
void GUI_showHelp(void)␊
{␊
␉if (bootArgs->Video.v_display == GRAPHICS_MODE) {␊
␉if (getVideoMode() == GRAPHICS_MODE) {␊
␉␉showInfoBox("Help. Press q to quit.\n", (char *)BootHelp_txt);␊
␉} else {␊
␉␉showTextBuffer((char *)BootHelp_txt, BootHelp_txt_len);␊

␊
void GUI_showMessage(char *message)␊
{␊
␉if (bootArgs->Video.v_display == GRAPHICS_MODE) {␊
␉if (getVideoMode() == GRAPHICS_MODE) {␊
␉␉showInfoBox("Help. Press q to quit.\n", message);␊
␉} else {␊
␉␉showTextBuffer(message, strlen(message));␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 void GUI_PreBoot_hook(void* arg1, void* arg2, void* arg3, void* arg4, void* arg5, void* arg6)␊
 {␉␉␊
 ␉// Turn off any GUI elements␊
-␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
+␉if( getVideoMode() == GRAPHICS_MODE )␊
 ␉{␊
 ␉␉gui.devicelist.draw = false;␊
 ␉␉gui.bootprompt.draw = false;␊
     if ( gMenuItems == NULL )␊
 ␉␉return 0;␊
 ␉␊
-␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
+␉if( getVideoMode() == GRAPHICS_MODE )␊
 ␉{␊
 ␉␉int res;␊
 ␉␉␊
 ␉␉␉␊
 ␉␉␉// Set cursor at current position, and clear inverse video.␊
 ␉␉␉␊
-␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉␉{␊
 ␉␉␉␉changeCursor( 0, (MenuRow + MenuSelection - MenuTop), kCursorTypeHidden, &cursorState );␊
 ␉␉␉␉printMenuItem( &gMenuItems[MenuSelection], 0 );␊
 ␉␉␉␉}␊
 ␉␉␉}␊
 ␉␉␉␊
-␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉␉{␊
 ␉␉␉␉moveCursor( 0, MenuRow + MenuSelection - MenuTop );␊
 ␉␉␉␉printMenuItem( &gMenuItems[MenuSelection], 1 );␊
 ␉␊
 ␉// Draw the visible items.␊
 ␉␊
-␉if( bootArgs->Video.v_display == GRAPHICS_MODE )␊
+␉if( getVideoMode() == GRAPHICS_MODE )␊
 ␉{␊
 ␉␉drawDeviceList(MenuStart, MenuEnd, MenuSelection, menuItems);␊
 ␉}␊
                 }␊
                 if (x)␊
 ␉␉␉␉␉x--;␊
-␉␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉␉␉{␊
 ␉␉␉␉␉setCursorPosition( x, y, 0 );␊
 ␉␉␉␉␉putca(' ', 0x07, 1);␊
         default:␊
             if ( key >= ' ' && gBootArgsPtr < gBootArgsEnd)␊
             {␊
-␉␉␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉␉␉{␊
 ␉␉␉␉␉putchar(key);  // echo to screen␊
 ␉␉␉␉}␊
 {␊
 ␉char * bootPrompt = (char*)(uint32_t)get_env(envBootPrompt);␊
 ␉␊
-␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉{␊
 ␉␉changeCursor( 0, row, kCursorTypeUnderline, 0 );    ␊
 ␉␉clearScreenRows( row, kScreenLastRow );␊
 ␉␊
 ␉if (visible)␊
 ␉{␊
-␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE) ␊
+␉␉if (getVideoMode() == VGA_TEXT_MODE) ␊
 ␉␉{␊
 ␉␉␉if (get_env(envgEnableCDROMRescan))␊
 ␉␉␉{␊
 ␉} ␊
 ␉else␊
 ␉{␊
-␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉␉{␊
 ␉␉␉clearGraphicBootPrompt();␊
 ␉␉} ␊
 ␉gBootArgsPtr = gBootArgs;␊
 ␉memset(gBootArgs, '\0', BOOT_STRING_LEN);␊
 ␉␊
-␉if (bootArgs->Video.v_display == GRAPHICS_MODE) ␊
+␉if (getVideoMode() == GRAPHICS_MODE) ␊
 ␉{␊
 ␉␉clearGraphicBootPrompt();␊
 ␉}␊
 ␉}␊
 ␉    ␊
 ␉// ensure we're in graphics mode if gui is setup␊
-␉if (gui.initialised && bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉if (gui.initialised && (getVideoMode() == VGA_TEXT_MODE))␊
 ␉{␊
 #if UNUSED␊
 ␉␉setVideoMode(GRAPHICS_MODE, 0);␊
 ␉␉GUI_addBootArg(kSingleUserModeFlag);␊
 ␉}␊
 ␉␊
-␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉{␊
 ␉␉setCursorPosition(0, 0, 0);␊
 ␉␉clearScreenRows(0, kScreenLastRow);␊
 ␉␉{␊
             char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
 ␉␉␉// Display banner and show hardware info.␊
-␉␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
+␉␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
 ␉␉␉printf(getVBEInfoString());␊
 ␉␉}␊
 ␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
 ␉␉}␊
 ␉}␊
 ␉␊
-␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉{␊
 ␉␉// redraw the background buffer␊
 ␉␉gui.logo.draw = true;␊
                 char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
                 ␊
 ␉␉␉␉// Display banner and show hardware info.␊
-␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
+␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
+␊
 ␉␉␉}␊
 ␉␉␉␊
 ␉␉␉// redraw background␊
 ␉␊
 ␉if (devcnt)␊
 ␉{␊
-␉␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
+␉␉if( getVideoMode() == VGA_TEXT_MODE )␊
 ␉␉{␊
 ␉␉␉printf("Use \30\31 keys to select the startup volume.");␊
 ␉␉}␊
 ␉GUI_showBootPrompt( nextRow, showPrompt );␊
 ␉␊
 ␉do {␊
-␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉␉{␊
 ␉␉␉// redraw background␊
 ␉␉␉memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );␊
 ␉␉␉␉␉ */␊
 ␉␉␉␉␉if (strcmp( booterCommand, "video" ) == 0)␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉␉␉␉␉␉{␊
 ␉␉␉␉␉␉␉showInfoBox(getVBEInfoString(), getVBEModeInfoString());␊
 ␉␉␉␉␉␉}␊
 ␉␉␉␉␉}␊
 ␉␉␉␉␉else if ( strcmp( booterCommand, "memory" ) == 0)␊
 ␉␉␉␉␉{␊
-␉␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE ) ␊
+␉␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE ) ␊
 ␉␉␉␉␉␉{␊
 ␉␉␉␉␉␉␉showInfoBox("Memory Map", getMemoryInfoString());␊
 ␉␉␉␉␉␉}␊
 ␉␉␉␉// Only Permitted if started in graphics interface␊
 ␉␉␉␉if (useGUI)␊
 ␉␉␉␉{␊
-␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉␉␉␉␉if (getVideoMode() == GRAPHICS_MODE)␊
 ␉␉␉␉␉{␊
 #if UNUSED␊
 ␉␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
 ␉␉␉␉␉␉char * bootBanner = (char*)(uint32_t)get_env(envBootBanner);␊
                         ␊
 ␉␉␉␉␉␉// Display banner and show hardware info.␊
-␉␉␉␉␉␉printf(bootBanner, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
+␉␉␉␉␉␉printf(bootBanner, (int)(get_env(envConvMem) + get_env(envExtMem)) / 1024);␊
 ␉␉␉␉␉␉printf(getVBEInfoString());␊
 ␉␉␉␉␉␉␊
 ␉␉␉␉␉␉clearScreenRows(kMenuTopRow, kMenuTopRow + 2);␊
 ␉} while (0 == key);␊
 ␉␊
 done:␊
-␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉{␊
 ␉␉clearScreenRows(kMenuTopRow, kScreenLastRow);␊
 ␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
     gErrors = true;␊
     va_start(ap, fmt);␊
 ␉␊
-␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉{␊
 ␉␉prf(fmt, ap, putchar, 0);␊
     }␊
 ␉␊
     if (gVerboseMode && (KernelStart == false))␊
     {␊
-␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉␉{␊
 ␉␉␉prf(fmt, ap, putchar, 0);␊
 ␉␉}␊
 ␉␊
 ␉if (KernelStart == false) {␊
 ␉␉␊
-␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉␉{␊
 ␉␉␉prf(fmt, ap, putchar, 0);␊
 ␉␉}␊
 ␉printf("\n");␊
 ␉va_start(ap, fmt);␊
 ␉␊
-␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉if (getVideoMode() == VGA_TEXT_MODE)␊
 ␉{␊
 ␉␉prf(fmt, ap, putchar, 0);␊
 ␉} ␊
 ␊
 void GUI_showHelp(void)␊
 {␊
-␉if (bootArgs->Video.v_display == GRAPHICS_MODE) {␊
+␉if (getVideoMode() == GRAPHICS_MODE) {␊
 ␉␉showInfoBox("Help. Press q to quit.\n", (char *)BootHelp_txt);␊
 ␉} else {␊
 ␉␉showTextBuffer((char *)BootHelp_txt, BootHelp_txt_len);␊
 ␊
 void GUI_showMessage(char *message)␊
 {␊
-␉if (bootArgs->Video.v_display == GRAPHICS_MODE) {␊
+␉if (getVideoMode() == GRAPHICS_MODE) {␊
 ␉␉showInfoBox("Help. Press q to quit.\n", message);␊
 ␉} else {␊
 ␉␉showTextBuffer(message, strlen(message));␊

-17
18 18
19 19
20 
20
21 21
22 22
23 23
+((size_t) ( (char *)&((st *)(0))->m - (char *)0 ))␊
#endif␊
␊
#define VIDEO(x) (getBootArgsVideoPtrAtOffset(offsetof(Boot_Video,v_##x)))␊
#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x)␊
␊
␊
#define MIN(x, y) ((x) < (y) ? (x) : (y))␊
 ((size_t) ( (char *)&((st *)(0))->m - (char *)0 ))␊
 #endif␊
 ␊
-#define VIDEO(x) (getBootArgsVideoPtrAtOffset(offsetof(Boot_Video,v_##x)))␊
+#define VIDEO(x) (((boot_args_common*)getBootArgs())->Video.v_ ## x)␊
 ␊
 ␊
 #define MIN(x, y) ((x) < (y) ? (x) : (y))␊

-47
48 48
49 49
50 
50
51 51
52 52
53 53
+#define kCoreTurbo␉␉␉"EnableTurbo"␉␉/* acpi_codec.c */␊
␊
#define kUpdateACPI␉␉␉"UpdateACPI"␉    /* acpi_codec.c */␊
#define kUnsafeACPI␉␉␉"UnsafeACPI"␉␉/* acpi_codec.c */ //desactive some safe checks that may stop the boot process on some configurations( temporary option )  ␊
//#define kUnsafeACPI␉␉␉"UnsafeACPI"␉␉/* acpi_codec.c */ // DEPRECATED, replaced by nacpi=0x2000  ␊
␊
#define kOnlySignedAml␉␉"LoadSignedAmlOnly"␉    /* acpi_codec.c */␊
␊
 #define kCoreTurbo␉␉␉"EnableTurbo"␉␉/* acpi_codec.c */␊
 ␊
 #define kUpdateACPI␉␉␉"UpdateACPI"␉    /* acpi_codec.c */␊
-#define kUnsafeACPI␉␉␉"UnsafeACPI"␉␉/* acpi_codec.c */ //desactive some safe checks that may stop the boot process on some configurations( temporary option )  ␊
+//#define kUnsafeACPI␉␉␉"UnsafeACPI"␉␉/* acpi_codec.c */ // DEPRECATED, replaced by nacpi=0x2000  ␊
 ␊
 #define kOnlySignedAml␉␉"LoadSignedAmlOnly"␉    /* acpi_codec.c */␊
 ␊

-367
368 368
369 369
370 
371 
370
371
372 372
373 
373
374
374 375
375 376
376 377
... ...
473 474
474 475
475 476
476 
477 
478 
479 
477
478
479
480
481
480 482
481 483
482 484
... ...
1424 1426
1425 1427
1426 1428
1427 
1429
1428 1430
1429 1431
1430 1432
... ...
4296 4298
4297 4299
4298 4300
4299 
4300 
4301
4302
4301 4303
4302 
4304
4305
4303 4306
4304 4307
4305 4308
... ...
4314 4317
4315 4318
4316 4319
4317 
4320
4318 4321
4319 4322
4320 4323
... ...
4463 4466
4464 4467
4465 4468
4466 
4469
4467 4470
4468 
4469 
4471
4472
4470 4473
4471 
4474
4475
4472 4476
4473 4477
4474 4478
... ...
4618 4622
4619 4623
4620 4624
4621 
4625
4622 4626
4623 4627
4624 4628
+␉␉␉print_nameseg(*(U32 *) ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Signature);␊
␉␉␉printf("\n");␉␉␉␊
#endif␉␉␉␉␉␊
␉␉␉bool unsafe = false;␊
␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
␉␉␉int method = 0;␊
␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
␉␉␉␊
␉␉␉if (!unsafe)␊
␉␉␉␊
␉␉␉if (method != 0x2000)␊
␉␉␉{␊
␉␉␉␉if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ␊
␉␉␉␉␉␉␉␉((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0)␊

            print_nameseg(*(U32*) (table_array[index]->Signature));␊
            printf("\n");␉␉␉␊
#endif␉␉␉␊
            bool unsafe = false;␊
            getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
            ␊
            if (!unsafe) ␊
            int method = 0;␊
␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
␉␉␉␊
␉␉␉␊
␉␉␉if (method != 0x2000)␊
            {␊
                if (GetChecksum(table_array[index], table_array[index]->Length) != 0)␊
                {␊

␉␉␉␉␉␉maximum.Control = rdmsr64(MSR_IA32_PERF_STATUS) & 0xff; // Seems it always contains maximum multiplier value (with turbo, that's we need)...␊
␉␉␉␉␉␉minimum.Control = (rdmsr64(MSR_PLATFORM_INFO) >> 40) & 0xff;␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉verbose("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control);␊
␉␉␉␉␉␉DBG("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉// Sanity check␊
␉␉␉␉␉␉if (maximum.Control < minimum.Control) ␊

␉␉␉␉␉continue;␉␊
␉␉␉␉}␊
␉␉␉␉␊
␉␉␉␉bool unsafe = false;␊
␉␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
␉␉␉␉int method = 0;␊
␉␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
␉␉␉␉␊
␉␉␉␉if (!unsafe) ␊
␉␉␉␉␊
␉␉␉␉if (method != 0x2000)␊
␉␉␉␉{␊
␉␉␉␉␉if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ␊
␉␉␉␉␉␉␉␉␉((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0)␊

␉␉␉}␊
␉␉␉␊
␉␉␉xsdt_mod->TableOffsetEntry[index-dropoffset]=ptr;␊
␉␉␉␉␉␉␉␉␊
␉␉␉␊
            char * tableSig = newStringWithLength((char*)((U32)ptr), 4);␊
            ␊
␉␉␉DBG("** Processing %s,", tableSig );␊

␉for (index = 0; index < num_tables; index++)␊
␉{␊
        ␊
␉␉{␉␉␊
␉␉{␉␉␉␊
␉␉␉␊
␉␉␉bool unsafe = false;␊
␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
␉␉␉int method = 0;␊
␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
␉␉␉␊
␉␉␉if (!unsafe)␊
␉␉␉␊
␉␉␉if (method != 0x2000)␊
␉␉␉{␊
␉␉␉␉if (GetChecksum(table_array[index], table_array[index]->Length) != 0)␊
␉␉␉␉{␊

␉bool gen_ssdt=false; // will force to generate ssdt even if gen_csta and gen_psta = false␊
    bool gen_tsta=false;␊
␉bool oem_dsdt=false, oem_fadt=false;␊
␉    ␉␉␊
␉␊
␉// Find original rsdp        ␊
␉if (!FindAcpiTables(&acpi_tables))␊
␉{␊
 ...
 ...
 ...
 ...
 ...
 ...
 ␉␉␉print_nameseg(*(U32 *) ((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Signature);␊
 ␉␉␉printf("\n");␉␉␉␊
 #endif␉␉␉␉␉␊
-␉␉␉bool unsafe = false;␊
-␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
+␉␉␉int method = 0;␊
+␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
 ␉␉␉␊
-␉␉␉if (!unsafe)␊
+␉␉␉␊
+␉␉␉if (method != 0x2000)␊
 ␉␉␉{␊
 ␉␉␉␉if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ␊
 ␉␉␉␉␉␉␉␉((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0)␊
             print_nameseg(*(U32*) (table_array[index]->Signature));␊
             printf("\n");␉␉␉␊
 #endif␉␉␉␊
-            bool unsafe = false;␊
-            getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
-            ␊
-            if (!unsafe) ␊
+            int method = 0;␊
+␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
+␉␉␉␊
+␉␉␉␊
+␉␉␉if (method != 0x2000)␊
             {␊
                 if (GetChecksum(table_array[index], table_array[index]->Length) != 0)␊
                 {␊
 ␉␉␉␉␉␉maximum.Control = rdmsr64(MSR_IA32_PERF_STATUS) & 0xff; // Seems it always contains maximum multiplier value (with turbo, that's we need)...␊
 ␉␉␉␉␉␉minimum.Control = (rdmsr64(MSR_PLATFORM_INFO) >> 40) & 0xff;␊
 ␉␉␉␉␉␉␊
-␉␉␉␉␉␉verbose("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control);␊
+␉␉␉␉␉␉DBG("P-States: min 0x%x, max 0x%x\n", minimum.Control, maximum.Control);␊
 ␉␉␉␉␉␉␊
 ␉␉␉␉␉␉// Sanity check␊
 ␉␉␉␉␉␉if (maximum.Control < minimum.Control) ␊
 ␉␉␉␉␉continue;␉␊
 ␉␉␉␉}␊
 ␉␉␉␉␊
-␉␉␉␉bool unsafe = false;␊
-␉␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
+␉␉␉␉int method = 0;␊
+␉␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
 ␉␉␉␉␊
-␉␉␉␉if (!unsafe) ␊
+␉␉␉␉␊
+␉␉␉␉if (method != 0x2000)␊
 ␉␉␉␉{␊
 ␉␉␉␉␉if (GetChecksum(((ACPI_TABLE_HEADER *) (unsigned long)ptr), ␊
 ␉␉␉␉␉␉␉␉␉((ACPI_TABLE_HEADER *) (unsigned long)ptr)->Length) != 0)␊
 ␉␉␉}␊
 ␉␉␉␊
 ␉␉␉xsdt_mod->TableOffsetEntry[index-dropoffset]=ptr;␊
-␉␉␉␉␉␉␉␉␊
+␉␉␉␊
             char * tableSig = newStringWithLength((char*)((U32)ptr), 4);␊
             ␊
 ␉␉␉DBG("** Processing %s,", tableSig );␊
 ␉for (index = 0; index < num_tables; index++)␊
 ␉{␊
         ␊
-␉␉{␉␉␊
+␉␉{␉␉␉␊
 ␉␉␉␊
-␉␉␉bool unsafe = false;␊
-␉␉␉getBoolForKey(kUnsafeACPI, &unsafe, DEFAULT_BOOT_CONFIG);␊
+␉␉␉int method = 0;␊
+␉␉␉getIntForKey(kAcpiMethod, &method, DEFAULT_BOOT_CONFIG);␊
 ␉␉␉␊
-␉␉␉if (!unsafe)␊
+␉␉␉␊
+␉␉␉if (method != 0x2000)␊
 ␉␉␉{␊
 ␉␉␉␉if (GetChecksum(table_array[index], table_array[index]->Length) != 0)␊
 ␉␉␉␉{␊
 ␉bool gen_ssdt=false; // will force to generate ssdt even if gen_csta and gen_psta = false␊
     bool gen_tsta=false;␊
 ␉bool oem_dsdt=false, oem_fadt=false;␊
-␉    ␉␉␊
+␉␊
 ␉// Find original rsdp        ␊
 ␉if (!FindAcpiTables(&acpi_tables))␊
 ␉{␊

-138
139 139
140 140
141 
141
142 142
143 143
144 144
... ...
151 151
152 152
153 153
154 
155 
156 
154
157 155
158 156
159 157
160 
161 158
162 
163 
164 
165 
166 
159
160
167 161
168 162
169 163
... ...
173 167
174 168
175 169
176 
177 170
178 171
179 172
180 
181 
173
174
182 175
183 176
184 
185 
186 
187 
188 
189 
190 
191 
192 
193 
194 
195 
177
178
179
180
181
182
183
184
185
186
187
196 188
197 
189
190
191
192
193
194
198 195
196
197
198
199
200
199 201
200 202
201 203
202 204
203 
205
204 206
205 207
206 208
207 209
208 210
209 
211
210 212
211 213
212 214
... ...
215 217
216 218
217 219
218 
220
219 221
220 222
221 223
... ...
231 233
232 234
233 235
234 
236
235 237
236 
238
239
240
241
242
243
237 244
238 
239 
240 
241 
242 
243 
244 
245 
246 
247 
248 
249 
250 
251 
252 
253 
254 
255 
256 
257 
258 245
259 246
260 247
261 248
262 
263 
264 
265 
266 
267 
268 
269 
270 
271 
272 
273 
274 
275 
276 
249
250
251
252
253
254
255
256
257
277 258
278 259
279 
280 
281 260
282 261
283 262
284 263
285 264
286 
287 
265
266
288 267
289 
268
290 269
291 270
292 271
... ...
302 281
303 282
304 283
305 
284
306 285
307 
308 
309 
310 
311 
312 
313 
314 
315 
316 
317 
318 
319 
320 
321 
322 
323 
324 
325 
326 
327 
328 
329 
286
287
288
289
290
291
292
293
330 294
331 295
332 296
333 297
334 
335 
336 
337 
338 
339 
340 
341 
342 
343 
344 
345 
346 
347 
348 
349 
298
299
300
301
302
303
304
350 305
351 
352 
353 306
354 
307
355 308
356 309
357 
358 
310
311
359 312
360 
313
314
315
316
317
318
319
320
321
322
323
324
325
361 326
362 327
363 328
+␊
int main (int argc, const char * argv[]) {␊
    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];␊
␊
    ␊
    mach_port_t                  masterPort;␊
␉␊
␉io_registry_entry_t         entry,entry2;␊

␉␊
␉const UInt8*                  rawdata = NULL;␊
␉␊
␉UInt32 uuid32 = 0;␊
␉UInt32 Model32 = 0;␊
␉const char *cfilename ;␊
␉unsigned long uuid32 = 0,Model32 = 0 ;␊
␉NSString *filename, *fullfilename ;␊
␉NSArray *namechunks;␊
␉NSMutableArray *chunks;␉␊
␉char * input, *output, dirspec[512];␊
␉NSString *outStr, *inStr;␊
␊
␉if (argc > 3 || argc < 2) {␊
␉␉printf("Usage: amlsgn input(as a file) output(as a directory)\n");␊
␉␉return 1;␊
    } else if (argc == 2) {␉␊
    ␊
␉if (argc == 2) {␉␊
␉␉␊
␉␉/* Creating output string */␊
␉␉inStr = [NSString stringWithUTF8String:argv[1]];␊

␉␉fullfilename = [chunks lastObject];␊
␉␉namechunks = [fullfilename componentsSeparatedByString: @"."];␊
␉␉filename = [namechunks objectAtIndex:0];␊
␉␉cfilename = [filename UTF8String];␊
␉␉␊
␉␉[chunks removeLastObject];␊
␉␉outStr = [chunks componentsJoinedByString: @"/"];␊
␊
␉} else {␊
        ␊
␉} else if (argc == 3 ){␊
␉␉inStr = [NSString stringWithUTF8String:argv[1]];␊
␉␉BOOL isDirectory= FALSE;␊
␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory]) {␊
␉␉␉␊
␉␉␉if (isDirectory == FALSE) {␊
␉␉␉␉chunks = [[NSMutableArray alloc] init];␊
␉␉␉␉[chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]];␊
␉␉␉␉␊
␉␉␉␉[chunks removeLastObject];␊
␉␉␉␉outStr = [chunks componentsJoinedByString: @"/"];␊
␉␉␉} else {␊
␉␉␉␉outStr = [NSString stringWithUTF8String:argv[2]];␊
␊
␉␉␉}␉␉␉␊
        ␊
        chunks = [[NSMutableArray alloc] init];␊
        [chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]];␊
        fullfilename = [chunks lastObject];␊
        namechunks = [fullfilename componentsSeparatedByString: @"."];␊
        filename = [namechunks objectAtIndex:0];␊
        ␊
␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithUTF8String:argv[2]] isDirectory:&isDirectory] && isDirectory) {            ␊
            ␊
            outStr = [NSString stringWithUTF8String:argv[2]];␉␊
            ␊
␉␉} ␊
␊
        else ␊
        {            ␊
            [chunks removeLastObject];␊
            outStr = [chunks componentsJoinedByString: @"/"];            ␊
        }␊
        ␊
␉}␊
    else␊
    {␊
␉␉printf("Usage: amlsgn input(as a file) output(as a directory)\n");␊
␉␉goto out;␊
    } ␊
␉␊
␉do {␊
␉␉BOOL isDirectory= FALSE;␊
␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory] && isDirectory) {␊
␉␉␊
            ␊
␉␉␉if ([[NSFileManager defaultManager] isWritableFileAtPath:outStr])␊
␉␉␉␉break;␊
␉␉}␊
␉␉␊
␉␉outStr = [NSHomeDirectory() stringByAppendingPathComponent:  @"Desktop"];␊
␊
        ␊
␉} while (0);␊
␉␊
␉␊

␉if (err == KERN_SUCCESS){␉␉␊
␉␉␊
␉␉entry2=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi" UTF8String]);␊
␊
        ␊
␉␉if (entry2!=MACH_PORT_NULL) {␉␉␉␊
␉␉␉␊
␉␉␉data = IORegistryEntrySearchCFProperty( entry2, kIOServicePlane, CFSTR("motherboard-name"), allocator, kIORegistryIterateRecursively);␊

␉␉␉␉{␊
␉␉␉␉␉Model32 = OSSwapHostToBigInt32(adler32( (unsigned char *) ModelStr, len ));␊
␉␉␉␉␉␊
␉␉␉␉␉printf("uuid32 0x%lu uuidStr %s\n",(unsigned long)Model32,ModelStr);␊
␉␉␉␉␉printf("Model32 0x%lx ModelStr %s\n",Model32,ModelStr);␊
␉␉␉␉␉␊
␉␉␉␉␉UInt8 mem[1024*1024];␊
                    NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr  ];␊
␉␉␉␉␉if (!mem) {␊
                        NSLog(@"Error while opening the file : %@ \n",inStr);␊
                        goto out;␊
                    }␊
␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes];␊
␉␉␉␉␉␊
␉␉␉␉␉bzero(mem, sizeof(mem));␉␉␉␉␉␊
␉␉␉␉␉␊
␉␉␉␉␉int fdIn = open([inStr UTF8String], O_RDONLY, 0666);␊
␉␉␉␉␉␊
␉␉␉␉␉if (-1 == fdIn) {␊
␉␉␉␉␉␉printf("Error while opening the file \n");␊
␉␉␉␉␉␉return 1;␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉size_t nbRead = read(fdIn, (void*)mem, sizeof(mem));␊
␉␉␉␉␉if (nbRead <= 0) {␊
␉␉␉␉␉␉printf("Error: Unable to read the file\n");␉␉␊
␉␉␉␉␉␉close(fdIn);␊
␉␉␉␉␉␉return 1;        ␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem;␊
␉␉␉␉␉␊
␉␉␉␉␉close(fdIn);␊
␉␉␉␉␉␊
␉␉␉␉␉head->OemRevision = Model32;␊
␉␉␉␉␉␊
␉␉␉␉␉SetChecksum(head);␊
␉␉␉␉␉␊
␉␉␉␉␉{␉␉␊
␉␉␉␉␉␉char dir[1024];␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉sprintf(dir,"%s/%s.%s.aml",[outStr UTF8String],cfilename,ModelStr);␊
␊
␉␉␉␉␉␉int fdOut = open(dir, O_WRONLY | O_CREAT, 0666);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉if (-1 == fdOut) {␊
␉␉␉␉␉␉␉printf("Error: Can't save the file\n");␊
␉␉␉␉␉␉␉return 1;␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉write(fdOut, mem, head->Length);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉close(fdOut);␊
␉␉␉␉␉}␊
                    if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml",␊
                                            outStr, filename, [NSString stringWithUTF8String:ModelStr]] atomically: YES] == NO) {␊
                        ␊
                        NSLog(@"Error: Can't save the file to %@\n",[NSString stringWithFormat:@"%@/%@.%@.aml",␊
                                                                     outStr, filename, [NSString stringWithUTF8String:ModelStr]]);                        ␊
                        ␊
                    }␊
                    ␊
                    [mem release];␉␉␉␉␉␊
␉␉␉␉}␉␉␉␉␊
␉␉␉␉␊
␉␉␉␉IOObjectRelease(entry2);␊
␉␉␉␉␊
␉␉␉␉goto out;␊
␉␉␉}␉␉␉␊
␉␉␉␊
␉␉} ␉␉␊
␉␉␊
␉␉printf("No Model entry \n");␊
␉␉␉␊
␉␉NSLog(@"No Model entry \n");␊
        ␊
␉␉entry=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi/platform" UTF8String]);␊
␊
        ␊
␉␉if (entry!=MACH_PORT_NULL){␉␉␊
␉␉␉␊
␉␉␉␊

␉␉␉␉{␊
␉␉␉␉␉uuid32 = OSSwapHostToBigInt32(adler32( (unsigned char *) uuidStr, UUID_STR_LEN ));␊
␉␉␉␉␉␊
␉␉␉␉␉printf("uuid32  : 0x%lu\n",(unsigned long)uuid32);␊
␉␉␉␉␉printf("uuid32  : 0x%lx\n",uuid32);␊
␉␉␉␉␉printf("uuidStr : %s\n",uuidStr);␊
␊
␉␉␉␉␉UInt8 mem[1024*1024];␊
␉␉␉␉␉␊
␉␉␉␉␉bzero(mem, sizeof(mem));␊
␉␉␉␉␉␊
␉␉␉␉␉int fdIn = open([inStr UTF8String], O_RDONLY, 0666);␊
␉␉␉␉␉␊
␉␉␉␉␉if (-1 == fdIn) {␊
␉␉␉␉␉␉printf("Error while opening the file \n");␊
␉␉␉␉␉␉return 1;␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉size_t nbRead = read(fdIn, (void*)mem, sizeof(mem));␊
␉␉␉␉␉if (nbRead <= 0) {␊
␉␉␉␉␉␉printf("Error: Unable to read the file\n");␉␉␊
␉␉␉␉␉␉close(fdIn);␊
␉␉␉␉␉␉return 1;        ␊
␉␉␉␉␉}␊
␉␉␉␉␉␊
␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem;␊
␉␉␉␉␉␊
␉␉␉␉␉close(fdIn);␊
␉␉␉␉␉␊
                    ␊
␉␉␉␉␉NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr  ];␊
␉␉␉␉␉if (!mem) {␊
                        NSLog(@"Error while opening the file : %@\n",inStr);␊
                        goto out;␊
                    }␊
␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes];␊
                    ␊
␉␉␉␉␉head->OemRevision = uuid32;␊
␉␉␉␉␉␊
␉␉␉␉␉SetChecksum(head);␊
␉␉␉␉␉␊
␉␉␉␉␉{␉␉␊
␉␉␉␉␉␉char dir[1024];␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉sprintf(dir,"%s/%s.%lu.aml",[outStr UTF8String],cfilename,(unsigned long)uuid32);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉int fdOut = open(dir, O_WRONLY | O_CREAT, 0666);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉if (-1 == fdOut) {␊
␉␉␉␉␉␉␉printf("Error: Can't save the file\n");␊
␉␉␉␉␉␉␉return 1;␊
␉␉␉␉␉␉}␊
␉␉␉␉␉␉write(fdOut, mem, head->Length);␊
␉␉␉␉␉␉␊
␉␉␉␉␉␉close(fdOut);␊
␉␉␉␉␉}␊
␉␉␉␉}␊
                    if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]] atomically: YES] == NO) {␊
                        ␊
                        NSLog(@"Error: Can't save the file to %@ \n", [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]]);                        ␊
                        ␊
                    }␊
                    [mem release]; ␉␉␉␉␊
␉␉␉␉}␉␉␉␉␊
␉␉␉␉␊
␉␉␉␉IOObjectRelease(entry);␊
␉␉␉␉␊
␉␉␉␉goto out;␊
␊
                ␊
␉␉␉}␉␉␉␊
␉␉}␊
␉␉printf("No UUID entry\n");␊
␊
␉␉NSLog(@"No UUID entry\n");␊
        ␊
␉}␊
out:␊
␉out:␊
    if (chunks != NULL) {␊
        [chunks release];␊
    }␊
    if (data != NULL) {␊
        CFRelease(data);␊
    }␊
    if (entry != MACH_PORT_NULL) {␊
        IOObjectRelease(entry);␊
    }␊
    if (entry2 != MACH_PORT_NULL) {␊
        IOObjectRelease(entry2);␊
    }␊
    [pool drain];␊
    return 0;␊
}␊
 ...
 ...
 ...
 ...
 ...
 ␊
 int main (int argc, const char * argv[]) {␊
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];␊
-␊
+    ␊
     mach_port_t                  masterPort;␊
 ␉␊
 ␉io_registry_entry_t         entry,entry2;␊
 ␉␊
 ␉const UInt8*                  rawdata = NULL;␊
 ␉␊
-␉UInt32 uuid32 = 0;␊
-␉UInt32 Model32 = 0;␊
-␉const char *cfilename ;␊
+␉unsigned long uuid32 = 0,Model32 = 0 ;␊
 ␉NSString *filename, *fullfilename ;␊
 ␉NSArray *namechunks;␊
 ␉NSMutableArray *chunks;␉␊
-␉char * input, *output, dirspec[512];␊
 ␉NSString *outStr, *inStr;␊
-␊
-␉if (argc > 3 || argc < 2) {␊
-␉␉printf("Usage: amlsgn input(as a file) output(as a directory)\n");␊
-␉␉return 1;␊
-    } else if (argc == 2) {␉␊
+    ␊
+␉if (argc == 2) {␉␊
 ␉␉␊
 ␉␉/* Creating output string */␊
 ␉␉inStr = [NSString stringWithUTF8String:argv[1]];␊
 ␉␉fullfilename = [chunks lastObject];␊
 ␉␉namechunks = [fullfilename componentsSeparatedByString: @"."];␊
 ␉␉filename = [namechunks objectAtIndex:0];␊
-␉␉cfilename = [filename UTF8String];␊
 ␉␉␊
 ␉␉[chunks removeLastObject];␊
 ␉␉outStr = [chunks componentsJoinedByString: @"/"];␊
-␊
-␉} else {␊
+        ␊
+␉} else if (argc == 3 ){␊
 ␉␉inStr = [NSString stringWithUTF8String:argv[1]];␊
 ␉␉BOOL isDirectory= FALSE;␊
-␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory]) {␊
-␉␉␉␊
-␉␉␉if (isDirectory == FALSE) {␊
-␉␉␉␉chunks = [[NSMutableArray alloc] init];␊
-␉␉␉␉[chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]];␊
-␉␉␉␉␊
-␉␉␉␉[chunks removeLastObject];␊
-␉␉␉␉outStr = [chunks componentsJoinedByString: @"/"];␊
-␉␉␉} else {␊
-␉␉␉␉outStr = [NSString stringWithUTF8String:argv[2]];␊
-␊
-␉␉␉}␉␉␉␊
+        ␊
+        chunks = [[NSMutableArray alloc] init];␊
+        [chunks addObjectsFromArray:[inStr componentsSeparatedByString: @"/"]];␊
+        fullfilename = [chunks lastObject];␊
+        namechunks = [fullfilename componentsSeparatedByString: @"."];␊
+        filename = [namechunks objectAtIndex:0];␊
+        ␊
+␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithUTF8String:argv[2]] isDirectory:&isDirectory] && isDirectory) {            ␊
+            ␊
+            outStr = [NSString stringWithUTF8String:argv[2]];␉␊
+            ␊
 ␉␉} ␊
-␊
+        else ␊
+        {            ␊
+            [chunks removeLastObject];␊
+            outStr = [chunks componentsJoinedByString: @"/"];            ␊
+        }␊
+        ␊
 ␉}␊
+    else␊
+    {␊
+␉␉printf("Usage: amlsgn input(as a file) output(as a directory)\n");␊
+␉␉goto out;␊
+    } ␊
 ␉␊
 ␉do {␊
 ␉␉BOOL isDirectory= FALSE;␊
 ␉␉if ([[NSFileManager defaultManager] fileExistsAtPath:outStr isDirectory:&isDirectory] && isDirectory) {␊
-␉␉␊
+            ␊
 ␉␉␉if ([[NSFileManager defaultManager] isWritableFileAtPath:outStr])␊
 ␉␉␉␉break;␊
 ␉␉}␊
 ␉␉␊
 ␉␉outStr = [NSHomeDirectory() stringByAppendingPathComponent:  @"Desktop"];␊
-␊
+        ␊
 ␉} while (0);␊
 ␉␊
 ␉␊
 ␉if (err == KERN_SUCCESS){␉␉␊
 ␉␉␊
 ␉␉entry2=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi" UTF8String]);␊
-␊
+        ␊
 ␉␉if (entry2!=MACH_PORT_NULL) {␉␉␉␊
 ␉␉␉␊
 ␉␉␉data = IORegistryEntrySearchCFProperty( entry2, kIOServicePlane, CFSTR("motherboard-name"), allocator, kIORegistryIterateRecursively);␊
 ␉␉␉␉{␊
 ␉␉␉␉␉Model32 = OSSwapHostToBigInt32(adler32( (unsigned char *) ModelStr, len ));␊
 ␉␉␉␉␉␊
-␉␉␉␉␉printf("uuid32 0x%lu uuidStr %s\n",(unsigned long)Model32,ModelStr);␊
+␉␉␉␉␉printf("Model32 0x%lx ModelStr %s\n",Model32,ModelStr);␊
 ␉␉␉␉␉␊
-␉␉␉␉␉UInt8 mem[1024*1024];␊
+                    NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr  ];␊
+␉␉␉␉␉if (!mem) {␊
+                        NSLog(@"Error while opening the file : %@ \n",inStr);␊
+                        goto out;␊
+                    }␊
+␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes];␊
 ␉␉␉␉␉␊
-␉␉␉␉␉bzero(mem, sizeof(mem));␉␉␉␉␉␊
-␉␉␉␉␉␊
-␉␉␉␉␉int fdIn = open([inStr UTF8String], O_RDONLY, 0666);␊
-␉␉␉␉␉␊
-␉␉␉␉␉if (-1 == fdIn) {␊
-␉␉␉␉␉␉printf("Error while opening the file \n");␊
-␉␉␉␉␉␉return 1;␊
-␉␉␉␉␉}␊
-␉␉␉␉␉␊
-␉␉␉␉␉size_t nbRead = read(fdIn, (void*)mem, sizeof(mem));␊
-␉␉␉␉␉if (nbRead <= 0) {␊
-␉␉␉␉␉␉printf("Error: Unable to read the file\n");␉␉␊
-␉␉␉␉␉␉close(fdIn);␊
-␉␉␉␉␉␉return 1;        ␊
-␉␉␉␉␉}␊
-␉␉␉␉␉␊
-␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem;␊
-␉␉␉␉␉␊
-␉␉␉␉␉close(fdIn);␊
-␉␉␉␉␉␊
 ␉␉␉␉␉head->OemRevision = Model32;␊
 ␉␉␉␉␉␊
 ␉␉␉␉␉SetChecksum(head);␊
 ␉␉␉␉␉␊
-␉␉␉␉␉{␉␉␊
-␉␉␉␉␉␉char dir[1024];␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉sprintf(dir,"%s/%s.%s.aml",[outStr UTF8String],cfilename,ModelStr);␊
-␊
-␉␉␉␉␉␉int fdOut = open(dir, O_WRONLY | O_CREAT, 0666);␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉if (-1 == fdOut) {␊
-␉␉␉␉␉␉␉printf("Error: Can't save the file\n");␊
-␉␉␉␉␉␉␉return 1;␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉␉write(fdOut, mem, head->Length);␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉close(fdOut);␊
-␉␉␉␉␉}␊
+                    if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml",␊
+                                            outStr, filename, [NSString stringWithUTF8String:ModelStr]] atomically: YES] == NO) {␊
+                        ␊
+                        NSLog(@"Error: Can't save the file to %@\n",[NSString stringWithFormat:@"%@/%@.%@.aml",␊
+                                                                     outStr, filename, [NSString stringWithUTF8String:ModelStr]]);                        ␊
+                        ␊
+                    }␊
+                    ␊
+                    [mem release];␉␉␉␉␉␊
 ␉␉␉␉}␉␉␉␉␊
 ␉␉␉␉␊
-␉␉␉␉IOObjectRelease(entry2);␊
-␉␉␉␉␊
 ␉␉␉␉goto out;␊
 ␉␉␉}␉␉␉␊
 ␉␉␉␊
 ␉␉} ␉␉␊
 ␉␉␊
-␉␉printf("No Model entry \n");␊
-␉␉␉␊
+␉␉NSLog(@"No Model entry \n");␊
+        ␊
 ␉␉entry=IORegistryEntryFromPath(masterPort, [@"IODeviceTree:/efi/platform" UTF8String]);␊
-␊
+        ␊
 ␉␉if (entry!=MACH_PORT_NULL){␉␉␊
 ␉␉␉␊
 ␉␉␉␊
 ␉␉␉␉{␊
 ␉␉␉␉␉uuid32 = OSSwapHostToBigInt32(adler32( (unsigned char *) uuidStr, UUID_STR_LEN ));␊
 ␉␉␉␉␉␊
-␉␉␉␉␉printf("uuid32  : 0x%lu\n",(unsigned long)uuid32);␊
+␉␉␉␉␉printf("uuid32  : 0x%lx\n",uuid32);␊
 ␉␉␉␉␉printf("uuidStr : %s\n",uuidStr);␊
-␊
-␉␉␉␉␉UInt8 mem[1024*1024];␊
-␉␉␉␉␉␊
-␉␉␉␉␉bzero(mem, sizeof(mem));␊
-␉␉␉␉␉␊
-␉␉␉␉␉int fdIn = open([inStr UTF8String], O_RDONLY, 0666);␊
-␉␉␉␉␉␊
-␉␉␉␉␉if (-1 == fdIn) {␊
-␉␉␉␉␉␉printf("Error while opening the file \n");␊
-␉␉␉␉␉␉return 1;␊
-␉␉␉␉␉}␊
-␉␉␉␉␉␊
-␉␉␉␉␉size_t nbRead = read(fdIn, (void*)mem, sizeof(mem));␊
-␉␉␉␉␉if (nbRead <= 0) {␊
-␉␉␉␉␉␉printf("Error: Unable to read the file\n");␉␉␊
-␉␉␉␉␉␉close(fdIn);␊
-␉␉␉␉␉␉return 1;        ␊
-␉␉␉␉␉}␊
-␉␉␉␉␉␊
-␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)mem;␊
-␉␉␉␉␉␊
-␉␉␉␉␉close(fdIn);␊
-␉␉␉␉␉␊
+                    ␊
+␉␉␉␉␉NSMutableData * mem = [[NSMutableData alloc] initWithContentsOfFile : inStr  ];␊
+␉␉␉␉␉if (!mem) {␊
+                        NSLog(@"Error while opening the file : %@\n",inStr);␊
+                        goto out;␊
+                    }␊
+␉␉␉␉␉ACPI_TABLE_HEADER * head = (ACPI_TABLE_HEADER *)[mem mutableBytes];␊
+                    ␊
 ␉␉␉␉␉head->OemRevision = uuid32;␊
 ␉␉␉␉␉␊
 ␉␉␉␉␉SetChecksum(head);␊
 ␉␉␉␉␉␊
-␉␉␉␉␉{␉␉␊
-␉␉␉␉␉␉char dir[1024];␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉sprintf(dir,"%s/%s.%lu.aml",[outStr UTF8String],cfilename,(unsigned long)uuid32);␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉int fdOut = open(dir, O_WRONLY | O_CREAT, 0666);␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉if (-1 == fdOut) {␊
-␉␉␉␉␉␉␉printf("Error: Can't save the file\n");␊
-␉␉␉␉␉␉␉return 1;␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉␉write(fdOut, mem, head->Length);␊
-␉␉␉␉␉␉␊
-␉␉␉␉␉␉close(fdOut);␊
-␉␉␉␉␉}␊
-␉␉␉␉}␊
+                    if ([mem writeToFile : [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]] atomically: YES] == NO) {␊
+                        ␊
+                        NSLog(@"Error: Can't save the file to %@ \n", [NSString stringWithFormat:@"%@/%@.%@.aml",outStr,filename,[NSNumber numberWithUnsignedLong:uuid32]]);                        ␊
+                        ␊
+                    }␊
+                    [mem release]; ␉␉␉␉␊
+␉␉␉␉}␉␉␉␉␊
 ␉␉␉␉␊
-␉␉␉␉IOObjectRelease(entry);␊
-␉␉␉␉␊
 ␉␉␉␉goto out;␊
-␊
+                ␊
 ␉␉␉}␉␉␉␊
 ␉␉}␊
-␉␉printf("No UUID entry\n");␊
-␊
+␉␉NSLog(@"No UUID entry\n");␊
+        ␊
 ␉}␊
-out:␊
+␉out:␊
+    if (chunks != NULL) {␊
+        [chunks release];␊
+    }␊
+    if (data != NULL) {␊
+        CFRelease(data);␊
+    }␊
+    if (entry != MACH_PORT_NULL) {␊
+        IOObjectRelease(entry);␊
+    }␊
+    if (entry2 != MACH_PORT_NULL) {␊
+        IOObjectRelease(entry2);␊
+    }␊
     [pool drain];␊
     return 0;␊
 }␊

Download the corresponding diff file