diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-02 16:11:59 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-10-02 16:11:59 -0300 |
| commit | 22a7fd6711e2a40633981cd21fa3808c9246f13a (patch) | |
| tree | 7d2e4920b407c5ddc5a9bb9e739ecea7b07d3fec | |
| parent | 973f68bf0464c4d2aec2acf7c8e6db201782f4ec (diff) | |
Remove the IN_SEQ and OUT_SEQ macros.
These macros access vga registers, but don't make it clear in their name.
| -rw-r--r-- | src/regsmi.h | 5 | ||||
| -rw-r--r-- | src/smi_video.c | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/regsmi.h b/src/regsmi.h index 91f81b5..e359de9 100644 --- a/src/regsmi.h +++ b/src/regsmi.h @@ -101,11 +101,6 @@ VGAOUT8(SMIPtr pSmi, int port, CARD8 data) } } -#define OUT_SEQ(pSmi, index, data) \ - VGAOUT8_INDEX((pSmi), VGA_SEQ_INDEX, VGA_SEQ_DATA, (index), (data)) -#define IN_SEQ(pSmi, index) \ - VGAIN8_INDEX((pSmi), VGA_SEQ_INDEX, VGA_SEQ_DATA, (index)) - #define WRITE_DPR(pSmi, dpr, data) \ do { \ MMIO_OUT32(pSmi->DPRBase, dpr, data); \ diff --git a/src/smi_video.c b/src/smi_video.c index a94d086..a811086 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -1288,9 +1288,11 @@ SMI_PutVideo( width = (x2 - x1) >> 16; height = (y2 - y1) >> 16; - if (!IS_MSOC(pSmi)) { - OUT_SEQ(pSmi, 0x21, IN_SEQ(pSmi, 0x21) & ~0x04); - } + if (!IS_MSOC(pSmi)) + VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, + 0x21, + VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, + 0x21) & ~0x04); WRITE_VPR(pSmi, 0x54, READ_VPR(pSmi, 0x54) | 0x00200000); #if 0 SMI_WaitForSync(pScrn); @@ -1387,7 +1389,6 @@ SMI_StopVideo( WRITE_CPR(pSmi, 0x00, READ_CPR(pSmi, 0x00) & ~0x00000001); WRITE_VPR(pSmi, 0x54, READ_VPR(pSmi, 0x54) & ~0x00F00000); } -/* #864 OUT_SEQ(pSmi, 0x21, IN_SEQ(pSmi, 0x21) | 0x04); */ #endif } if (pPort->video_memory != NULL) { |