diff options
| author | imp <imp@FreeBSD.org> | 1999-10-28 04:51:39 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1999-10-28 04:51:39 +0000 |
| commit | 89dd67bab3f8a78895182f250b618901b49c92ad (patch) | |
| tree | c7d8de20ae09e8efe16cf6f0a8d245be0a5dc805 /sys/pccard | |
| parent | 465705475876790b6300f0e446ef7b6eacad828e (diff) | |
| download | FreeBSD-src-89dd67bab3f8a78895182f250b618901b49c92ad.zip FreeBSD-src-89dd67bab3f8a78895182f250b618901b49c92ad.tar.gz | |
Do not add children for new bus kludge version of pccard.
Fix some compile warnings.
Diffstat (limited to 'sys/pccard')
| -rw-r--r-- | sys/pccard/pccard_nbk.c | 9 | ||||
| -rw-r--r-- | sys/pccard/pcic.c | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c index 1fc9bee..fdab419 100644 --- a/sys/pccard/pccard_nbk.c +++ b/sys/pccard/pccard_nbk.c @@ -82,17 +82,10 @@ devclass_t pccard_devclass; #define PCCARD_NDRQ 0 static int -pccard_add_children(device_t dev, int busno) -{ - device_add_child(dev, NULL, -1, NULL); - return 0; -} - -static int pccard_probe(device_t dev) { device_set_desc(dev, "PC Card bus -- kludge version"); - return pccard_add_children(dev, device_get_unit(dev)); + return 0; } static void diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 058924f..c41702e 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -782,7 +782,7 @@ pcic_activate_resource(device_t dev, device_t child, int type, int rid, { struct mem_desc *mp = &devi->slt->mem[rid]; mp->flags |= IODF_ACTIVE; - mp->start = rman_get_start(r); + mp->start = (caddr_t) rman_get_start(r); mp->size = rman_get_end(r) - rman_get_start(r) + 1; err = pcic_memory(devi->slt, rid); if (err) @@ -801,7 +801,6 @@ pcic_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct pccard_devinfo *devi = device_get_ivars(child); - struct io_desc *ip = &devi->slt->io[rid]; int err; switch (type) { |
