diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2008-02-02 19:26:13 +0100 |
|---|---|---|
| committer | Maarten Maathuis <madman2003@gmail.com> | 2008-02-02 19:26:13 +0100 |
| commit | 741acded643945c5a2da7bef088ed1ff7f5fa85e (patch) | |
| tree | a81b64207d651a909a20860ba9d39aa7ffbd5416 /src/nv_setup.c | |
| parent | d429cabd9ae9865a45cc88f43ab6d9d61b3fcf36 (diff) | |
Remove nvRead/WriteVGA in favor of nvRead/WriteCurVGA wrappers.
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 18864d4..bc1664e 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -571,8 +571,8 @@ NVCommonSetup(ScrnInfoPtr pScrn) if((pNv->Chipset & 0x0fff) <= CHIPSET_NV04) FlatPanel = 0; } else { - if(nvReadVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80) { - if(!(nvReadVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01)) + if(nvReadCurVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80) { + if(!(nvReadCurVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01)) Television = TRUE; FlatPanel = 1; } else { @@ -620,22 +620,22 @@ NVCommonSetup(ScrnInfoPtr pScrn) cr44 = pNv->vtOWNER; - nvWriteVGA(pNv, NV_VGA_CRTCX_OWNER, 3); + nvWriteCurVGA(pNv, NV_VGA_CRTCX_OWNER, 3); NVSelectHeadRegisters(pScrn, 1); NVLockUnlock(pScrn, 0); - slaved_on_B = nvReadVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; + slaved_on_B = nvReadCurVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; if(slaved_on_B) { - tvB = !(nvReadVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); + tvB = !(nvReadCurVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); } - nvWriteVGA(pNv, NV_VGA_CRTCX_OWNER, 0); + nvWriteCurVGA(pNv, NV_VGA_CRTCX_OWNER, 0); NVSelectHeadRegisters(pScrn, 0); NVLockUnlock(pScrn, 0); - slaved_on_A = nvReadVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; + slaved_on_A = nvReadCurVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; if(slaved_on_A) { - tvA = !(nvReadVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); + tvA = !(nvReadCurVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); } oldhead = NVReadCRTC(pNv, 0, NV_CRTC_FSEL); @@ -754,7 +754,7 @@ NVCommonSetup(ScrnInfoPtr pScrn) NVWriteCRTC(pNv, 0, NV_CRTC_FSEL, oldhead); - nvWriteVGA(pNv, NV_VGA_CRTCX_OWNER, cr44); + nvWriteCurVGA(pNv, NV_VGA_CRTCX_OWNER, cr44); NVSelectHeadRegisters(pScrn, pNv->crtc_active[1]); } |