mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

- allow a device hint to disable probing a slot on a Uninorth PCI bus.

Browse Source 
e.g. at the loader:

	set hint.pcib.1.skipslot=26

  This allows undocumented and problematic hardware on some systems
  to be ignored, for instance, the USB keyboard/mouse that shows up
  on a 12" albook that doesn't exist nor do anything other than eat up
  the syscons keyboard. Another one is the unused USB cell in the old
  366MHz iBook that locks up the machine when probed.

  In a way this is temporary, since there are better fixes for the
  above problems, but will be useful in the meantime by allowing
  a keyboard to be used to help debug said fixes :)

- while here remove some trailing white space
This commit is contained in:
Peter Grehan 2005-01-11 08:09:50 +00:00
parent 8df6bac4c7
commit 739211f027
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=140049
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/powerpc/powermac/uninorth.c
View File

@ -245,7 +245,7 @@ uninorth_attach(device_t dev)
}
/*
* Write out the correct PIC interrupt values to config space
* Write out the correct PIC interrupt values to config space
* of all devices on the bus. This has to be done after the GEM
* cell is enabled above.
*/
@ -441,7 +441,14 @@ static int
uninorth_enable_config(struct uninorth_softc *sc, u_int bus, u_int slot,
u_int func, u_int reg)
{
u_int32_t cfgval;
uint32_t cfgval;
uint32_t pass;
if (resource_int_value(device_get_name(sc->sc_dev),
device_get_unit(sc->sc_dev), "skipslot", &pass) == 0) {
if (pass == slot)
return (0);
}
if (sc->sc_bus == bus) {
/*
@ -455,7 +462,7 @@ uninorth_enable_config(struct uninorth_softc *sc, u_int bus, u_int slot,
cfgval = (bus << 16) | (slot << 11) | (func << 8) |
(reg & 0xfc) | 1;
}
do {
out32rb(sc->sc_addr, cfgval);
} while (in32rb(sc->sc_addr) != cfgval);
@ -540,7 +547,7 @@ unin_chip_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "Apple UniNorth System Controller");
return (0);
return (0);
}
static int
@ -566,7 +573,7 @@ unin_chip_attach(device_t dev)
uncsc->sc_version = *(u_int *)uncsc->sc_addr;
device_printf(dev, "Version %d\n", uncsc->sc_version);
return (0);
}