sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pci: USER_SPACE cleanup

Browse source
This commit is contained in:
David van Moolenbroek 2012-03-07 00:55:22 +01:00
parent 291ece0caa
commit e21c21a31a
1 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/pci/pci.c
View file

@ -1,7 +1,5 @@
#define USER_SPACE 1
/* /*
pci.c pci.c
#define USER_SPACE 1
Configure devices on the PCI bus Configure devices on the PCI bus
@ -687,12 +685,8 @@ PRIVATE void pci_intel_init()
vid= PCII_RREG16_(bus, dev, func, PCI_VID); vid= PCII_RREG16_(bus, dev, func, PCI_VID);
did= PCII_RREG16_(bus, dev, func, PCI_DID); did= PCII_RREG16_(bus, dev, func, PCI_DID);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
#if 0 #if 0
if (vid == 0xffff && did == 0xffff) if (vid == 0xffff && did == 0xffff)
@ -2042,15 +2036,10 @@ PRIVATE int do_piix(int devind)
#if DEBUG #if DEBUG
printf("in piix\n"); printf("in piix\n");
#endif #endif
#if USER_SPACE
if (OK != (s=sys_inb(PIIX_ELCR1, &elcr1))) if (OK != (s=sys_inb(PIIX_ELCR1, &elcr1)))
printf("Warning, sys_inb failed: %d\n", s); printf("Warning, sys_inb failed: %d\n", s);
if (OK != (s=sys_inb(PIIX_ELCR2, &elcr2))) if (OK != (s=sys_inb(PIIX_ELCR2, &elcr2)))
printf("Warning, sys_inb failed: %d\n", s); printf("Warning, sys_inb failed: %d\n", s);
#else
elcr1= inb(PIIX_ELCR1);
elcr2= inb(PIIX_ELCR2);
#endif
elcr= elcr1 | (elcr2 << 8); elcr= elcr1 | (elcr2 << 8);
for (i= 0; i<4; i++) for (i= 0; i<4; i++)
{ {
@ -2461,12 +2450,8 @@ int port;
v= PCII_RREG8_(pcibus[busind].pb_busnr, v= PCII_RREG8_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port); port);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
#if 0 #if 0
printf("pcii_rreg8(%d, %d, 0x%X): %d.%d.%d= 0x%X\n", printf("pcii_rreg8(%d, %d, 0x%X): %d.%d.%d= 0x%X\n",
busind, devind, port, busind, devind, port,
@ -2487,12 +2472,8 @@ PRIVATE u16_t pcii_rreg16(int busind, int devind, int port)
v= PCII_RREG16_(pcibus[busind].pb_busnr, v= PCII_RREG16_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port); port);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
#if 0 #if 0
printf("pcii_rreg16(%d, %d, 0x%X): %d.%d.%d= 0x%X\n", printf("pcii_rreg16(%d, %d, 0x%X): %d.%d.%d= 0x%X\n",
busind, devind, port, busind, devind, port,
@ -2513,12 +2494,8 @@ PRIVATE u32_t pcii_rreg32(int busind, int devind, int port)
v= PCII_RREG32_(pcibus[busind].pb_busnr, v= PCII_RREG32_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port); port);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
#if 0 #if 0
printf("pcii_rreg32(%d, %d, 0x%X): %d.%d.%d= 0x%X\n", printf("pcii_rreg32(%d, %d, 0x%X): %d.%d.%d= 0x%X\n",
busind, devind, port, busind, devind, port,
@ -2548,12 +2525,8 @@ PRIVATE void pcii_wreg8(
PCII_WREG8_(pcibus[busind].pb_busnr, PCII_WREG8_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port, value); port, value);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
} }
/*===========================================================================* /*===========================================================================*
@ -2576,12 +2549,8 @@ PRIVATE void pcii_wreg16(
PCII_WREG16_(pcibus[busind].pb_busnr, PCII_WREG16_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port, value); port, value);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
} }
/*===========================================================================* /*===========================================================================*
@ -2604,12 +2573,8 @@ PRIVATE void pcii_wreg32(
PCII_WREG32_(pcibus[busind].pb_busnr, PCII_WREG32_(pcibus[busind].pb_busnr,
pcidev[devind].pd_dev, pcidev[devind].pd_func, pcidev[devind].pd_dev, pcidev[devind].pd_func,
port, value); port, value);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n",s); printf("PCI: warning, sys_outl failed: %d\n",s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
} }
/*===========================================================================* /*===========================================================================*
@ -2621,12 +2586,8 @@ PRIVATE u16_t pcii_rsts(int busind)
int s; int s;
v= PCII_RREG16_(pcibus[busind].pb_busnr, 0, 0, PCI_SR); v= PCII_RREG16_(pcibus[busind].pb_busnr, 0, 0, PCI_SR);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
return v; return v;
} }
@ -2637,12 +2598,8 @@ PRIVATE void pcii_wsts(int busind, u16_t value)
{ {
int s; int s;
PCII_WREG16_(pcibus[busind].pb_busnr, 0, 0, PCI_SR, value); PCII_WREG16_(pcibus[busind].pb_busnr, 0, 0, PCI_SR, value);
#if USER_SPACE
if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL))) if (OK != (s=sys_outl(PCII_CONFADD, PCII_UNSEL)))
printf("PCI: warning, sys_outl failed: %d\n", s); printf("PCI: warning, sys_outl failed: %d\n", s);
#else
outl(PCII_CONFADD, PCII_UNSEL);
#endif
} }