summaryrefslogtreecommitdiff
path: root/src/nv_bios.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer-ubuntu.(none)>2006-08-30 00:48:23 +1000
committerDave Airlie <airlied@starflyer-ubuntu.(none)>2006-08-30 00:48:23 +1000
commit6d5b1765e10856a7dfa75c27ad96f547dc26b23a (patch)
tree585fcf5a2667817c683b02c660ccde79be31ac0f /src/nv_bios.c
parent6140bdfe6959cd0f6ce8e06d34b6e838d8cef046 (diff)
downloadxorg-driver-xf86-video-nouveau-6d5b1765e10856a7dfa75c27ad96f547dc26b23a.tar.gz
remove PEXTDEV and PTIMER using macros
Diffstat (limited to 'src/nv_bios.c')
-rw-r--r--src/nv_bios.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nv_bios.c b/src/nv_bios.c
index 8e80766..448ce81 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -1118,7 +1118,7 @@ static Bool init_ram_condition2(ScrnInfoPtr pScrn, bios_t *bios, CARD16 offset,
* offset + 1 (8 bit): and mask
* offset + 2 (8 bit): cmpval
*
- * Test if (NV_PEXTDEV_BOOT & and mask) matches cmpval
+ * Test if (NV_EXTDEV_BOOT & and mask) matches cmpval
*/
NVPtr pNv = NVPTR(pScrn);
CARD32 and = *((CARD32 *) (&bios->data[offset + 1]));
@@ -1126,7 +1126,7 @@ static Bool init_ram_condition2(ScrnInfoPtr pScrn, bios_t *bios, CARD16 offset,
CARD32 data;
if (iexec->execute) {
- data=(pNv->PEXTDEV[NV_PEXTDEV_BOOT/4])&and;
+ data=(nvReadEXTDEV(pNv, NV_PEXTDEV_BOOT))&and;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"0x%04X: CHECKING IF REGVAL: 0x%08X equals COND: 0x%08X\n",