From cc04d754913a7275ada255e1142c5a394b17e824 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Mon, 28 Jun 2004 19:48:57 +0000 Subject: [PATCH] fixed BIOS ROM readout git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8224 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../accelerants/nvidia/engine/nv_general.c | 4 +- .../accelerants/nvidia/engine/nv_info.c | 6 ++- .../drivers/graphics/nvidia/UPDATE.html | 5 +- .../kernel/drivers/graphics/nvidia/driver.c | 47 ++++++++++++------- .../drivers/graphics/nvidia/nv.settings | 2 +- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c index 310718b898..6441eca790 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_general.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c @@ -808,7 +808,9 @@ static status_t nvxx_general_powerup() /* initialize the shared_info PINS struct */ result = parse_pins(); - if (result != B_OK) fake_pins(); +// if (result != B_OK) fake_pins(); +//temporary: + fake_pins(); /* log the PINS struct settings */ dump_pins(); diff --git a/src/add-ons/accelerants/nvidia/engine/nv_info.c b/src/add-ons/accelerants/nvidia/engine/nv_info.c index 36dd00690f..40c8a5cd1a 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_info.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_info.c @@ -33,10 +33,12 @@ status_t parse_pins () /* preset PINS read status to failed */ si->ps.pins_status = B_ERROR; + LOG(2,("INFO: cardROM size: %dKb\n", (si->rom.size / 1024))); + /* check the validity of PINS */ LOG(2,("INFO: Reading PINS info\n")); - rom = (uint8 *) si->rom_mirror; - /* check BIOS signature */ + rom = (uint8 *) si->rom.mirror; + /* check BIOS signature - this is defined in the PCI standard */ if (rom[0]!=0x55 || rom[1]!=0xaa) { LOG(8,("INFO: BIOS signiture not found\n")); diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html index 937243a0fc..c1c928fb93 100644 --- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html +++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html @@ -4,12 +4,13 @@

Changes done for each driverversion:

-

head (0.15), (Rudolf)

+

head (0.16), (Rudolf)

nv_driver 0.10, (Rudolf)