Attachment 8332 Details for Bug 17495 – file.diff

[patch] file.diff

file.diff (text/plain), 1.02 KB, created by Garrett Wollman on 2000-03-19 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garrett Wollman

Created: 2000-03-19 23:50:01 UTC

Size: 1.02 KB

patch

obsolete

>Index: ppc.c
>===================================================================
>RCS file: /home/ncvs/src/sys/isa/ppc.c,v
>retrieving revision 1.26
>diff -u -r1.26 ppc.c
>--- ppc.c	2000/01/29 14:02:30	1.26
>+++ ppc.c	2000/03/19 23:31:57
>@@ -1692,6 +1692,12 @@
> 	return (ENXIO);
> }
> 
>+static struct isa_pnp_id lpc_ids[] = {
>+	{ 0x0004d041, "Standard parallel printer port" }, /* PNP0400 */
>+	{ 0x0104d041, "ECP parallel printer port" }, /* PNP0401 */
>+	{ 0 }
>+};
>+
> static int
> ppc_probe(device_t dev)
> {
>@@ -1703,14 +1709,13 @@
> 	int error;
> 	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);
> 
>-	/* XXX shall be set after detection */
>-	device_set_desc(dev, "Parallel port");
>+	error = ISA_PNP_PROBE(parent, dev, lpc_ids);
>+	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.

Actions: View | Diff

Attachments on bug 17495: 8332