diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:24 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:24 +0000 |
| commit | 7cbb9f870b020742a254f1e9aadd0209b1f0a876 (patch) | |
| tree | 9073a10b01308b5925b2969f828e755be1fffa22 /src/mga_esc.c | |
| parent | 9dd51de1d530c6081333d30f945afb6d9208a77f (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/mga_esc.c')
| -rw-r--r-- | src/mga_esc.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/mga_esc.c b/src/mga_esc.c index 2478184..dc0b7b3 100644 --- a/src/mga_esc.c +++ b/src/mga_esc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /**************************************************************************** * mga_esc.c * @@ -217,23 +216,23 @@ static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, Dis break; case 1: ucIndex = INREG8(0x3c00); - OUTREG8(0x3c00, (UCHAR)ulAddr); + OUTREG(0x3c00, (UCHAR)ulAddr); ulData = (ULONG)INREG8(0x3c0a); - OUTREG8(0x3c00, ucIndex); + OUTREG(0x3c00, ucIndex); sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData); break; case 2: ucIndex = INREG8(0x1fd4); - OUTREG8(0x1fd4, (UCHAR)ulAddr); + OUTREG(0x1fd4, (UCHAR)ulAddr); ulData = (ULONG)INREG8(0x1fd5); - OUTREG8(0x1fd4, ucIndex); + OUTREG(0x1fd4, ucIndex); sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData); break; case 3: ucIndex = INREG8(0x1fde); - OUTREG8(0x1fde, (UCHAR)ulAddr); + OUTREG(0x1fde, (UCHAR)ulAddr); ulData = (ULONG)INREG8(0x1fdf); - OUTREG8(0x1fde, ucIndex); + OUTREG(0x1fde, ucIndex); sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData); break; default: @@ -267,23 +266,23 @@ static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, Di break; case 1: ucIndex = INREG8(0x3c00); - OUTREG8(0x3c00, (UCHAR)ulAddr); - OUTREG8(0x3c0a, (UCHAR)ulData); - OUTREG8(0x3c00, ucIndex); + OUTREG(0x3c00, (UCHAR)ulAddr); + OUTREG(0x3c0a, (UCHAR)ulData); + OUTREG(0x3c00, ucIndex); strcpy(sResult, "OK"); break; case 2: ucIndex = INREG8(0x1fd4); - OUTREG8(0x1fd4, (UCHAR)ulAddr); - OUTREG8(0x1fd5, (UCHAR)ulData); - OUTREG8(0x1fd4, ucIndex); + OUTREG(0x1fd4, (UCHAR)ulAddr); + OUTREG(0x1fd5, (UCHAR)ulData); + OUTREG(0x1fd4, ucIndex); strcpy(sResult, "OK"); break; case 3: ucIndex = INREG8(0x1fde); - OUTREG8(0x1fde, (UCHAR)ulAddr); - OUTREG8(0x1fdf, (UCHAR)ulData); - OUTREG8(0x1fde, ucIndex); + OUTREG(0x1fde, (UCHAR)ulAddr); + OUTREG(0x1fdf, (UCHAR)ulData); + OUTREG(0x1fde, ucIndex); strcpy(sResult, "OK"); break; default: @@ -753,13 +752,13 @@ void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayM if (pMga->SecondCrtc) { - ulScreen = 1; + ulScreen = 1; } else { ulScreen = 0; } - + if (FunctionTable[0].function && GetEscCommand(cmdline, &EscCmd) ) { @@ -774,7 +773,7 @@ void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayM { EscCmd.parameters[0] &= 0xffff; EscCmd.parameters[0] |= ulScreen << 16; - + FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode); } else |