Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser =================================================================== --- branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1199) +++ branches/slice/trunkM/Chameleon.xcodeproj/slice.pbxuser (revision 1200) @@ -2,16 +2,16 @@ { 012E60F8137AC68F00E35218 /* smbios_decode.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {887, 3029}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 810}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 3094}}"; + sepNavSelRange = "{787, 16}"; + sepNavVisRange = "{269, 1564}"; }; }; 012E60F9137AC68F00E35218 /* smbios_getters.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1454, 6851}}"; - sepNavSelRange = "{13684, 0}"; - sepNavVisRange = "{6233, 612}"; + sepNavIntBoundsRect = "{{0, 0}, {1454, 6461}}"; + sepNavSelRange = "{12199, 0}"; + sepNavVisRange = "{12658, 1029}"; }; }; 012E60FA137AC68F00E35218 /* smbios_getters.h */ = { @@ -23,9 +23,9 @@ }; 012E60FB137AC68F00E35218 /* smbios.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {877, 12376}}"; - sepNavSelRange = "{27806, 9}"; - sepNavVisRange = "{27294, 696}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 12870}}"; + sepNavSelRange = "{28671, 0}"; + sepNavVisRange = "{28624, 668}"; sepNavWindowFrame = "{{15, 60}, {889, 813}}"; }; }; @@ -63,12 +63,15 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 332935263; - PBXWorkspaceStateSaveDate = 332935263; + PBXPerProjectTemplateStateSaveDate = 332949013; + PBXWorkspaceStateSaveDate = 332949013; }; perUserProjectItems = { 1208BED013D70B8900694228 /* PBXTextBookmark */ = 1208BED013D70B8900694228 /* PBXTextBookmark */; 1208BED513D710A600694228 /* PBXTextBookmark */ = 1208BED513D710A600694228 /* PBXTextBookmark */; + 120E55C813D8694A00E2D592 /* PBXTextBookmark */ = 120E55C813D8694A00E2D592 /* PBXTextBookmark */; + 120E55C913D8694A00E2D592 /* PBXTextBookmark */ = 120E55C913D8694A00E2D592 /* PBXTextBookmark */; + 120E55CA13D8694A00E2D592 /* PBXTextBookmark */ = 120E55CA13D8694A00E2D592 /* PBXTextBookmark */; 122A5BCA1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCA1375C49300795FF0 /* PBXTextBookmark */; 122A5BCB1375C49300795FF0 /* PBXTextBookmark */ = 122A5BCB1375C49300795FF0 /* PBXTextBookmark */; 1237521013D814370027F8A5 /* PBXTextBookmark */ = 1237521013D814370027F8A5 /* PBXTextBookmark */; @@ -79,15 +82,12 @@ 1237560813D81EE60027F8A5 /* PBXTextBookmark */ = 1237560813D81EE60027F8A5 /* PBXTextBookmark */; 1237560913D81EE60027F8A5 /* PBXTextBookmark */ = 1237560913D81EE60027F8A5 /* PBXTextBookmark */; 1237560A13D81EE60027F8A5 /* PBXTextBookmark */ = 1237560A13D81EE60027F8A5 /* PBXTextBookmark */; - 1237560B13D81EE60027F8A5 /* PBXTextBookmark */ = 1237560B13D81EE60027F8A5 /* PBXTextBookmark */; - 1237560C13D81EE60027F8A5 /* PBXTextBookmark */ = 1237560C13D81EE60027F8A5 /* PBXTextBookmark */; 1237560D13D81EE60027F8A5 /* PBXTextBookmark */ = 1237560D13D81EE60027F8A5 /* PBXTextBookmark */; 1237561D13D823130027F8A5 /* PBXTextBookmark */ = 1237561D13D823130027F8A5 /* PBXTextBookmark */; - 12375A1613D82F2C0027F8A5 /* PBXTextBookmark */ = 12375A1613D82F2C0027F8A5 /* PBXTextBookmark */; 12375A2913D82FD80027F8A5 /* PBXTextBookmark */ = 12375A2913D82FD80027F8A5 /* PBXTextBookmark */; 12375A3C13D831AB0027F8A5 /* PBXTextBookmark */ = 12375A3C13D831AB0027F8A5 /* PBXTextBookmark */; - 12375A3D13D831AB0027F8A5 /* PBXTextBookmark */ = 12375A3D13D831AB0027F8A5 /* PBXTextBookmark */; - 12375A3E13D831AB0027F8A5 /* PBXTextBookmark */ = 12375A3E13D831AB0027F8A5 /* PBXTextBookmark */; + 1272D14613D860AF00EDABD3 /* PBXTextBookmark */ = 1272D14613D860AF00EDABD3 /* PBXTextBookmark */; + 1272D14713D860AF00EDABD3 /* PBXTextBookmark */ = 1272D14713D860AF00EDABD3 /* PBXTextBookmark */; 1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */ = 1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */; 1284EEF913D6F95000A6BE87 /* PBXTextBookmark */ = 1284EEF913D6F95000A6BE87 /* PBXTextBookmark */; 128EB70A13D31D3900E0DA4B /* PBXTextBookmark */ = 128EB70A13D31D3900E0DA4B /* PBXTextBookmark */; @@ -130,6 +130,33 @@ path = "/Users/slice/Projects/Apple/AppleSMBIOS-41/AppleSMBIOS.cpp"; sourceTree = ""; }; + 120E55C813D8694A00E2D592 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 012E60FB137AC68F00E35218 /* smbios.c */; + name = "smbios.c: 871"; + rLen = 0; + rLoc = 28671; + rType = 0; + vrLen = 668; + vrLoc = 28624; + }; + 120E55C913D8694A00E2D592 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B0056D5F11F3868000754B65 /* pci_setup.c */; + rLen = 14; + rLoc = 2159; + rType = 0; + }; + 120E55CA13D8694A00E2D592 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = B0056D5F11F3868000754B65 /* pci_setup.c */; + name = "pci_setup.c: 91"; + rLen = 14; + rLoc = 2159; + rType = 0; + vrLen = 616; + vrLoc = 1671; + }; 122A5BB51375B61C00795FF0 /* Source Control */ = { isa = PBXSourceControlManager; fallbackIsa = XCSourceControlManager; @@ -244,26 +271,6 @@ vrLen = 1039; vrLoc = 3039; }; - 1237560B13D81EE60027F8A5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 012E60F9137AC68F00E35218 /* smbios_getters.c */; - name = "smbios_getters.c: 497"; - rLen = 0; - rLoc = 13684; - rType = 0; - vrLen = 612; - vrLoc = 6233; - }; - 1237560C13D81EE60027F8A5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B0056D5F11F3868000754B65 /* pci_setup.c */; - name = "pci_setup.c: 24"; - rLen = 19; - rLoc = 470; - rType = 0; - vrLen = 829; - vrLoc = 160; - }; 1237560D13D81EE60027F8A5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = B0056CF711F3868000754B65 /* boot.h */; @@ -284,16 +291,6 @@ vrLen = 774; vrLoc = 477; }; - 12375A1613D82F2C0027F8A5 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = B0056D2611F3868000754B65 /* acpi_patcher.c */; - name = "acpi_patcher.c: 823"; - rLen = 19; - rLoc = 28073; - rType = 0; - vrLen = 987; - vrLoc = 27547; - }; 12375A2913D82FD80027F8A5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 012E60FA137AC68F00E35218 /* smbios_getters.h */; @@ -314,22 +311,25 @@ vrLen = 1037; vrLoc = 20605; }; - 12375A3D13D831AB0027F8A5 /* PBXTextBookmark */ = { + 1272D14613D860AF00EDABD3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 012E60FB137AC68F00E35218 /* smbios.c */; - rLen = 9; - rLoc = 27806; + fRef = B0056D2611F3868000754B65 /* acpi_patcher.c */; + name = "acpi_patcher.c: 1344"; + rLen = 7; + rLoc = 44190; rType = 0; + vrLen = 815; + vrLoc = 43404; }; - 12375A3E13D831AB0027F8A5 /* PBXTextBookmark */ = { + 1272D14713D860AF00EDABD3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 012E60FB137AC68F00E35218 /* smbios.c */; - name = "smbios.c: 836"; - rLen = 9; - rLoc = 27806; + fRef = 012E60F9137AC68F00E35218 /* smbios_getters.c */; + name = "smbios_getters.c: 460"; + rLen = 0; + rLoc = 12199; rType = 0; - vrLen = 696; - vrLoc = 27294; + vrLen = 1029; + vrLoc = 12658; }; 1284EEE713D6F35E00A6BE87 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -433,9 +433,9 @@ }; 6DBAFD1413B0D21E0047ED33 /* modules.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {950, 14807}}"; - sepNavSelRange = "{5464, 24}"; - sepNavVisRange = "{3798, 521}"; + sepNavIntBoundsRect = "{{0, 0}, {950, 14690}}"; + sepNavSelRange = "{6994, 7}"; + sepNavVisRange = "{6030, 672}"; }; }; B0056CF611F3868000754B65 /* boot.c */ = { @@ -475,9 +475,9 @@ }; B0056D2611F3868000754B65 /* acpi_patcher.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {877, 17485}}"; - sepNavSelRange = "{28073, 19}"; - sepNavVisRange = "{27547, 987}"; + sepNavIntBoundsRect = "{{0, 0}, {803, 17992}}"; + sepNavSelRange = "{349, 0}"; + sepNavVisRange = "{0, 549}"; sepNavWindowFrame = "{{15, 60}, {889, 813}}"; }; }; @@ -539,9 +539,9 @@ }; B0056D3F11F3868000754B65 /* fake_efi.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 11167}}"; - sepNavSelRange = "{28916, 0}"; - sepNavVisRange = "{30020, 333}"; + sepNavIntBoundsRect = "{{0, 0}, {1321, 11089}}"; + sepNavSelRange = "{30110, 23}"; + sepNavVisRange = "{29309, 1140}"; }; }; B0056D4011F3868000754B65 /* fake_efi.h */ = { @@ -588,9 +588,9 @@ }; B0056D5F11F3868000754B65 /* pci_setup.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {877, 1300}}"; - sepNavSelRange = "{470, 19}"; - sepNavVisRange = "{160, 829}"; + sepNavIntBoundsRect = "{{0, 0}, {877, 1196}}"; + sepNavSelRange = "{2159, 14}"; + sepNavVisRange = "{1671, 616}"; }; }; B0056D6011F3868000754B65 /* platform.c */ = { @@ -635,6 +635,20 @@ sepNavVisRange = "{12099, 456}"; }; }; + B0056D7111F3868000754B65 /* usb.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {866, 4706}}"; + sepNavSelRange = "{567, 14}"; + sepNavVisRange = "{532, 695}"; + }; + }; + B0056D7411F3868000754B65 /* xml.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {782, 15561}}"; + sepNavSelRange = "{9431, 7}"; + sepNavVisRange = "{9086, 897}"; + }; + }; B0056D7F11F3868000754B65 /* CREDITS */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {782, 442}}"; Index: branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 =================================================================== --- branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1199) +++ branches/slice/trunkM/Chameleon.xcodeproj/slice.mode1v3 (revision 1200) @@ -272,14 +272,14 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 85 + 86 11 3 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 1021}, {186, 600}} + {{0, 1052}, {186, 600}} PBXTopSmartGroupGIDs @@ -309,14 +309,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - smbios.c + pci_setup.c PBXSplitModuleInNavigatorKey Split0 @@ -324,11 +322,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - smbios.c + pci_setup.c _historyCapacity 0 bookmark - 12375A3E13D831AB0027F8A5 + 120E55CA13D8694A00E2D592 history 122A5BCA1375C49300795FF0 @@ -353,14 +351,14 @@ 1237560813D81EE60027F8A5 1237560913D81EE60027F8A5 1237560A13D81EE60027F8A5 - 1237560B13D81EE60027F8A5 - 1237560C13D81EE60027F8A5 1237560D13D81EE60027F8A5 1237561D13D823130027F8A5 - 12375A1613D82F2C0027F8A5 12375A2913D82FD80027F8A5 12375A3C13D831AB0027F8A5 - 12375A3D13D831AB0027F8A5 + 1272D14613D860AF00EDABD3 + 1272D14713D860AF00EDABD3 + 120E55C813D8694A00E2D592 + 120E55C913D8694A00E2D592 SplitCount @@ -372,16 +370,18 @@ GeometryConfiguration Frame - {{0, 0}, {938, 399}} + {{0, 0}, {938, 384}} RubberWindowFrame 294 219 1146 659 0 0 1440 878 Module PBXNavigatorGroup Proportion - 399pt + 384pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -392,14 +392,14 @@ GeometryConfiguration Frame - {{0, 404}, {938, 214}} + {{0, 389}, {938, 229}} RubberWindowFrame 294 219 1146 659 0 0 1440 878 Module XCDetailModule Proportion - 214pt + 229pt Proportion @@ -418,9 +418,9 @@ TableOfContents - 12375A3F13D831AB0027F8A5 + 120E55CB13D8694A00E2D592 1CE0B1FE06471DED0097A5F4 - 12375A4013D831AB0027F8A5 + 120E55CC13D8694A00E2D592 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -640,7 +640,7 @@ TableOfContents 122A5BB81375BA4700795FF0 - 12375A3513D831A70027F8A5 + 120E55BE13D8694400E2D592 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -773,8 +773,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -801,6 +799,8 @@ 431pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -836,8 +836,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 12375A3A13D831A70027F8A5 - 12375A3B13D831A70027F8A5 + 120E55C613D8694400E2D592 + 120E55C713D8694400E2D592 1CDD528C0622207200134675 1CD0528E0623707200166675 Index: branches/slice/trunkM/i386/libsaio/acpi_patcher.c =================================================================== --- branches/slice/trunkM/i386/libsaio/acpi_patcher.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/acpi_patcher.c (revision 1200) @@ -16,7 +16,7 @@ #include "smbios_getters.h" #ifndef DEBUG_ACPI -#define DEBUG_ACPI 0 +#define DEBUG_ACPI 1 #endif #if DEBUG_ACPI==2 Index: branches/slice/trunkM/i386/libsaio/usb.c =================================================================== --- branches/slice/trunkM/i386/libsaio/usb.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/usb.c (revision 1200) @@ -13,11 +13,11 @@ #include "pci.h" #ifndef DEBUG_USB -#define DEBUG_USB 0 +#define DEBUG_USB 1 #endif #if DEBUG_USB -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif Index: branches/slice/trunkM/i386/libsaio/pci_setup.c =================================================================== --- branches/slice/trunkM/i386/libsaio/pci_setup.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/pci_setup.c (revision 1200) @@ -90,7 +90,6 @@ execute_hook("PCIDevice", current, NULL, NULL, NULL); DBG("setup_pci_devs current devID=%08x\n", current->device_id); setup_pci_devs(current->children); - DBG("setup_pci_devs children devID=%08x\n", current->device_id); current = current->next; } } Index: branches/slice/trunkM/i386/libsaio/smbios.c =================================================================== --- branches/slice/trunkM/i386/libsaio/smbios.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/smbios.c (revision 1200) @@ -868,10 +868,20 @@ DmiTablePair[i].dmi && DmiTablePair[i].dmi->length >= minlength ) { current_pos = i+1; +#if DEBUG_SMBIOS + DBG("SMBIOS table type %d found\n", type); + printf("Press a key to continue... (DEBUG)\n"); + getchar(); +#endif + return DmiTablePair[i].dmi; } } DBG("SMBIOS table type %d not found\n", type); +#if DEBUG_ACPI + printf("Press a key to continue... (DEBUG)\n"); + getchar(); +#endif return NULL; // not found }; Index: branches/slice/trunkM/i386/libsaio/fake_efi.c =================================================================== --- branches/slice/trunkM/i386/libsaio/fake_efi.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/fake_efi.c (revision 1200) @@ -736,18 +736,23 @@ //Slice - remember globals Platform = (PlatformInfo_t *)gPlatform; root_pci_dev = (pci_dt_t*)gRootPCIDev; + setup_pci_devs(root_pci_dev); + smbios_p = (EFI_PTR32)getSmbios(SMBIOS_ORIGINAL); #if DEBUG - verbose("2:Platform=%x root_pci=%x\n", Platform, root_pci_dev); + verbose("SMBIOS_ORIGINAL=%x \n", smbios_p); #endif - setup_pci_devs(root_pci_dev); - smbios_p = (EFI_PTR32)getSmbios(SMBIOS_ORIGINAL); + getSmbiosTableStructure((void*)(EFI_PTR32)smbios_p); readSMBIOSInfo((void*)(EFI_PTR32)smbios_p); // load smbios.plist file if any - setupSmbiosConfigFile("smbios.plist"); + setupSmbiosConfigFile("smbios.plist"); setupSMBIOSTable(); +#if DEBUG + verbose("SMBIOS_PATCHED=%x smbios_p=%x\n", getSmbios(SMBIOS_PATCHED), smbios_p); + getchar(); +#endif // Initialize the base table if (archCpuType == CPU_TYPE_I386) Index: branches/slice/trunkM/i386/libsaio/smbios_getters.c =================================================================== --- branches/slice/trunkM/i386/libsaio/smbios_getters.c (revision 1199) +++ branches/slice/trunkM/i386/libsaio/smbios_getters.c (revision 1200) @@ -9,11 +9,11 @@ #include "bootstruct.h" #ifndef DEBUG_SMBIOS -#define DEBUG_SMBIOS 0 +#define DEBUG_SMBIOS 1 #endif #if DEBUG_SMBIOS -#define DBG(x...) printf(x) +#define DBG(x...) verbose(x) #else #define DBG(x...) #endif @@ -457,7 +457,7 @@ continue; } //TODO validate -#if 0 //NOTYET +#if DEBUG_SMBIOS msglog("Platform CPU Info:\n FSB=%d\n MaxSpeed=%d\n CurrentSpeed=%d\n", Platform->CPU.FSBFrequency/MEGA, Platform->CPU.TSCFrequency/MEGA, Platform->CPU.CPUFrequency/MEGA); if ((cpuInfo->externalClock) && (cpuInfo->externalClock < 400)) { //<400MHz Index: branches/slice/trunkM/i386/boot2/modules.c =================================================================== --- branches/slice/trunkM/i386/boot2/modules.c (revision 1199) +++ branches/slice/trunkM/i386/boot2/modules.c (revision 1200) @@ -4,7 +4,7 @@ */ #ifdef CONFIG_MODULES #ifndef CONFIG_MODULE_DEBUG -#define CONFIG_MODULE_DEBUG 0 +#define CONFIG_MODULE_DEBUG 1 #endif #include "boot.h" Index: branches/slice/trunkM/revision =================================================================== --- branches/slice/trunkM/revision (revision 1199) +++ branches/slice/trunkM/revision (revision 1200) @@ -1 +1 @@ -1198 \ No newline at end of file +1198:1199 \ No newline at end of file Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/decls.pbxbtree =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/cdecls.pbxbtree =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/imports.pbxbtree =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/pbxindex.header =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/refs.pbxbtree =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/symbols0.pbxsymbols =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/strings.pbxstrings/control =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/strings.pbxstrings/strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/slice/trunkM/build/Chameleon.build/Chameleon.pbxindex/files.pbxbtree =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream