d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable PnP attachment for parallel port controllers.

Browse Source 
PR:		17495
This commit is contained in:
wollman 2000-04-22 15:08:50 +00:00
parent 692df98b81
commit 494d7321f0
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/ppc/ppc.c
View File

@ -1692,6 +1692,12 @@ ppc_setmode(device_t dev, int mode)
return (ENXIO); return (ENXIO);
} }
static struct isa_pnp_id lpc_ids[] = {
{ 0x0004d041, "Standard parallel printer port" }, /* PNP0400 */
{ 0x0104d041, "ECP parallel printer port" }, /* PNP0401 */
{ 0 }
};
static int static int
ppc_probe(device_t dev) ppc_probe(device_t dev)
{ {
@ -1703,14 +1709,13 @@ ppc_probe(device_t dev)
int error; int error;
u_long port; u_long port;
/* If we are a PNP device, abort. Otherwise we attach to *everthing* */
if (isa_get_logicalid(dev))
return ENXIO;
parent = device_get_parent(dev); parent = device_get_parent(dev);
/* XXX shall be set after detection */ error = ISA_PNP_PROBE(parent, dev, lpc_ids);
device_set_desc(dev, "Parallel port"); if (error == ENXIO)
return (ENXIO);
else if (error != 0) /* XXX shall be set after detection */
device_set_desc(dev, "Parallel port");
/* /*
* Allocate the ppc_data structure. * Allocate the ppc_data structure.

17
sys/isa/ppc.c
View File

@ -1692,6 +1692,12 @@ ppc_setmode(device_t dev, int mode)
return (ENXIO); return (ENXIO);
} }
static struct isa_pnp_id lpc_ids[] = {
{ 0x0004d041, "Standard parallel printer port" }, /* PNP0400 */
{ 0x0104d041, "ECP parallel printer port" }, /* PNP0401 */
{ 0 }
};
static int static int
ppc_probe(device_t dev) ppc_probe(device_t dev)
{ {
@ -1703,14 +1709,13 @@ ppc_probe(device_t dev)
int error; int error;
u_long port; u_long port;
/* If we are a PNP device, abort. Otherwise we attach to *everthing* */
if (isa_get_logicalid(dev))
return ENXIO;
parent = device_get_parent(dev); parent = device_get_parent(dev);
/* XXX shall be set after detection */ error = ISA_PNP_PROBE(parent, dev, lpc_ids);
device_set_desc(dev, "Parallel port"); if (error == ENXIO)
return (ENXIO);
else if (error != 0) /* XXX shall be set after detection */
device_set_desc(dev, "Parallel port");
/* /*
* Allocate the ppc_data structure. * Allocate the ppc_data structure.