summaryrefslogtreecommitdiffstats
path: root/sys/dev/buslogic/bt_isa.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/buslogic/bt_isa.c')
-rw-r--r--sys/dev/buslogic/bt_isa.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 6206dc6..ce121c3 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -75,7 +75,7 @@ bt_isa_alloc_resources(device_t dev, u_long portstart, u_long portend)
return (ENOMEM);
}
} else
- irq = 0;
+ irq = NULL;
if (isa_get_drq(dev) != -1) {
rid = 0;
@@ -90,7 +90,7 @@ bt_isa_alloc_resources(device_t dev, u_long portstart, u_long portend)
return (ENOMEM);
}
} else
- drq = 0;
+ drq = NULL;
bt_init_softc(dev, port, irq, drq);
@@ -176,7 +176,7 @@ bt_isa_probe(device_t dev)
bus_set_resource(dev, SYS_RES_DRQ, 0, info.drq, 1);
bus_set_resource(dev, SYS_RES_IRQ, 0, info.irq, 1);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
return (ENXIO);
@@ -233,7 +233,7 @@ bt_isa_attach(device_t dev)
}
/* XXX Should be a child of the ISA or VL bus dma tag */
- if (bus_dma_tag_create( /* parent */ NULL,
+ if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(dev),
/* alignemnt */ 1,
/* boundary */ 0,
/* lowaddr */ lowaddr,
@@ -244,8 +244,8 @@ bt_isa_attach(device_t dev)
/* nsegments */ ~0,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
- /* lockfunc */ busdma_lock_mutex,
- /* lockarg */ &Giant,
+ /* lockfunc */ NULL,
+ /* lockarg */ NULL,
&bt->parent_dmat) != 0) {
bt_isa_release_resources(dev);
return (ENOMEM);
@@ -272,8 +272,8 @@ bt_isa_attach(device_t dev)
/* nsegments */ 1,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ 0,
- /* lockfunc */ busdma_lock_mutex,
- /* lockarg */ &Giant,
+ /* lockfunc */ NULL,
+ /* lockarg */ NULL,
&bt->sense_dmat) != 0) {
bt_isa_release_resources(dev);
return (ENOMEM);
OpenPOWER on IntegriCloud