Chameleon

Chameleon Commit Details

Date:2011-07-30 22:36:48 (12 years 8 months ago)
Author:Azimutz
Commit:1242
Parents: 1241
Message:Replace the r1219 "force 2 ports" workaround by a booter option. Fix a typo on boot.c.
Changes:
M/trunk/doc/BootHelp.txt
M/trunk/i386/boot2/boot.c
M/trunk/i386/boot2/boot.h
M/trunk/CHANGES
M/trunk/i386/libsaio/ati.c

File differences

trunk/i386/libsaio/ati.c
568568
569569
570570
571
571
572572
573573
574574
......
11261126
11271127
11281128
1129
1130
1131
1132
1129
1130
1131
1132
1133
11331134
11341135
11351136
......
11821183
11831184
11841185
1185
1186
11861187
11871188
11881189
......
11901191
11911192
11921193
1193
1194
11941195
11951196
11961197
......
12051206
12061207
12071208
1208
1209
1210
1211
1209
1210
1211
12121212
12131213
12141214
#define FLAGTRUE␉␉␉MKFLAG(0)␊
#define EVERGREEN␉␉␉MKFLAG(1)␊
␊
static uint8_t atN = 0;␊
//static uint8_t atN = 0;␊
␊
typedef struct {␊
␉type_t␉␉␉␉␉type;␊
␊
static bool init_card(pci_dt_t *pci_dev)␊
{␊
␉char name[24];␊
␉char name_parent[24];␊
␉int i;␊
␉bool add_vbios = true;␊
␉bool␉add_vbios = true;␊
␉char␉name[24];␊
␉char␉name_parent[24];␊
␉int␉␉i;␊
␉int␉␉n_ports = 0;␊
␉␊
␉card = malloc(sizeof(card_t));␊
␉if (!card)␊
␉␉}␊
␉}␊
␉␊
␉card->ports = 2; // default␊
//␉card->ports = 2; // default␊
␉␊
␉if (card->info->chip_family >= CHIP_FAMILY_CEDAR)␊
␉{␊
␉␉card->ports = 3;␊
␉}␊
␉␊
␉atN = 0;␊
//␉atN = 0;␊
␉␊
␉card->cfg_name = getStringForKey(kAtiConfig, &bootInfo->chameleonConfig);␊
␉if (!card->cfg_name)␊
␉␉␉␉card->ports = card_configs[i].ports;␊
␉}␊
␉␊
␉//Azi: http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402␊
␉// get around this...␊
␉if (pci_dev->device_id == 0x9552 && pci_dev->subsys_id.subsys_id == 0x04341028 )␊
␉␉card->ports = 2;␊
␉getIntForKey(kAtiPorts, &n_ports, &bootInfo->bootConfig);␊
␉if (n_ports > 0)␊
␉␉card->ports = n_ports;␊
␉␊
␉sprintf(name, "ATY,%s", card->cfg_name);␊
␉aty_name.type = kStr;␊
trunk/i386/boot2/boot.c
441441
442442
443443
444
445
444
446445
447446
448447
␉␉␉}␊
␉␉}␊
␊
␊
␉␉// Notify moduals that we are attempting to boot␊
␉␉// Notify modules that we are attempting to boot␊
␉␉execute_hook("PreBoot", NULL, NULL, NULL, NULL);␊
␊
␉␉if (!getBoolForKey (kWake, &tryresume, &bootInfo->chameleonConfig)) {␊
trunk/i386/boot2/boot.h
108108
109109
110110
111
111112
112113
113114
␊
#define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉/* ati.c */␊
#define kAtiConfig␉␉␉"AtiConfig"␉␉␉/* ati.c */␊
#define kAtiPorts␉␉␉"AtiPorts"␉␉␉/* ati.c */␊
#define kATYbinimage␉␉"ATYbinimage"␉␉/* ati.c */␊
␊
#define kUseNvidiaROM␉␉"UseNvidiaROM"␉␉/* nvidia.c */␊
trunk/doc/BootHelp.txt
7272
7373
7474
75
75
76
7677
7778
7879
ignore /E/E and /S/L/E/Extensions.mkext.␊
␊
GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards.␊
AtiConfig=<cardcfg> Use a different card config␊
AtiConfig=<cardcfg> Use a different card config, e.g. AtiConfig=Megalodon.␊
AtiPorts=<value> Specify the number of ports, e.g. AtiPorts=2.␊
UseAtiROM=Yes|No Use an alternate Ati ROM image␊
(path: /Extra/<vendorid>_<devid>_<subsysid>.rom)␊
UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image␊
trunk/CHANGES
1
2
3
4
15
26
37
- Added AtiPorts option to GraphicsEnabler, so users can override the default number of ports. It proved␊
to be useful when used to limit the number of ports that a framebuffer registers, which seems to be a␊
requirement on laptops that can only use 2 ports at the same time. Thanks to AniV for the tip:␊
http://forum.voodooprojects.org/index.php/topic,1959.msg10402.html#msg10402␊
- Added NVidia ION AHCI controllers dev id to AHCIPortInjector kext.␊
Forgot to mention source on the commit: http://forum.voodooprojects.org/index.php/topic,1170.0.html␊
- Renamed com.apple.Boot.plist to org.chameleon.Boot.plist.␊

Archive Download the corresponding diff file

Revision: 1242