Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pulldown from marc-pcmcia branch.

Browse Source
This commit is contained in:
thorpej 1997-10-15 22:00:10 +00:00
parent 2e1df18229
commit 9ba1ceb091
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ic/comvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: comvar.h,v 1.15 1997/09/16 20:34:29 is Exp $ */
/* $NetBSD: comvar.h,v 1.16 1997/10/15 22:00:17 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -53,7 +53,6 @@ int com_is_console __P((bus_space_tag_t, int, bus_space_handle_t *));
struct com_softc {
struct device sc_dev;
void *sc_ih;
void *sc_si;
struct tty *sc_tty;
@ -61,7 +60,7 @@ struct com_softc {
int sc_floods;
int sc_errors;
int sc_iobase;
int sc_iobase; /* XXX ISA-centric name */
int sc_frequency;
bus_space_tag_t sc_iot;

16
sys/dev/isa/com_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_isa.c,v 1.6 1997/09/16 20:34:25 is Exp $ */
/* $NetBSD: com_isa.c,v 1.7 1997/10/15 22:00:10 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996
@ -59,6 +59,13 @@
#include <dev/isa/comreg.h>
#include <dev/isa/comvar.h>
struct com_isa_softc {
struct com_softc sc_com; /* real "com" softc */
/* ISA-specific goo. */
void *sc_ih; /* interrupt handler */
};
#ifdef __BROKEN_INDIRECT_CONFIG
int com_isa_probe __P((struct device *, void *, void *));
#else
@ -68,7 +75,7 @@ void com_isa_attach __P((struct device *, struct device *, void *));
void com_isa_cleanup __P((void *));
struct cfattach com_isa_ca = {
sizeof(struct com_softc), com_isa_probe, com_isa_attach
sizeof(struct com_isa_softc), com_isa_probe, com_isa_attach
};
int
@ -111,7 +118,8 @@ com_isa_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct com_softc *sc = (void *)self;
struct com_isa_softc *isc = (void *)self;
struct com_softc *sc = &isc->sc_com;
int iobase, irq;
bus_space_tag_t iot;
struct isa_attach_args *ia = aux;
@ -131,7 +139,7 @@ com_isa_attach(parent, self, aux)
com_attach_subr(sc);
if (irq != IRQUNK) {
sc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
isc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
IST_EDGE, IPL_SERIAL, comintr, sc);
}

5
sys/dev/isa/comvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: comvar.h,v 1.15 1997/09/16 20:34:29 is Exp $ */
/* $NetBSD: comvar.h,v 1.16 1997/10/15 22:00:17 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -53,7 +53,6 @@ int com_is_console __P((bus_space_tag_t, int, bus_space_handle_t *));
struct com_softc {
struct device sc_dev;
void *sc_ih;
void *sc_si;
struct tty *sc_tty;
@ -61,7 +60,7 @@ struct com_softc {
int sc_floods;
int sc_errors;
int sc_iobase;
int sc_iobase; /* XXX ISA-centric name */
int sc_frequency;
bus_space_tag_t sc_iot;

18
sys/dev/isapnp/com_isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_isapnp.c,v 1.3 1997/08/03 08:24:07 mikel Exp $ */
/* $NetBSD: com_isapnp.c,v 1.4 1997/10/15 22:03:05 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -55,11 +55,18 @@
#include <dev/isa/comvar.h>
struct com_isapnp_softc {
struct com_softc sc_com; /* real "com" softc */
/* ISAPnP-specific goo. */
void *sc_ih; /* interrupt handler */
};
int com_isapnp_match __P((struct device *, void *, void *));
void com_isapnp_attach __P((struct device *, struct device *, void *));
struct cfattach com_isapnp_ca = {
sizeof(struct com_softc), com_isapnp_match, com_isapnp_attach
sizeof(struct com_isapnp_softc), com_isapnp_match, com_isapnp_attach
};
int
@ -82,7 +89,8 @@ com_isapnp_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct com_softc *sc = (struct com_softc *)self;
struct com_isapnp_softc *isc = (void *)self;
struct com_softc *sc = &isc->sc_com;
struct isapnp_attach_args *ipa = aux;
if (isapnp_config(ipa->ipa_iot, ipa->ipa_memt, ipa)) {
@ -103,6 +111,6 @@ com_isapnp_attach(parent, self, aux)
com_attach_subr(sc);
sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
IST_EDGE, IPL_SERIAL, comintr, sc);
isc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
IST_EDGE, IPL_SERIAL, comintr, sc);
}