Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i810: rip out PIO access functions 

All the io done at init time is already converted to libpciaccess

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-10-30 16:07:45 +01:00
parent e735636194
commit 4aeea489ed
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/legacy/i810/i810.h
View File

@ -178,7 +178,6 @@ typedef struct _I810Rec {
int Chipset;
unsigned long LinearAddr;
unsigned long MMIOAddr;
IOADDRESS ioBase;
EntityInfoPtr pEnt;
struct pci_device *PciInfo;

6
src/legacy/i810/i810_driver.c
View File

@ -234,7 +234,6 @@ I810DoDDC(ScrnInfoPtr pScrn, int index)
static Bool
I810PreInit(ScrnInfoPtr pScrn, int flags)
{
vgaHWPtr hwp;
I810Ptr pI810;
ClockRangePtr clockRanges;
int i;
@ -270,8 +269,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn))
return FALSE;
hwp = VGAHWPTR(pScrn);
pI810->ioBase = hwp->PIOOffset;
pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
@ -378,9 +375,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
*/
I810DoDDC(pScrn, pI810->pEnt->index);
/* We have to use PIO to probe, because we haven't mapped yet */
I810SetPIOAccess(pI810);
intel_detect_chipset(pScrn, pI810->PciInfo, &chipset);
/*

37
src/legacy/i810/i810_io.c
View File

@ -44,43 +44,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define minb(p) *(volatile uint8_t *)(pI810->MMIOBase + (p))
#define moutb(p,v) *(volatile uint8_t *)(pI810->MMIOBase + (p)) = (v)
static void
I810WriteControlPIO(I810Ptr pI810, IOADDRESS addr, uint8_t index, uint8_t val)
{
addr += pI810->ioBase;
outb(addr, index);
outb(addr + 1, val);
}
static uint8_t
I810ReadControlPIO(I810Ptr pI810, IOADDRESS addr, uint8_t index)
{
addr += pI810->ioBase;
outb(addr, index);
return inb(addr + 1);
}
static void
I810WriteStandardPIO(I810Ptr pI810, IOADDRESS addr, uint8_t val)
{
outb(pI810->ioBase + addr, val);
}
static uint8_t
I810ReadStandardPIO(I810Ptr pI810, IOADDRESS addr)
{
return inb(pI810->ioBase + addr);
}
void
I810SetPIOAccess(I810Ptr pI810)
{
pI810->writeControl = I810WriteControlPIO;
pI810->readControl = I810ReadControlPIO;
pI810->writeStandard = I810WriteStandardPIO;
pI810->readStandard = I810ReadStandardPIO;
}
static void
I810WriteControlMMIO(I810Ptr pI810, IOADDRESS addr, uint8_t index, uint8_t val)
{