Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser
===================================================================
--- branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1223)
+++ branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1224)
@@ -2,16 +2,16 @@
{
012E60F8137AC68F00E35218 /* smbios_decode.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {877, 3211}}";
+ sepNavIntBoundsRect = "{{0, 0}, {877, 3237}}";
sepNavSelRange = "{243, 0}";
- sepNavVisRange = "{0, 343}";
+ sepNavVisRange = "{0, 342}";
};
};
012E60F9137AC68F00E35218 /* smbios_getters.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1454, 6214}}";
- sepNavSelRange = "{13004, 0}";
- sepNavVisRange = "{12611, 1105}";
+ sepNavIntBoundsRect = "{{0, 0}, {1454, 6487}}";
+ sepNavSelRange = "{12468, 12}";
+ sepNavVisRange = "{11843, 1289}";
};
};
012E60FA137AC68F00E35218 /* smbios_getters.h */ = {
@@ -23,9 +23,9 @@
};
012E60FB137AC68F00E35218 /* smbios.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {964, 12441}}";
- sepNavSelRange = "{28730, 17}";
- sepNavVisRange = "{28231, 833}";
+ sepNavIntBoundsRect = "{{0, 0}, {880, 12558}}";
+ sepNavSelRange = "{30338, 4}";
+ sepNavVisRange = "{29980, 992}";
sepNavWindowFrame = "{{15, 60}, {889, 813}}";
};
};
@@ -63,13 +63,12 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 333016839;
- PBXWorkspaceStateSaveDate = 333016839;
+ PBXPerProjectTemplateStateSaveDate = 333025461;
+ PBXWorkspaceStateSaveDate = 333025461;
};
perUserProjectItems = {
1208BED013D70B8900694228 /* PBXTextBookmark */ = 1208BED013D70B8900694228 /* PBXTextBookmark */;
1208BED513D710A600694228 /* PBXTextBookmark */ = 1208BED513D710A600694228 /* PBXTextBookmark */;
- 1217E1F813D96F3800800327 /* PBXTextBookmark */ = 1217E1F813D96F3800800327 /* PBXTextBookmark */;
122A5BCA1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCA1375C49300795FF0 /* PBXTextBookmark */;
122A5BCB1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCB1375C49300795FF0 /* PBXTextBookmark */;
1237560213D81EE60027F8A5 /* PBXTextBookmark */ = 1237560213D81EE60027F8A5 /* PBXTextBookmark */;
@@ -83,8 +82,6 @@
12375A2913D82FD80027F8A5 /* PBXTextBookmark */ = 12375A2913D82FD80027F8A5 /* PBXTextBookmark */;
12375A3C13D831AB0027F8A5 /* PBXTextBookmark */ = 12375A3C13D831AB0027F8A5 /* PBXTextBookmark */;
1282533913D96A7000820E2D /* PBXTextBookmark */ = 1282533913D96A7000820E2D /* PBXTextBookmark */;
- 1282534B13D96C3B00820E2D /* PBXTextBookmark */ = 1282534B13D96C3B00820E2D /* PBXTextBookmark */;
- 1282535013D96C7100820E2D /* PBXTextBookmark */ = 1282535013D96C7100820E2D /* PBXTextBookmark */;
1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */ = 1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */;
1284EEF913D6F95000A6BE87 /* PBXTextBookmark */ = 1284EEF913D6F95000A6BE87 /* PBXTextBookmark */;
128EB70A13D31D3900E0DA4B /* PBXTextBookmark */ = 128EB70A13D31D3900E0DA4B /* PBXTextBookmark */;
@@ -94,6 +91,9 @@
12BFD73713D6E2DD00065808 /* PBXTextBookmark */ = 12BFD73713D6E2DD00065808 /* PBXTextBookmark */;
12D15FC013D35DFB00ABAAF4 /* PBXTextBookmark */ = 12D15FC013D35DFB00ABAAF4 /* PBXTextBookmark */;
12D15FE813D3634F00ABAAF4 /* PBXTextBookmark */ = 12D15FE813D3634F00ABAAF4 /* PBXTextBookmark */;
+ 12D3CA3313D99147002669E3 /* PBXTextBookmark */ = 12D3CA3313D99147002669E3 /* PBXTextBookmark */;
+ 12D3CA3413D99147002669E3 /* PBXTextBookmark */ = 12D3CA3413D99147002669E3 /* PBXTextBookmark */;
+ 12D3CA3513D99147002669E3 /* PBXTextBookmark */ = 12D3CA3513D99147002669E3 /* PBXTextBookmark */;
12E9C0AA13D95C2F0096128F /* PBXTextBookmark */ = 12E9C0AA13D95C2F0096128F /* PBXTextBookmark */;
12E9C0BD13D95F8F0096128F /* PBXTextBookmark */ = 12E9C0BD13D95F8F0096128F /* PBXTextBookmark */;
12EDC2D91376FCB300937D70 /* PBXTextBookmark */ = 12EDC2D91376FCB300937D70 /* PBXTextBookmark */;
@@ -124,16 +124,6 @@
vrLen = 799;
vrLoc = 2489;
};
- 1217E1F813D96F3800800327 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 012E60F8137AC68F00E35218 /* smbios_decode.c */;
- name = "smbios_decode.c: 12";
- rLen = 0;
- rLoc = 243;
- rType = 0;
- vrLen = 343;
- vrLoc = 0;
- };
122A5BB51375B61C00795FF0 /* Source Control */ = {
isa = PBXSourceControlManager;
fallbackIsa = XCSourceControlManager;
@@ -278,26 +268,6 @@
vrLen = 1131;
vrLoc = 1781;
};
- 1282534B13D96C3B00820E2D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 012E60FB137AC68F00E35218 /* smbios.c */;
- name = "smbios.c: 923";
- rLen = 0;
- rLoc = 30483;
- rType = 0;
- vrLen = 987;
- vrLoc = 30064;
- };
- 1282535013D96C7100820E2D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 012E60F8137AC68F00E35218 /* smbios_decode.c */;
- name = "smbios_decode.c: 62";
- rLen = 9;
- rLoc = 2449;
- rType = 0;
- vrLen = 1026;
- vrLoc = 1950;
- };
1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B0056D6111F3868000754B65 /* platform.h */;
@@ -388,6 +358,33 @@
vrLen = 453;
vrLoc = 1863;
};
+ 12D3CA3313D99147002669E3 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 012E60F8137AC68F00E35218 /* smbios_decode.c */;
+ name = "smbios_decode.c: 12";
+ rLen = 0;
+ rLoc = 243;
+ rType = 0;
+ vrLen = 342;
+ vrLoc = 0;
+ };
+ 12D3CA3413D99147002669E3 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 012E60FB137AC68F00E35218 /* smbios.c */;
+ rLen = 4;
+ rLoc = 30338;
+ rType = 0;
+ };
+ 12D3CA3513D99147002669E3 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 012E60FB137AC68F00E35218 /* smbios.c */;
+ name = "smbios.c: 921";
+ rLen = 4;
+ rLoc = 30338;
+ rType = 0;
+ vrLen = 992;
+ vrLoc = 29980;
+ };
12E9C0AA13D95C2F0096128F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6DBAFD1413B0D21E0047ED33 /* modules.c */;
@@ -438,6 +435,13 @@
vrLen = 517;
vrLoc = 0;
};
+ 1D2A1AF513743A2600787720 /* bootargs.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {782, 2483}}";
+ sepNavSelRange = "{4920, 12}";
+ sepNavVisRange = "{2870, 1046}";
+ };
+ };
6DBAFD1413B0D21E0047ED33 /* modules.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {922, 14664}}";
@@ -623,9 +627,9 @@
};
B0056D6111F3868000754B65 /* platform.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {877, 2314}}";
- sepNavSelRange = "{4643, 12}";
- sepNavVisRange = "{3805, 1184}";
+ sepNavIntBoundsRect = "{{0, 0}, {782, 2535}}";
+ sepNavSelRange = "{4733, 8}";
+ sepNavVisRange = "{3858, 1132}";
};
};
B0056D6211F3868000754B65 /* saio_internal.h */ = {
Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3
===================================================================
--- branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1223)
+++ branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1224)
@@ -316,7 +316,7 @@
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- smbios_decode.c
+ smbios.c
PBXSplitModuleInNavigatorKey
Split0
@@ -324,11 +324,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- smbios_decode.c
+ smbios.c
_historyCapacity
0
bookmark
- 1217E1F813D96F3800800327
+ 12D3CA3513D99147002669E3
history
122A5BCA1375C49300795FF0
@@ -360,8 +360,8 @@
12E9C0AA13D95C2F0096128F
12E9C0BD13D95F8F0096128F
1282533913D96A7000820E2D
- 1282534B13D96C3B00820E2D
- 1282535013D96C7100820E2D
+ 12D3CA3313D99147002669E3
+ 12D3CA3413D99147002669E3
SplitCount
@@ -373,14 +373,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {938, 303}}
+ {{0, 0}, {938, 292}}
RubberWindowFrame
294 219 1146 659 0 0 1440 878
Module
PBXNavigatorGroup
Proportion
- 303pt
+ 292pt
ContentConfiguration
@@ -393,14 +393,14 @@
GeometryConfiguration
Frame
- {{0, 308}, {938, 310}}
+ {{0, 297}, {938, 321}}
RubberWindowFrame
294 219 1146 659 0 0 1440 878
Module
XCDetailModule
Proportion
- 310pt
+ 321pt
Proportion
@@ -419,9 +419,9 @@
TableOfContents
- 1217E1F913D96F3800800327
+ 12D3CA3613D99147002669E3
1CE0B1FE06471DED0097A5F4
- 1217E1FA13D96F3800800327
+ 12D3CA3713D99147002669E3
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -559,6 +559,7 @@
5
WindowOrderList
+ 1C530D57069F1CE1000CFCEE
122A5BB81375BA4700795FF0
/Users/slice/Projects/Chameleons/chameleon/branches/slice/trunkM/Chameleon.xcodeproj
@@ -640,7 +641,7 @@
TableOfContents
122A5BB81375BA4700795FF0
- 1217E1FB13D96F3800800327
+ 12D3CA2A13D99145002669E3
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -773,14 +774,12 @@
Dock
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
1CDD528C0622207200134675
PBXProjectModuleLabel
- device_inject.c
+ smbios_getters.c
StatusBarVisibility
@@ -801,6 +800,8 @@
431pt
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
@@ -836,8 +837,8 @@
TableOfContents
1C530D57069F1CE1000CFCEE
- 1282534913D96C3900820E2D
- 1282534A13D96C3900820E2D
+ 12D3CA3113D99145002669E3
+ 12D3CA3213D99145002669E3
1CDD528C0622207200134675
1CD0528E0623707200166675
Index: branches/slice/trunkM/i386/boot1/boot1h.s
===================================================================
--- branches/slice/trunkM/i386/boot1/boot1h.s (revision 1223)
+++ branches/slice/trunkM/i386/boot1/boot1h.s (revision 1224)
@@ -42,7 +42,7 @@
;
; Set to 1 to enable obscure debug messages.
;
-DEBUG EQU CONFIG_BOOT1_HFS_DEBUG
+DEBUG EQU 0
;
; Set to 1 to enable unused code.
@@ -52,7 +52,7 @@
;
; Set to 1 to enable verbose mode.
;
-VERBOSE EQU CONFIG_BOOT1_HFS_VERBOSE
+VERBOSE EQU 0
;
; Various constants.
@@ -490,6 +490,9 @@
mov ah, 0
int 0x16
%endif
+ mov ax, 0x1900
+ mov es, ax
+ mov BYTE [es:4], 1
mov dl, [gBIOSDriveNumber] ; load BIOS drive number
jmp kBoot2Segment:kBoot2Address