diff options
| -rw-r--r-- | sys/dev/ppc/ppc.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/ppc.c | 7 | ||||
| -rw-r--r-- | sys/isa/ppc.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index 0ee1eb668dc6..faa0f0a639c0 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -1701,14 +1701,15 @@ ppc_probe(device_t dev) device_t parent; int port; - device_set_desc(dev, "Parallel port"); - - /* XXX shall be connected to pnpbios - from Peter Wemm */ + /* 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"); + /* * Allocate the ppc_data structure. */ diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c index 0ee1eb668dc6..faa0f0a639c0 100644 --- a/sys/i386/isa/ppc.c +++ b/sys/i386/isa/ppc.c @@ -1701,14 +1701,15 @@ ppc_probe(device_t dev) device_t parent; int port; - device_set_desc(dev, "Parallel port"); - - /* XXX shall be connected to pnpbios - from Peter Wemm */ + /* 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"); + /* * Allocate the ppc_data structure. */ diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c index 0ee1eb668dc6..faa0f0a639c0 100644 --- a/sys/isa/ppc.c +++ b/sys/isa/ppc.c @@ -1701,14 +1701,15 @@ ppc_probe(device_t dev) device_t parent; int port; - device_set_desc(dev, "Parallel port"); - - /* XXX shall be connected to pnpbios - from Peter Wemm */ + /* 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"); + /* * Allocate the ppc_data structure. */ |