i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added exec of another coldstart script cmd...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8795 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2004-09-02 10:52:43 +00:00
parent 3aa69c787f
commit b2e882e612
1 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_info.c
+42 -9
View File
@@ -316,10 +316,11 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size)
/* execute */ /* execute */
adress += 1; adress += 1;
LOG(8,("cmd 'setup RAM config'\n")); LOG(8,("cmd 'setup RAM config' (always done)\n"));
//fixme: setup_ram_config is also used on NV11 (at least), which means the //fixme: setup_ram_config is also used on NV11 (at least), which means the
// routine should function differently there! // routine should function differently there!
if (exec) setup_ram_config(rom); /* always done */
setup_ram_config(rom);
break; break;
case 0x65: case 0x65:
*size -= 13; *size -= 13;
@@ -339,17 +340,16 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size)
adress += 4; adress += 4;
data2 = *((uint32*)(&(rom[adress]))); data2 = *((uint32*)(&(rom[adress])));
adress += 4; adress += 4;
LOG(8,("cmd 'WR 32bit REG $%08x with $%08x, then with $%08x'\n", reg, data, data2)); LOG(8,("cmd 'WR 32bit REG $%08x with $%08x, then with $%08x' (always done)\n",
if (exec) reg, data, data2));
{ /* always done */
/* alternate NV-specific access to PCI config space registers: */ /* (alternate NV-specific access to PCI config space registers:) */
safe32 = NV_REG32(0x00001800 + NVCFG_AGPCMD); safe32 = NV_REG32(0x00001800 + NVCFG_AGPCMD);
NV_REG32(0x00001800 + NVCFG_AGPCMD) = 0x00000000; NV_REG32(0x00001800 + NVCFG_AGPCMD) = 0x00000000;
NV_REG32(reg) = data; NV_REG32(reg) = data;
NV_REG32(reg) = data2; NV_REG32(reg) = data2;
NV_REG32(0x00001800 + NVCFG_AGPCMD) = safe32; NV_REG32(0x00001800 + NVCFG_AGPCMD) = safe32;
NV_REG32(0x00001800 + NVCFG_ROMSHADOW) &= 0xfffffffe; NV_REG32(0x00001800 + NVCFG_ROMSHADOW) &= 0xfffffffe;
}
break; break;
case 0x66: /* new on NV11 */ case 0x66: /* new on NV11 */
LOG(8,("NV11+ xxx cmd, skipping...\n")); LOG(8,("NV11+ xxx cmd, skipping...\n"));
@@ -421,6 +421,38 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size)
ISAWB(reg, byte); ISAWB(reg, byte);
} }
break; break;
case 0x6d:
*size -= 3;
if (*size < 0)
{
LOG(8,("script size error, aborting!\n\n"));
end = true;
result = B_ERROR;
break;
}
/* execute */
//fixme: setup_ram_config is also used on NV11 (at least), which means the
// routine should function differently there?!?
adress += 1;
data = NV_REG32(NV32_NV4STRAPINFO);
and_out = *((uint8*)(&(rom[adress])));
adress += 1;
byte = *((uint8*)(&(rom[adress])));
adress += 1;
data &= (uint32)and_out;
LOG(8,("cmd 'CHK bits AND-out $%02x RAMCFG for $%02x, stop PGM on no match'\n",
and_out, byte));
if (((uint8)data) != byte)
{
LOG(8,("INFO: ---No match: not executing following commands:\n"));
exec = false;
}
else
{
LOG(8,("INFO: ---Match, so this cmd has no effect.\n"));
}
break;
case 0x6e: case 0x6e:
*size -= 13; *size -= 13;
if (*size < 0) if (*size < 0)
@@ -474,8 +506,9 @@ static status_t exec_type1_script(uint8* rom, uint16 adress, int16* size)
adress += 1; adress += 1;
data = *((uint16*)(&(rom[adress]))); data = *((uint16*)(&(rom[adress])));
adress += 2; adress += 2;
LOG(8,("cmd 'SNOOZE for %d ($%04x) microSeconds'\n", data, data)); LOG(8,("cmd 'SNOOZE for %d ($%04x) microSeconds' (always done)\n", data, data));
if (exec) snooze(data); /* always done */
snooze(data);
break; break;
case 0x77: case 0x77:
*size -= 7; *size -= 7;