Skip to content

Commit

Permalink
Revert this bs (r1164)!!!
Browse files Browse the repository at this point in the history
git-svn-id: http://forge.voodooprojects.org/svn/chameleon/trunk@1168 b5af796a-00a8-11df-919b-ffff7a100b7d
  • Loading branch information
azimutz committed Jul 18, 2011
1 parent fe2a374 commit b9f12d0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
3 changes: 1 addition & 2 deletions i386/libsaio/ati.c
Expand Up @@ -1148,8 +1148,7 @@ static bool init_card(pci_dt_t *pci_dev)

if (!card->info->device_id || !card->info->cfg_name)
{
printf("Unsupported card!\nUse AtiConfig key to specify a framebuffer for your card.\nIf still unsupported, report dev id, subsys id and vendor.");
pause();
printf("Unsupported card!\n");
return false;
}

Expand Down
6 changes: 0 additions & 6 deletions i386/libsaio/nvidia.c
Expand Up @@ -865,15 +865,13 @@ static int patch_nvidia_rom(uint8_t *rom)
{
if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa)) {
printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]);
pause();
return PATCH_ROM_FAILED;
}

uint16_t dcbptr = swap16(read16(rom, 0x36));

if (!dcbptr) {
printf("no dcb table found\n");
pause();
return PATCH_ROM_FAILED;
}
// else
Expand Down Expand Up @@ -906,7 +904,6 @@ static int patch_nvidia_rom(uint8_t *rom)
if (sig != 0x4edcbdcb)
{
printf("Bad display config block signature (0x%8x)\n", sig); //Azi: issue #48
pause();
return PATCH_ROM_FAILED;
}
}
Expand All @@ -920,14 +917,12 @@ static int patch_nvidia_rom(uint8_t *rom)
if (strcmp(sig, "DEV_REC"))
{
printf("Bad Display Configuration Block signature (%s)\n", sig);
pause();
return PATCH_ROM_FAILED;
}
}
else
{
printf("ERROR: dcbtable_version is 0x%X\n", dcbtable_version);
pause();
return PATCH_ROM_FAILED;
}

Expand Down Expand Up @@ -1330,7 +1325,6 @@ bool setup_nvidia_devprop(pci_dt_t *nvda_dev)

if ((nvPatch = patch_nvidia_rom(rom)) == PATCH_ROM_FAILED) {
printf("ERROR: nVidia ROM Patching Failed!\n");
pause();
//return false;
}

Expand Down

0 comments on commit b9f12d0

Please sign in to comment.