From 663631a5eb4a5ef3f8b2fe9d0a8939dd24733852 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Thu, 18 Nov 1999 14:18:19 +0000 Subject: Set port_used and mem_used to the resource size instead of 1. Submitted by: chi@bd.mbn.or.jp (Chiharu Shibata) --- sys/dev/ed/if_ed.c | 4 ++-- sys/dev/ed/if_ed_isa.c | 4 ++-- sys/dev/ed/if_ed_pccard.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev/ed') diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 841c6c85f8691..b355f4fe047db 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -1520,7 +1520,7 @@ ed_alloc_port(dev, rid, size) if (res) { sc->port_rid = rid; sc->port_res = res; - sc->port_used = 1; + sc->port_used = size; return (0); } else { return (ENOENT); @@ -1544,7 +1544,7 @@ ed_alloc_memory(dev, rid, size) if (res) { sc->mem_rid = rid; sc->mem_res = res; - sc->mem_used = 1; + sc->mem_used = size; return (0); } else { return (ENOENT); diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c index ed21a7eccd309..c504aa6bf5893 100644 --- a/sys/dev/ed/if_ed_isa.c +++ b/sys/dev/ed/if_ed_isa.c @@ -125,9 +125,9 @@ ed_isa_attach(dev) int error; if (sc->port_used > 0) - ed_alloc_port(dev, sc->port_rid, 1); + ed_alloc_port(dev, sc->port_rid, sc->port_used); if (sc->mem_used) - ed_alloc_memory(dev, sc->mem_rid, 1); + ed_alloc_memory(dev, sc->mem_rid, sc->mem_used); ed_alloc_irq(dev, sc->irq_rid, 0); error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index db1eac889f006..ae4bc651240bd 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -135,9 +135,9 @@ ed_pccard_attach(device_t dev) int error; if (sc->port_used > 0) - ed_alloc_port(dev, sc->port_rid, 1); + ed_alloc_port(dev, sc->port_rid, sc->port_used); if (sc->mem_used) - ed_alloc_memory(dev, sc->mem_rid, 1); + ed_alloc_memory(dev, sc->mem_rid, sc->mem_used); ed_alloc_irq(dev, sc->irq_rid, 0); error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, -- cgit v1.3