Index: branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1975) +++ branches/ErmaC/Trunk/Chameleon.xcodeproj/project.pbxproj (revision 1976) @@ -1373,7 +1373,7 @@ B4526098153EFCE90018E994 /* bg.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bg.po; sourceTree = ""; }; B4526099153EFCE90018E994 /* bs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bs.po; sourceTree = ""; }; B452609A153EFCE90018E994 /* ca.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.po; sourceTree = ""; }; - B452609B153EFCE90018E994 /* chameleon.pot */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = chameleon.pot; sourceTree = ""; }; + B452609B153EFCE90018E994 /* chameleon.pot */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = chameleon.pot; sourceTree = ""; }; B452609C153EFCE90018E994 /* cs.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cs.po; sourceTree = ""; }; B452609D153EFCE90018E994 /* de.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = de.po; sourceTree = ""; }; B452609E153EFCE90018E994 /* el.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = el.po; sourceTree = ""; }; Index: branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.c (revision 1975) +++ branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.c (revision 1976) @@ -111,7 +111,7 @@ if (fd < 0) { // NOT FOUND: - verbose("ACPI table not found: %s\n", filename); + verbose("ACPI Table not found: %s\n", filename); *dirSpec = '\0'; } @@ -984,7 +984,7 @@ else { rsdp_mod->RsdtAddress=0; - printf("RSDT not found or RSDT incorrect\n"); + printf("RSDT not found or incorrect\n"); } if (version) @@ -992,7 +992,7 @@ struct acpi_2_xsdt *xsdt, *xsdt_mod; // FIXME: handle 64-bit address correctly - + xsdt=(struct acpi_2_xsdt*) ((uint32_t)rsdp->XsdtAddress); DBG("XSDT @%x;%x, Length=%d\n", (uint32_t)(rsdp->XsdtAddress>>32),(uint32_t)rsdp->XsdtAddress, xsdt->Length); Index: branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.h =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.h (revision 1975) +++ branches/ErmaC/Trunk/i386/libsaio/acpi_patcher.h (revision 1976) @@ -34,4 +34,12 @@ uint32_t Frequency; }; +/* +struct t_state +{ + uint32_t perf; + uint32_t pwer; + uint8_t ctrl; +}; +*/ #endif /* !__LIBSAIO_ACPI_PATCHER_H */ Index: branches/ErmaC/Trunk/i386/libsaio/ati.c =================================================================== --- branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1975) +++ branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1976) @@ -305,6 +305,10 @@ { 0x944E, 0x3260174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810", kMotmot }, { 0x944E, 0x3261174B, CHIP_FAMILY_RV770, "ATI Radeon HD 4810", kMotmot }, + { 0x9460, 0x27021682, CHIP_FAMILY_RV770, "ATI Radeon HD 4890", kMotmot }, + { 0x9460, 0xE115174b, CHIP_FAMILY_RV770, "ATI Radeon HD 4890", kMotmot }, + { 0x9460, 0xE118174b, CHIP_FAMILY_RV770, "ATI Radeon HD 4890", kMotmot }, + { 0x9480, 0x01211025, CHIP_FAMILY_RV730, "ATI Radeon HD 4650M", kGliff }, { 0x9480, 0x03111025, CHIP_FAMILY_RV730, "ATI Radeon HD 5165M", kNull }, { 0x9480, 0x03121025, CHIP_FAMILY_RV730, "ATI Radeon HD 5165M", kNull }, Index: branches/ErmaC/Trunk/doc/BootHelp.txt =================================================================== --- branches/ErmaC/Trunk/doc/BootHelp.txt (revision 1975) +++ branches/ErmaC/Trunk/doc/BootHelp.txt (revision 1976) @@ -25,9 +25,9 @@ Example: mach_kernel rd=disk0s1 -v "Graphics Mode"="1920x1200x32" -If the computer won't start up properly, you may be able to start it up -using safe mode. Type -x to start up in safe mode, which ignores all -cached driver files. +If the computer won't start up properly, you may be able to start it up using +safe mode. Type -x to start up in safe mode, which ignores all cached +driver files. Special booter hotkeys: ----------------------- @@ -46,10 +46,10 @@ Options useful in the org.chameleon.Boot.plist file: ---------------------------------------------------- - Wait=Yes|No Prompt for a key press before starting the kernel. - "Quiet Boot"=Yes|No Use quiet boot mode (no messages or prompt). - Timeout=8 Number of seconds to pause at the boot: prompt. - "Instant Menu"=Yes Force displaying the partition selection menu. + Wait=Yes|No Prompt for a key press before starting the kernel. + "Quiet Boot"=Yes|No Use quiet boot mode (no messages or prompt). + Timeout=8 Number of seconds to pause at the boot: prompt. + "Instant Menu"=Yes Force displaying the partition selection menu. "Default Partition" Sets the default boot partition, =hd(x,y)|UUID|"Label" Specified as a disk/partition pair, an UUID, or a @@ -79,38 +79,36 @@ KeyLayout=keymap Use to change the keyboard mapping of the bootloader (e.g. KeyLayout=mac-fr) - GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards. + GraphicsEnabler=Yes|No Automatic device-properties generation for graphics cards. AtiConfig= Use a different card config, e.g. AtiConfig=Megalodon. AtiPorts= Specify the number of ports, e.g. AtiPorts=2. - UseAtiROM=Yes|No Use an alternate Ati ROM image - (path: /Extra/__.rom) - UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image - (path: /Extra/_.rom) - VBIOS=Yes|No Inject NVIDIA VBIOS into device-properties. + UseAtiROM=Yes|No Use an alternate Ati ROM image + (default path: /Extra/__.rom) + UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image + (default path: /Extra/_.rom) + VBIOS=Yes|No Inject VBIOS to device-properties. display_0= Inject alternate value of display-cfg into NVDA,Display-A@0 (HEX). display_1= Inject alternate value of display-cfg into NVDA,Display-B@1 (HEX). - EnableHDMIAudio=Yes Inject HDMI audio for NVIDIA + EnableHDMIAudio=Yes Inject HDMI audio for NVIDIA EthernetBuiltIn=Yes|No Automatic "built-in"=yes device-properties generation for ethernet interfaces. + ForceHPET=Yes|No Force HPET on (disabled by default). - USBBusFix=Yes Enable all USB fixes below: - EHCIacquire=Yes Enable the EHCI fix (disabled by default). - UHCIreset=Yes Enable the UHCI fix (disabled by default). - USBLegacyOff=Yes Enable the USB Legacy fix (disabled by default). + USBBusFix=Yes Enable the EHCI and UHCI fixes (disabled by default). + EHCIacquire=Yes Enable the EHCI fix (disabled by default). + UHCIreset=Yes Enable the UHCI fix (disabled by default). + USBLegacyOff=Yes Force USB Legacy off (disabled by default). - ForceHPET=Yes|No Force Enable HPET. + Wake=No Disable wake up after hibernation (enbaled by default). + ForceWake=Yes Force using the sleepimage (disabled by default). + WakeImage= Use an alternate sleepimage file + (default path is /private/var/vm/sleepimage). - Wake=No Disable wake up after hibernation (default: enabled). - ForceWake=Yes Force using the sleepimage (disabled by default). - WakeImage= Use an alternate sleepimage file. - (default path is /private/var/vm/sleepimage). + DropSSDT=Yes Skip the SSDT tables while relocating the ACPI tables. + DSDT= Use an alternate DSDT.aml file + (default path: /DSDT.aml /Extra/DSDT.aml bt(0,0)/Extra/DSDT.aml). - DropSSDT=Yes Skip the SSDT tables while relocating the ACPI tables. - DSDT= Use an alternate DSDT.aml file - (default paths: - /DSDT.aml /Extra/DSDT.aml bt(0,0)/Extra/DSDT.aml). - GenerateCStates=Yes Enable auto generation of processor idle sleep states (C-States). GeneratePStates=Yes Enable auto generation of processor power performance @@ -122,17 +120,18 @@ EnableC3State=Yes Enable specific Processor power state, C3. EnableC4State=Yes Enable specific Processor power state, C4. - SMBIOS= Use an alternate SMBIOS.plist file - (default paths: - /Extra/SMBIOS.plist bt(0,0)/Extra/SMBIOS.plist). + SMBIOS= Use an alternate SMBIOS.plist file + (default path: /SMBIOS.plist /Extra/SMBIOS.plist + bt(0,0)/Extra/SMBIOS.plist). - SMBIOSdefaults=No Don't use the Default values for SMBIOS overriding. - If smbios.plist doesn't exist, factory values are kept. + SMBIOSdefaults=No Don't use the Default values for SMBIOS overriding + if smbios.plist doesn't exist, factory + values are kept. - "Scan Single Drive" Only scan the drive from which the booter got loaded. - =Yes|No Fixes rescan-problems (DVD reader in AHCI mode). - Rescan=Yes Enable CD-ROM rescan mode. - "Rescan Prompt"=Yes Prompt for enabling CD-ROM rescan mode. + "Scan Single Drive" Scan the drive only where the booter got loaded from. + =Yes|No Fix rescan issues when using a DVD reader in AHCI mode. + Rescan=Yes Enable CD-ROM rescan mode. + "Rescan Prompt"=Yes Prompts for enable CD-ROM rescan mode. SystemId= Set the system id manually to UUID. SMUUID in smbios config (reserved field) isn't used then. SystemType= Set the system type to n, where n is between 0..6