diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-10-05 14:45:32 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-10-05 14:45:32 -0700 |
| commit | 2f398be82a70b5d30d7a823a2d5b3b43777e52c7 (patch) | |
| tree | 55cd7f33e401e71a34b6924af1cb1f3842c3651a | |
| parent | 9a9f57ca98711e4fcedadbd70efb3d9fa81a17e2 (diff) | |
Eliminate "value" as a global variable. Minor clean ups.
| -rw-r--r-- | src/xg47_bios.c | 4 | ||||
| -rw-r--r-- | src/xgi_bios.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/xg47_bios.c b/src/xg47_bios.c index b5ff82c..cbd36c1 100644 --- a/src/xg47_bios.c +++ b/src/xg47_bios.c @@ -49,8 +49,6 @@ extern CARD8 vclk28; extern CARD8 GR3CE_45; extern CARD8 GR3CE_45_SingleView; -extern CARD8 value[23]; - /* * Definition of video mode refresh rate (!!! CAN NOT BE MODIFIED !!!). @@ -850,6 +848,8 @@ void XG47BiosValueInit(ScrnInfoPtr pScrn) { XGIPtr pXGI = XGIPTR(pScrn); CARD16 engineClock, memClock; + CARD8 value[23]; + /* * Default Display Device Info diff --git a/src/xgi_bios.c b/src/xgi_bios.c index 0caf468..10843fa 100644 --- a/src/xgi_bios.c +++ b/src/xgi_bios.c @@ -50,7 +50,6 @@ CARD8 vclk19; CARD8 vclk28; CARD8 GR3CE_45; CARD8 GR3CE_45_SingleView; -CARD8 value[23]; /* * from bios dll: Basefunc.c @@ -604,16 +603,13 @@ Bool XGIReadBiosData(XGIPtr pXGI, CARD8 *array) pXGI->pInt10->num = 0x10; xf86ExecX86int10(pXGI->pInt10); - if (pXGI->pInt10->ax >> 8) /* If success, ah = 0 */ + /* If success, ah = 0 */ + if ((pXGI->pInt10->ax >> 8) || (pXGI->biosBase != NULL)) { return FALSE; - - if (pXGI->biosBase) - { - memcpy(array, (pXGI->biosBase + pXGI->pInt10->di), pXGI->pInt10->cx); - return TRUE; } - else - return FALSE; + + memcpy(array, (pXGI->biosBase + pXGI->pInt10->di), pXGI->pInt10->cx); + return TRUE; } /* |