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

Date:

2017-04-04 01:01:37 (7 years 12 days ago)

Author:

ErmaC

Commit:

2879

Parents:

2878

Message:

typo

Changes:

M	/branches/ErmaC/Enoch/i386/libsaio/bootargs.h
M	/branches/ErmaC/Enoch/i386/boot2/boot.c
M	/branches/ErmaC/Enoch/i386/libsaio/bootstruct.c

File differences

-134
135 135
136 136
137 
137
138 138
139 139
140 140
141 141
142
142 143
143 144
144 145
+␉}␊
␉else␊
␉{␊
␉␉// for 10.7 10.8 10.9 10.10 10.11␊
␉␉// for 10.7 10.8 10.9 10.10 10.11 10.12␊
␉␉void *oldAddr = bootArgs;␊
␉␉bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));␊
␉␉bcopy(oldAddr, bootArgs, sizeof(boot_args));␊
␉}␊
␊
}␊
␊
//==============================================================================␊
 ␉}␊
 ␉else␊
 ␉{␊
-␉␉// for 10.7 10.8 10.9 10.10 10.11␊
+␉␉// for 10.7 10.8 10.9 10.10 10.11 10.12␊
 ␉␉void *oldAddr = bootArgs;␊
 ␉␉bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args));␊
 ␉␉bcopy(oldAddr, bootArgs, sizeof(boot_args));␊
 ␉}␊
+␊
 }␊
 ␊
 //==============================================================================␊

-88
89 89
90 90
91 
92 91
93 92
94 93
... ...
148 147
149 148
150 149
151 
150
152 151
153 152
154 153
... ...
158 157
159 158
160 159
161 
160
162 161
163 162
164 163
+␉uint32_t␉v_height;␉/* Height */␊
␉uint32_t␉v_depth;␉/* Pixel Depth */␊
};␊
␊
typedef struct Boot_Video␉Boot_Video;␊
␊
/* Values for v_display */␊

#define CSR_ALLOW_UNRESTRICTED_DTRACE␉␉(1 << 5) /* Allow unrestricted dtrace */␊
#define CSR_ALLOW_UNRESTRICTED_NVRAM␉␉(1 << 6) /* Allow unrestricted NVRAM */␊
#define CSR_ALLOW_DEVICE_CONFIGURATION␉␉(1 << 7) /* Allow device configuration */␊
#define CSR_DISABLE_BASESYSTEM_VERIFICATION␉(1 << 8)␊
#define CSR_ALLOW_ANY_RECOVERY_OS␉␉(1 << 8)␊
␊
#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \␊
␉␉CSR_ALLOW_UNRESTRICTED_FS | \␊

␉␉CSR_ALLOW_UNRESTRICTED_DTRACE | \␊
␉␉CSR_ALLOW_UNRESTRICTED_NVRAM | \␊
␉␉CSR_ALLOW_DEVICE_CONFIGURATION | \␊
␉␉CSR_DISABLE_BASESYSTEM_VERIFICATION)␊
␉␉CSR_ALLOW_ANY_RECOVERY_OS)␊
␊
typedef struct boot_args␊
{␊
 ...
 ...
 ␉uint32_t␉v_height;␉/* Height */␊
 ␉uint32_t␉v_depth;␉/* Pixel Depth */␊
 };␊
-␊
 typedef struct Boot_Video␉Boot_Video;␊
 ␊
 /* Values for v_display */␊
 #define CSR_ALLOW_UNRESTRICTED_DTRACE␉␉(1 << 5) /* Allow unrestricted dtrace */␊
 #define CSR_ALLOW_UNRESTRICTED_NVRAM␉␉(1 << 6) /* Allow unrestricted NVRAM */␊
 #define CSR_ALLOW_DEVICE_CONFIGURATION␉␉(1 << 7) /* Allow device configuration */␊
-#define CSR_DISABLE_BASESYSTEM_VERIFICATION␉(1 << 8)␊
+#define CSR_ALLOW_ANY_RECOVERY_OS␉␉(1 << 8)␊
 ␊
 #define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \␊
 ␉␉CSR_ALLOW_UNRESTRICTED_FS | \␊
 ␉␉CSR_ALLOW_UNRESTRICTED_DTRACE | \␊
 ␉␉CSR_ALLOW_UNRESTRICTED_NVRAM | \␊
 ␉␉CSR_ALLOW_DEVICE_CONFIGURATION | \␊
-␉␉CSR_DISABLE_BASESYSTEM_VERIFICATION)␊
+␉␉CSR_ALLOW_ANY_RECOVERY_OS)␊
 ␊
 typedef struct boot_args␊
 {␊

-180
181 181
182 182
183 
183
184 184
185 185
186 186
+␊
#if KEXTPATCH_SUPPORT␊
// =========================================================================␊
// Load the Kext.plist override config file if any␊
// Load the Kexts.plist override config file if any␊
static void setupKextConfigFile(const char *filename)␊
{␊
␉char␉␉dirSpec[128];␊
 ␊
 #if KEXTPATCH_SUPPORT␊
 // =========================================================================␊
-// Load the Kext.plist override config file if any␊
+// Load the Kexts.plist override config file if any␊
 static void setupKextConfigFile(const char *filename)␊
 {␊
 ␉char␉␉dirSpec[128];␊

Download the corresponding diff file