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

Initialize sc_frequency. (How could this ever work?)

Browse Source 
Add PnP entry for USR Sportster 56k internal modem.
Remove BROKEN_INDIRECT_CONFIG.
This commit is contained in:
drochner 1998-04-25 10:58:24 +00:00
parent 1a2907e5b4
commit 0652ed68a5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: com_isapnp.c,v 1.11 1998/02/25 13:18:50 christos Exp $ */ /* $NetBSD: com_isapnp.c,v 1.12 1998/04/25 10:58:24 drochner Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -62,11 +62,7 @@ struct com_isapnp_softc {
void *sc_ih; /* interrupt handler */ void *sc_ih; /* interrupt handler */
}; };
#ifdef __BROKEN_INDIRECT_CONFIG
int com_isapnp_match __P((struct device *, void *, void *));
#else
int com_isapnp_match __P((struct device *, struct cfdata *, void *)); int com_isapnp_match __P((struct device *, struct cfdata *, void *));
#endif
void com_isapnp_attach __P((struct device *, struct device *, void *)); void com_isapnp_attach __P((struct device *, struct device *, void *));
struct cfattach com_isapnp_ca = { struct cfattach com_isapnp_ca = {
@ -76,11 +72,7 @@ struct cfattach com_isapnp_ca = {
int int
com_isapnp_match(parent, match, aux) com_isapnp_match(parent, match, aux)
struct device *parent; struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
void *match;
#else
struct cfdata *match; struct cfdata *match;
#endif
void *aux; void *aux;
{ {
struct isapnp_attach_args *ipa = aux; struct isapnp_attach_args *ipa = aux;
@ -90,6 +82,7 @@ com_isapnp_match(parent, match, aux)
strcmp(ipa->ipa_devlogic, "OZO8039") && /* Zoom 56k flex */ strcmp(ipa->ipa_devlogic, "OZO8039") && /* Zoom 56k flex */
strcmp(ipa->ipa_devlogic, "BRI1400") && /* Boca 33.6 PnP */ strcmp(ipa->ipa_devlogic, "BRI1400") && /* Boca 33.6 PnP */
strcmp(ipa->ipa_devlogic, "ROK0010") && /* Rockwell ? */ strcmp(ipa->ipa_devlogic, "ROK0010") && /* Rockwell ? */
strcmp(ipa->ipa_devlogic, "USR2070") && /* USR Sportster 56k */
strcmp(ipa->ipa_devcompat, "PNP0500") && /* generic 8250/16450 */ strcmp(ipa->ipa_devcompat, "PNP0500") && /* generic 8250/16450 */
strcmp(ipa->ipa_devcompat, "PNP0501")) /* generic 16550A */ strcmp(ipa->ipa_devcompat, "PNP0501")) /* generic 16550A */
return (0); return (0);
@ -122,6 +115,8 @@ com_isapnp_attach(parent, self, aux)
if (comprobe1(sc->sc_iot, sc->sc_ioh, sc->sc_iobase) == 0) if (comprobe1(sc->sc_iot, sc->sc_ioh, sc->sc_iobase) == 0)
return; return;
sc->sc_frequency = 115200 * 16; /* is that always right? */
com_attach_subr(sc); com_attach_subr(sc);
isc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num, isc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,