Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser
===================================================================
--- branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1207)
+++ branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1208)
@@ -2,9 +2,9 @@
{
012E60F8137AC68F00E35218 /* smbios_decode.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {887, 3068}}";
- sepNavSelRange = "{10086, 0}";
- sepNavVisRange = "{5590, 1333}";
+ sepNavIntBoundsRect = "{{0, 0}, {877, 3211}}";
+ sepNavSelRange = "{243, 0}";
+ sepNavVisRange = "{0, 343}";
};
};
012E60F9137AC68F00E35218 /* smbios_getters.c */ = {
@@ -23,9 +23,9 @@
};
012E60FB137AC68F00E35218 /* smbios.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1076, 12012}}";
- sepNavSelRange = "{259, 0}";
- sepNavVisRange = "{0, 772}";
+ sepNavIntBoundsRect = "{{0, 0}, {964, 12441}}";
+ sepNavSelRange = "{28730, 17}";
+ sepNavVisRange = "{28231, 833}";
sepNavWindowFrame = "{{15, 60}, {889, 813}}";
};
};
@@ -63,17 +63,16 @@
PBXFileDataSource_Target_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 333013407;
- PBXWorkspaceStateSaveDate = 333013407;
+ PBXPerProjectTemplateStateSaveDate = 333016839;
+ PBXWorkspaceStateSaveDate = 333016839;
};
perUserProjectItems = {
1208BED013D70B8900694228 /* PBXTextBookmark */ = 1208BED013D70B8900694228 /* PBXTextBookmark */;
1208BED513D710A600694228 /* PBXTextBookmark */ = 1208BED513D710A600694228 /* PBXTextBookmark */;
- 120E55C813D8694A00E2D592 /* PBXTextBookmark */ = 120E55C813D8694A00E2D592 /* PBXTextBookmark */;
+ 1217E1F813D96F3800800327 /* PBXTextBookmark */ = 1217E1F813D96F3800800327 /* PBXTextBookmark */;
122A5BCA1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCA1375C49300795FF0 /* PBXTextBookmark */;
122A5BCB1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCB1375C49300795FF0 /* PBXTextBookmark */;
1237560213D81EE60027F8A5 /* PBXTextBookmark */ = 1237560213D81EE60027F8A5 /* PBXTextBookmark */;
- 1237560313D81EE60027F8A5 /* PBXTextBookmark */ = 1237560313D81EE60027F8A5 /* PBXTextBookmark */;
1237560613D81EE60027F8A5 /* PBXTextBookmark */ = 1237560613D81EE60027F8A5 /* PBXTextBookmark */;
1237560713D81EE60027F8A5 /* PBXTextBookmark */ = 1237560713D81EE60027F8A5 /* PBXTextBookmark */;
1237560813D81EE60027F8A5 /* PBXTextBookmark */ = 1237560813D81EE60027F8A5 /* PBXTextBookmark */;
@@ -83,6 +82,9 @@
1237561D13D823130027F8A5 /* PBXTextBookmark */ = 1237561D13D823130027F8A5 /* PBXTextBookmark */;
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,8 +96,6 @@
12D15FE813D3634F00ABAAF4 /* PBXTextBookmark */ = 12D15FE813D3634F00ABAAF4 /* PBXTextBookmark */;
12E9C0AA13D95C2F0096128F /* PBXTextBookmark */ = 12E9C0AA13D95C2F0096128F /* PBXTextBookmark */;
12E9C0BD13D95F8F0096128F /* PBXTextBookmark */ = 12E9C0BD13D95F8F0096128F /* PBXTextBookmark */;
- 12E9C0BF13D95F8F0096128F /* PBXTextBookmark */ = 12E9C0BF13D95F8F0096128F /* PBXTextBookmark */;
- 12E9C0F013D961D90096128F /* PBXTextBookmark */ = 12E9C0F013D961D90096128F /* PBXTextBookmark */;
12EDC2D91376FCB300937D70 /* PBXTextBookmark */ = 12EDC2D91376FCB300937D70 /* PBXTextBookmark */;
12EE45C013D896210092C48C /* PBXTextBookmark */ = 12EE45C013D896210092C48C /* PBXTextBookmark */;
12FBE8FA13D89F1700E385CB /* PBXTextBookmark */ = 12FBE8FA13D89F1700E385CB /* PBXTextBookmark */;
@@ -124,15 +124,15 @@
vrLen = 799;
vrLoc = 2489;
};
- 120E55C813D8694A00E2D592 /* PBXTextBookmark */ = {
+ 1217E1F813D96F3800800327 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 012E60FB137AC68F00E35218 /* smbios.c */;
- name = "smbios.c: 871";
+ fRef = 012E60F8137AC68F00E35218 /* smbios_decode.c */;
+ name = "smbios_decode.c: 12";
rLen = 0;
- rLoc = 28721;
+ rLoc = 243;
rType = 0;
- vrLen = 668;
- vrLoc = 28624;
+ vrLen = 343;
+ vrLoc = 0;
};
122A5BB51375B61C00795FF0 /* Source Control */ = {
isa = PBXSourceControlManager;
@@ -178,16 +178,6 @@
vrLen = 570;
vrLoc = 0;
};
- 1237560313D81EE60027F8A5 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 012E60F8137AC68F00E35218 /* smbios_decode.c */;
- name = "smbios_decode.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 810;
- vrLoc = 0;
- };
1237560613D81EE60027F8A5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B0056D5B11F3868000754B65 /* pci.c */;
@@ -278,6 +268,36 @@
vrLen = 1037;
vrLoc = 20605;
};
+ 1282533913D96A7000820E2D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 6DBAFD1513B0D21E0047ED33 /* modules.h */;
+ name = "modules.h: 90";
+ rLen = 10;
+ rLoc = 2190;
+ rType = 0;
+ 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,26 +408,6 @@
vrLen = 1105;
vrLoc = 12611;
};
- 12E9C0BF13D95F8F0096128F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6DBAFD1513B0D21E0047ED33 /* modules.h */;
- name = "modules.h: 90";
- rLen = 10;
- rLoc = 2190;
- rType = 0;
- vrLen = 1133;
- vrLoc = 1781;
- };
- 12E9C0F013D961D90096128F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 6DBAFD1513B0D21E0047ED33 /* modules.h */;
- name = "modules.h: 90";
- rLen = 10;
- rLoc = 2190;
- rType = 0;
- vrLen = 1132;
- vrLoc = 1781;
- };
12EDC2D91376FCB300937D70 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = B0056D3911F3868000754B65 /* device_tree.c */;
@@ -447,9 +447,9 @@
};
6DBAFD1513B0D21E0047ED33 /* modules.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {877, 1547}}";
+ sepNavIntBoundsRect = "{{0, 0}, {877, 1495}}";
sepNavSelRange = "{2190, 10}";
- sepNavVisRange = "{1781, 1132}";
+ sepNavVisRange = "{1781, 1131}";
};
};
6DBAFD6C13B0D4590047ED33 /* IOAudioDebug.h */ = {
@@ -539,9 +539,9 @@
};
B0056D3711F3868000754B65 /* device_inject.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {713, 4706}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{1448, 604}";
+ sepNavIntBoundsRect = "{{0, 0}, {782, 4706}}";
+ sepNavSelRange = "{659, 0}";
+ sepNavVisRange = "{528, 744}";
};
};
B0056D3911F3868000754B65 /* device_tree.c */ = {
@@ -637,9 +637,9 @@
};
B0056D6511F3868000754B65 /* SMBIOS.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {782, 6318}}";
- sepNavSelRange = "{14808, 14}";
- sepNavVisRange = "{14080, 936}";
+ sepNavIntBoundsRect = "{{0, 0}, {782, 6305}}";
+ sepNavSelRange = "{4247, 9}";
+ sepNavVisRange = "{3612, 875}";
};
};
B0056D6811F3868000754B65 /* spd.c */ = {
Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3
===================================================================
--- branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1207)
+++ branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1208)
@@ -309,12 +309,14 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- modules.h
+ smbios_decode.c
PBXSplitModuleInNavigatorKey
Split0
@@ -322,11 +324,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- modules.h
+ smbios_decode.c
_historyCapacity
0
bookmark
- 12E9C0F013D961D90096128F
+ 1217E1F813D96F3800800327
history
122A5BCA1375C49300795FF0
@@ -344,7 +346,6 @@
1208BED013D70B8900694228
1208BED513D710A600694228
1237560213D81EE60027F8A5
- 1237560313D81EE60027F8A5
1237560613D81EE60027F8A5
1237560713D81EE60027F8A5
1237560813D81EE60027F8A5
@@ -354,12 +355,13 @@
1237561D13D823130027F8A5
12375A2913D82FD80027F8A5
12375A3C13D831AB0027F8A5
- 120E55C813D8694A00E2D592
12EE45C013D896210092C48C
12FBE8FA13D89F1700E385CB
12E9C0AA13D95C2F0096128F
12E9C0BD13D95F8F0096128F
- 12E9C0BF13D95F8F0096128F
+ 1282533913D96A7000820E2D
+ 1282534B13D96C3B00820E2D
+ 1282535013D96C7100820E2D
SplitCount
@@ -371,18 +373,16 @@
GeometryConfiguration
Frame
- {{0, 0}, {938, 333}}
+ {{0, 0}, {938, 303}}
RubberWindowFrame
294 219 1146 659 0 0 1440 878
Module
PBXNavigatorGroup
Proportion
- 333pt
+ 303pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -393,14 +393,14 @@
GeometryConfiguration
Frame
- {{0, 338}, {938, 280}}
+ {{0, 308}, {938, 310}}
RubberWindowFrame
294 219 1146 659 0 0 1440 878
Module
XCDetailModule
Proportion
- 280pt
+ 310pt
Proportion
@@ -419,9 +419,9 @@
TableOfContents
- 12E9C0F113D961D90096128F
+ 1217E1F913D96F3800800327
1CE0B1FE06471DED0097A5F4
- 12E9C0F213D961D90096128F
+ 1217E1FA13D96F3800800327
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -559,7 +559,6 @@
5
WindowOrderList
- 1C530D57069F1CE1000CFCEE
122A5BB81375BA4700795FF0
/Users/slice/Projects/Chameleons/chameleon/branches/slice/trunkM/Chameleon.xcodeproj
@@ -641,7 +640,7 @@
TableOfContents
122A5BB81375BA4700795FF0
- 12E9C0EC13D961D60096128F
+ 1217E1FB13D96F3800800327
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -774,12 +773,14 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CDD528C0622207200134675
PBXProjectModuleLabel
-
+ device_inject.c
StatusBarVisibility
@@ -800,8 +801,6 @@
431pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -837,8 +836,8 @@
TableOfContents
1C530D57069F1CE1000CFCEE
- 12E9C0EE13D961D60096128F
- 12E9C0EF13D961D60096128F
+ 1282534913D96C3900820E2D
+ 1282534A13D96C3900820E2D
1CDD528C0622207200134675
1CD0528E0623707200166675
Index: branches/slice/trunkM/i386/libsaio/device_inject.c
===================================================================
--- branches/slice/trunkM/i386/libsaio/device_inject.c (revision 1207)
+++ branches/slice/trunkM/i386/libsaio/device_inject.c (revision 1208)
@@ -35,7 +35,7 @@
*len = string->length;
return devprop_generate_string(string);
}
- verbose("efi_inject_get_devprop_string NULL trying stringdata\n");
+// verbose("efi_inject_get_devprop_string NULL trying stringdata\n");
return NULL;
}
@@ -49,8 +49,8 @@
/* Generate devprop string.
*/
- uint32_t strlength;
- char *string = efi_inject_get_devprop_string(&strlength);
+// uint32_t strlength;
+ char *string = efi_inject_get_devprop_string(&stringlength);
/* Use the static "device-properties" boot config key contents if available,
* otheriwse use the generated one.
@@ -58,7 +58,7 @@
if (!getValueForKey(kDeviceProperties, &val, &cnt, &bootInfo->chameleonConfig) && string)
{
val = (const char*)string;
- cnt = strlength * 2;
+ cnt = stringlength * 2;
}
if (cnt > 1)
Index: branches/slice/trunkM/i386/libsaio/smbios.c
===================================================================
--- branches/slice/trunkM/i386/libsaio/smbios.c (revision 1207)
+++ branches/slice/trunkM/i386/libsaio/smbios.c (revision 1208)
@@ -11,7 +11,7 @@
#include "smbios_getters.h"
#ifndef DEBUG_SMBIOS
-#define DEBUG_SMBIOS 1
+#define DEBUG_SMBIOS 0
#endif
#if DEBUG_SMBIOS
@@ -893,6 +893,7 @@
uint8_t *structPtr = (uint8_t *)eps->dmi.tableAddress;
SMBStructHeader *structHeader = (SMBStructHeader *)structPtr;
SMBByte tmp = 0;
+ SMBWord tmpW = 0;
int dimmnbr = 0;
Platform->DMI.MaxMemorySlots = 0;
@@ -914,11 +915,11 @@
//Slice - values from DMI/SMBIOS are defined correct if overclocked
// do not need in complex MSR calculation
case kSMBTypeProcessorInformation:
- tmp = ((SMBProcessorInformation *)structHeader)->externalClock;
- Platform->CPU.FSBFrequency = tmp * MEGA + (tmp & 7) * 110000; //According to Intel 133->133.33MHz
- tmp = ((SMBProcessorInformation *)structHeader)->currentClock;
- Platform->CPU.CPUFrequency = tmp * MEGA + (tmp & 7) * 110000;
- DBG("From SMBIOS: FSB=%d CPU=%d\n", Platform->CPU.FSBFrequency, Platform->CPU.CPUFrequency);
+ tmpW = ((SMBProcessorInformation *)structHeader)->externalClock;
+ Platform->CPU.FSBFrequency = tmpW * MEGA + (tmpW & 7) * 110000; //According to Intel 133->133.33MHz
+ tmpW = ((SMBProcessorInformation *)structHeader)->currentClock;
+ Platform->CPU.CPUFrequency = tmpW * MEGA + (tmpW & 7) * 110000;
+ msglog("From SMBIOS: FSB=%d CPU=%d\n", Platform->CPU.FSBFrequency, Platform->CPU.CPUFrequency);
break;
case kSMBTypePhysicalMemoryArray:
Index: branches/slice/trunkM/i386/libsaio/smbios_decode.c
===================================================================
--- branches/slice/trunkM/i386/libsaio/smbios_decode.c (revision 1207)
+++ branches/slice/trunkM/i386/libsaio/smbios_decode.c (revision 1208)
@@ -9,7 +9,7 @@
#include "smbios.h"
#ifndef DEBUG_SMBIOS
-#define DEBUG_SMBIOS 1
+#define DEBUG_SMBIOS 0
#endif
#if DEBUG_SMBIOS
@@ -59,7 +59,7 @@
if (minorVersion < 4 || structHeader->header.length < 27)
return;
- DBG("\tskuNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->skuNumber));
+// DBG("\tskuNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->skuNumber));
DBG("\tfamily: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->family));
DBG("\n");
}
@@ -72,9 +72,9 @@
DBG("BaseBoard:\n");
DBG("\tmanufacturer: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->manufacturer));
DBG("\tproduct: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->product));
- DBG("\tversion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->version));
+// DBG("\tversion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->version));
DBG("\tserialNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->serialNumber));
- DBG("\tassetTagNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTagNumber));
+// DBG("\tassetTagNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTagNumber));
DBG("\tlocationInChassis: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->locationInChassis));
DBG("\tboardType: 0x%X\n", structHeader->boardType);
DBG("\n");
@@ -88,7 +88,7 @@
DBG("SystemEnclosure:\n");
DBG("\tmanufacturer: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->manufacturer));
DBG("\ttype: %d\n", structHeader->type);
- DBG("\tversion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->version));
+// DBG("\tversion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->version));
DBG("\tserialNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->serialNumber));
DBG("\tassetTagNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTagNumber));
DBG("\n");
@@ -105,16 +105,16 @@
DBG("\tprocessorFamily: 0x%X\n", structHeader->processorFamily);
DBG("\tmanufacturer: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->manufacturer));
DBG("\tprocessorID: 0x%llX\n", structHeader->processorID);
- DBG("\tprocessorVersion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->processorVersion));
+// DBG("\tprocessorVersion: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->processorVersion));
DBG("\texternalClock: %dMHz\n", structHeader->externalClock);
DBG("\tmaximumClock: %dMHz\n", structHeader->maximumClock);
DBG("\tcurrentClock: %dMHz\n", structHeader->currentClock);
if (minorVersion < 3 || structHeader->header.length < 35)
return;
- DBG("\tserialNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->serialNumber));
- DBG("\tassetTag: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTag));
- DBG("\tpartNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->partNumber));
+// DBG("\tserialNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->serialNumber));
+// DBG("\tassetTag: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->assetTag));
+// DBG("\tpartNumber: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->partNumber));
DBG("\n");
}
@@ -125,7 +125,7 @@
{
DBG("MemoryDevice:\n");
DBG("\tdeviceLocator: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->deviceLocator));
- DBG("\tbankLocator: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->bankLocator));
+// DBG("\tbankLocator: %s\n", getSMBStringForField((SMBStructHeader *)structHeader, structHeader->bankLocator));
DBG("\tmemoryType: %s\n", SMBMemoryDeviceTypes[structHeader->memoryType]);
if (minorVersion < 3 || structHeader->header.length < 27)
Index: branches/slice/trunkM/revision
===================================================================
--- branches/slice/trunkM/revision (revision 1207)
+++ branches/slice/trunkM/revision (revision 1208)
@@ -1 +1 @@
-1206
\ No newline at end of file
+1206:1207
\ No newline at end of file