d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allocate the port resource when attaching the keyboard controller,

Browse Source 
rather than when the individual child device is attached.
This commit is contained in:
yokota 1999-06-29 17:35:09 +00:00
parent 09dda04a08
commit 5ccd1849ea
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/atkbdc/atkbdc_isa.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $ * $Id: atkbdc_isa.c,v 1.8 1999/05/30 11:12:27 dfr Exp $
*/ */
#include "atkbdc.h" #include "atkbdc.h"
@ -119,17 +119,12 @@ atkbdc_add_device(device_t dev, const char *name, int unit)
atkbdc_device_t *kdev; atkbdc_device_t *kdev;
device_t child; device_t child;
int t; int t;
int rid;
struct resource *port;
kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT); kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT);
if (!kdev) if (!kdev)
return; return;
bzero(kdev, sizeof *kdev); bzero(kdev, sizeof *kdev);
/* XXX should track resource in softc */
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
kdev->port = sc->port; kdev->port = sc->port;
if (resource_int_value(name, unit, "irq", &t) == 0) if (resource_int_value(name, unit, "irq", &t) == 0)
@ -149,8 +144,10 @@ static int
atkbdc_attach(device_t dev) atkbdc_attach(device_t dev)
{ {
atkbdc_softc_t *sc; atkbdc_softc_t *sc;
struct resource *port;
int unit; int unit;
int error; int error;
int rid;
int i; int i;
unit = device_get_unit(dev); unit = device_get_unit(dev);
@ -168,7 +165,13 @@ atkbdc_attach(device_t dev)
return ENOMEM; return ENOMEM;
} }
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev)); /* XXX should track resource in softc */
rid = 0;
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
if (!port)
return ENXIO;
error = atkbdc_attach_unit(unit, sc, rman_get_start(port));
if (error) if (error)
return error; return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc; *(atkbdc_softc_t **)device_get_softc(dev) = sc;

17
sys/dev/atkbdc/atkbdc_subr.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $ * $Id: atkbdc_isa.c,v 1.8 1999/05/30 11:12:27 dfr Exp $
*/ */
#include "atkbdc.h" #include "atkbdc.h"
@ -119,17 +119,12 @@ atkbdc_add_device(device_t dev, const char *name, int unit)
atkbdc_device_t *kdev; atkbdc_device_t *kdev;
device_t child; device_t child;
int t; int t;
int rid;
struct resource *port;
kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT); kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT);
if (!kdev) if (!kdev)
return; return;
bzero(kdev, sizeof *kdev); bzero(kdev, sizeof *kdev);
/* XXX should track resource in softc */
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
kdev->port = sc->port; kdev->port = sc->port;
if (resource_int_value(name, unit, "irq", &t) == 0) if (resource_int_value(name, unit, "irq", &t) == 0)
@ -149,8 +144,10 @@ static int
atkbdc_attach(device_t dev) atkbdc_attach(device_t dev)
{ {
atkbdc_softc_t *sc; atkbdc_softc_t *sc;
struct resource *port;
int unit; int unit;
int error; int error;
int rid;
int i; int i;
unit = device_get_unit(dev); unit = device_get_unit(dev);
@ -168,7 +165,13 @@ atkbdc_attach(device_t dev)
return ENOMEM; return ENOMEM;
} }
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev)); /* XXX should track resource in softc */
rid = 0;
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
if (!port)
return ENXIO;
error = atkbdc_attach_unit(unit, sc, rman_get_start(port));
if (error) if (error)
return error; return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc; *(atkbdc_softc_t **)device_get_softc(dev) = sc;

17
sys/isa/atkbdc_isa.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $ * $Id: atkbdc_isa.c,v 1.8 1999/05/30 11:12:27 dfr Exp $
*/ */
#include "atkbdc.h" #include "atkbdc.h"
@ -119,17 +119,12 @@ atkbdc_add_device(device_t dev, const char *name, int unit)
atkbdc_device_t *kdev; atkbdc_device_t *kdev;
device_t child; device_t child;
int t; int t;
int rid;
struct resource *port;
kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT); kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT);
if (!kdev) if (!kdev)
return; return;
bzero(kdev, sizeof *kdev); bzero(kdev, sizeof *kdev);
/* XXX should track resource in softc */
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
kdev->port = sc->port; kdev->port = sc->port;
if (resource_int_value(name, unit, "irq", &t) == 0) if (resource_int_value(name, unit, "irq", &t) == 0)
@ -149,8 +144,10 @@ static int
atkbdc_attach(device_t dev) atkbdc_attach(device_t dev)
{ {
atkbdc_softc_t *sc; atkbdc_softc_t *sc;
struct resource *port;
int unit; int unit;
int error; int error;
int rid;
int i; int i;
unit = device_get_unit(dev); unit = device_get_unit(dev);
@ -168,7 +165,13 @@ atkbdc_attach(device_t dev)
return ENOMEM; return ENOMEM;
} }
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev)); /* XXX should track resource in softc */
rid = 0;
port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, IO_KBDSIZE, RF_ACTIVE);
if (!port)
return ENXIO;
error = atkbdc_attach_unit(unit, sc, rman_get_start(port));
if (error) if (error)
return error; return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc; *(atkbdc_softc_t **)device_get_softc(dev) = sc;