diff options
author | grehan <grehan@FreeBSD.org> | 2003-12-12 09:54:39 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2003-12-12 09:54:39 +0000 |
commit | cf50a85b368717e96901e1dc03f645b26ffc377e (patch) | |
tree | 8612ae824b483a7383a4a3eac0aac5b5cdfc7c91 | |
parent | 5d9c0f84f15849efcfcb9c59a12634239e2cbce4 (diff) | |
download | FreeBSD-src-cf50a85b368717e96901e1dc03f645b26ffc377e.zip FreeBSD-src-cf50a85b368717e96901e1dc03f645b26ffc377e.tar.gz |
- accept device_type of "block", which is how psim/gdb6.0 defines
disks. continue to accept "disk" for psim/gdb5.x users.
- remove unneeded ofwd_identify
-rw-r--r-- | sys/dev/ofw/ofw_disk.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c index 86ec347..c37af75 100644 --- a/sys/dev/ofw/ofw_disk.c +++ b/sys/dev/ofw/ofw_disk.c @@ -60,7 +60,6 @@ static int ofwd_probe(device_t); static int ofwd_attach(device_t); static device_method_t ofwd_methods[] = { - DEVMETHOD(device_identify, ofwd_identify), DEVMETHOD(device_probe, ofwd_probe), DEVMETHOD(device_attach, ofwd_attach), { 0, 0 } @@ -145,7 +144,8 @@ ofwd_probe(device_t dev) type = nexus_get_device_type(dev); - if (type == NULL || strcmp(type, "disk") != 0) + if (type == NULL || + (strcmp(type, "disk") != 0 && strcmp(type, "block") != 0)) return (ENXIO); device_set_desc(dev, "OpenFirmware disk"); @@ -183,8 +183,3 @@ ofwd_attach(device_t dev) return (0); } - -static void -ofwd_identify(driver_t *driver, device_t parent) -{ -} |