Chameleon

Chameleon Commit Details

Date:2014-11-01 22:20:10 (4 years 7 months ago)
Author:ErmaC
Commit:2459
Parents: 2458
Message:Typo and missed previous merge.
Changes:
M/branches/ErmaC/Enoch/i386/boot2/appleboot.h
M/branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c
M/branches/ErmaC/Enoch/i386/libsaio/bootargs.h
M/branches/ErmaC/Enoch/i386/boot2/gui.c

File differences

branches/ErmaC/Enoch/i386/libsaio/acpi_patcher.c
211211
212212
213213
214
214
215215
216216
217217
......
414414
415415
416416
417
417
418418
419419
420420
struct acpi_2_ssdt *generate_cst_ssdt(struct acpi_2_fadt* fadt)
{
static char ssdt_header[] = // cst_ssdt_header
static char const ssdt_header[] = // cst_ssdt_header
{
0x53, 0x53, 0x44, 0x54, 0xE7, 0x00, 0x00, 0x00, /* SSDT.... */
0x01, 0x17, 0x50, 0x6D, 0x52, 0x65, 0x66, 0x41, /* ..PmRefA */
struct acpi_2_ssdt *generate_pss_ssdt(struct acpi_2_dsdt* dsdt)
{
static char ssdt_header[] = // pss_ssdt_header
static char const ssdt_header[] = // pss_ssdt_header
{
0x53, 0x53, 0x44, 0x54, 0x7E, 0x00, 0x00, 0x00, /* SSDT.... */
0x01, 0x6A, 0x50, 0x6D, 0x52, 0x65, 0x66, 0x00, /* ..PmRef. */
branches/ErmaC/Enoch/i386/libsaio/bootargs.h
131131
132132
133133
134
135
136
137
138
134139
135140
136141
......
157162
158163
159164
160
165
161166
162167
163168
......
172177
173178
174179
175
180
176181
177182
178183
......
196201
197202
198203
199
200
204
205
201206
202207
203208
......
207212
208213
209214
210
211215
216
217
218
219
220
221
222
212223
213224
214225
#define kBootArgsFlagRebootOnPanic(1 << 0)
#define kBootArgsFlagHiDPI(1 << 1)
#define kBootArgsFlagBlack(1 << 2)
#define kBootArgsFlagCSRActiveConfig(1 << 3)
#define kBootArgsFlagCSRPendingConfig(1 << 4)
#define kBootArgsFlagCSRBoot(1 << 5)
#define kBootArgsFlagBlackBg(1 << 6)
#define kBootArgsFlagLoginUI(1 << 7)
typedef struct boot_args_pre_lion
{
uint32_t efiSystemTable; /* physical address of system table in runtime area */
uint8_t efiMode; /* 32 = 32-bit, 64 = 64-bit */
uint8_t efiMode; /* 32 means 32-bit mode, 64 means 64-bit mode */
uint8_t __reserved1[3];
uint32_t __reserved2[1];
uint32_t performanceDataStart; /* physical address of log */
uint16_t Revision;/* Revision of boot_args structure */
uint16_t Version;/* Version of boot_args structure */
uint8_t efiMode; /* 32 = 32-bit, 64 = 64-bit */
uint8_t efiMode; /* 32 means 32-bit mode, 64 means 64-bit mode */
uint8_t debugMode; /* Bit field with behavior changes */
uint16_t flags;
uint64_t efiRuntimeServicesVirtualPageStart; /* virtual address of defragmented runtime pages */
uint32_t efiSystemTable; /* physical address of system table in runtime area */
uint8_t __reserved1[2];
uint32_t __reserved2;
uint32_t kslide;
uint32_t performanceDataStart; /* physical address of log */
uint32_t performanceDataSize;
uint64_tbootMemSize;
uint64_t PhysicalMemorySize;
uint64_t FSBFrequency;
uint32_t __reserved4[734];
uint64_t pciConfigSpaceBaseAddress;
uint32_t pciConfigSpaceStartBusNumber;
uint32_t pciConfigSpaceEndBusNumber;
uint32_tcsrActiveConfig;
uint32_tcsrPendingConfig;
uint32_t __reserved4[728];
} boot_args;
extern char gMacOSVersion[8];
branches/ErmaC/Enoch/i386/boot2/gui.c
10111011
10121012
10131013
1014
1015
1016
1017
1018
1019
1014
1015
1016
1017
1018
1019
10201020
10211021
10221022
......
10511051
10521052
10531053
1054
1054
10551055
10561056
10571057
{
// ErmaC : TODO test needed for recovery icon
// Use HFSRECOVERY icon.
//if (device->flags & kBVFlagBooter)
//{
//devicetype = iDeviceHFSRECOVERY;
//}
//else
//{
if (device->flags & kBVFlagBooter)
{
devicetype = iDeviceHFSRECOVERY;
}
else
{
// Use HFS or HFSRAID icon depending on bvr flags. Fallbacks are handled by alt_image above.
switch (device->OSVersion[3]) {
devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS);
break;
}
//}
}
break;
branches/ErmaC/Enoch/i386/boot2/appleboot.h
3838
3939
4040
41
41
4242
4343
4444
// The original data was 16K in size (128x128) and would make the booter
// cross a 64K segment boundary. boot0 cannot load more than 127 sectors
// without changes. To eiminate that complexity, the data was run length
// without changes. To eliminate that complexity, the data was run length
// encoded to save space. The reduced size is 1372 bytes.
const unsigned char gAppleBootPictRLE[] =

Archive Download the corresponding diff file

Revision: 2459