Chameleon

Chameleon Commit Details

Date:2015-03-15 10:38:38 (9 years 1 month ago)
Author:ErmaC
Commit:2634
Parents: 2633
Message:Typo.
Changes:
M/trunk/i386/libsaio/efi.h
M/trunk/i386/libsaio/smbios.c
M/trunk/i386/boot2/options.c
M/trunk/i386/libsaio/sys.c

File differences

trunk/i386/libsaio/efi.h
140140
141141
142142
143
143
144144
145145
146146
......
187187
188188
189189
190
190
191191
192192
193193
......
201201
202202
203203
204
204
205205
206206
207207
......
213213
214214
215215
216
217
218
219
220
216221
217
218
219
220
221
222
223
224222
225223
226224
} EFI_GUID;␊
␊
#define APPLE_VENDOR_GUID \␊
{0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27,0x8F, 0xCC, 0x34, 0x22, 0xB6} }␊
{0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27, 0x8F, 0xCC, 0x34, 0x22, 0xB6} }␊
␊
#define EFI_GLOBAL_VARIABLE_GUID \␊
{0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }␊
#define EFI_UNSPECIFIED_TIMEZONE 0x07FF␊
␊
typedef enum {␊
␉EfiReservedMemoryType,␊
␉EfiReservedMemoryType,␉// 0␊
␉EfiLoaderCode,␊
␉EfiLoaderData,␊
␉EfiBootServicesCode,␊
␉EfiMemoryMappedIO,␊
␉EfiMemoryMappedIOPortSpace,␊
␉EfiPalCode,␊
␉EfiMaxMemoryType␊
␉EfiMaxMemoryType␉// 14␊
} EFI_MEMORY_TYPE;␊
␊
typedef struct {␊
} __attribute__((aligned(8))) EFI_TABLE_HEADER;␊
␊
// possible caching types for the memory range␊
#define EFI_MEMORY_UC␉␉0x0000000000000001ULL␉/* uncached */␊
#define EFI_MEMORY_WC␉␉0x0000000000000002ULL␉/* write-coalescing */␊
#define EFI_MEMORY_WT␉␉0x0000000000000004ULL␉/* write-through */␊
#define EFI_MEMORY_WB␉␉0x0000000000000008ULL␉/* write-back */␊
#define EFI_MEMORY_UCE␉␉0x0000000000000010ULL␉/* uncached, exported */␊
␊
#define EFI_MEMORY_UC 0x0000000000000001ULL␊
#define EFI_MEMORY_WC 0x0000000000000002ULL␊
#define EFI_MEMORY_WT 0x0000000000000004ULL␊
#define EFI_MEMORY_WB 0x0000000000000008ULL␊
#define EFI_MEMORY_UCE 0x0000000000000010ULL␊
␊
␊
// physical memory protection on range␊
␊
#define EFI_MEMORY_WP 0x0000000000001000ULL␊
trunk/i386/libsaio/sys.c
968968
969969
970970
971
972971
973
974972
975973
976
977974
978975
979976
......
993990
994991
995992
993
996994
997995
996
998997
999998
1000999
......
10181017
10191018
10201019
1020
10211021
10221022
1023
10231024
10241025
10251026
......
11281129
11291130
11301131
1132
11311133
11321134
1135
11331136
11341137
11351138
#if DEBUG_FEATURE_LAST_BOOT␊
␉char dirSpec[]␉␉= "hd(%d,%d)/";␊
␉char fileSpec[]␉␉= "Volumes";␊
#endif␊
␉char *label;␊
#if DEBUG_FEATURE_LAST_BOOT␊
␉u_int32_t time;␊
␉u_int32_t lasttime␉= 0;␊
␊
␉long flags;␊
#endif␊
␊
␊
␉␉␉if ( (bvr->part_no == multiboot_partition) && (bvr->biosdev == gBIOSDev) )␊
␉␉␉{␊
#if DEBUG_FEATURE_LAST_BOOT␊
␉␉␉␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉␉␉␉DBG("Multiboot partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
␉␉␉␉return bvr;␊
␉␉␉}␊
␉␉}␊
␉␉␉if (matchVolumeToString(bvr, val, false))␊
␉␉␉{␊
␉␉␉␉free(val);␊
#if DEBUG_FEATURE_LAST_BOOT␊
␉␉␉␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉␉␉␉DBG("User default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
␉␉␉␉return bvr;␊
␉␉␉}␊
␉␉}␊
␉}␊
␊
␉bvr = bvr2 ? bvr2 : (bvr1 ? bvr1 : chain);␊
#if DEBUG_FEATURE_LAST_BOOT␊
␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉DBG("Default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
␉return bvr;␊
}␊
␊
trunk/i386/libsaio/smbios.c
562562
563563
564564
565
565
566566
567567
568568
//=========== MacPro ===========␊
#define kDefaultMacProFamily␉␉␉␉"MacPro" // MacPro's family = "MacPro" not "Mac Pro"␊
//#define KDefauktMacProBoardAssetTagNumber␉␉"Pro-Enclosure"␊
//#define kDefaultMacProBoardType␉␉␉"0xB" // 11␊
//#define kDefaultMacProBoardType␉␉␉"0x0B" // 11␊
␊
#define kDefaultMacPro␉␉␉␉␉"MacPro3,1"␊
#define kDefaultMacProBIOSVersion␉␉␉" MP31.88Z.006C.B05.0903051113"␊
trunk/i386/boot2/options.c
875875
876876
877877
878
878
879879
880880
881881
......
14241424
14251425
14261426
1427
1427
14281428
14291429
14301430
␉␉␉printf(getVBEInfoString());␊
␉␉}␊
␉␉changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);␊
␉␉verbose("Scanning device %x...", gBIOSDev);␊
␉␉verbose("Scanning device %x...\n", gBIOSDev);␊
␉}␊
␊
␉// When booting from CD, default to hard drive boot when possible. ␊
␉␉␉gBootVolume->fs_getuuid(gBootVolume, gBootUUIDString);␊
␉␉}␊
␉}␊
␉DBG("Boot UUID [%s (%s), %s]: %s\n", gBootVolume->label, gBootVolume->altlabel, gBootVolume->type_name, gBootUUIDString);␊
␉DBG("Boot UUID of '%s' %s (%s): %s\n", gBootVolume->label, gBootVolume->altlabel, gBootVolume->type_name, gBootUUIDString);␊
␊
␉if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config,␊
&argP, &cntRemaining, gRootDevice, ROOT_DEVICE_SIZE))␊

Archive Download the corresponding diff file

Revision: 2634