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

Be more specific than "some isic board".

Browse Source
This commit is contained in:
is 2001-04-26 05:58:41 +00:00
parent bb08989ba7
commit f7455bf6e8
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/amiga/dev/aster.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aster.c,v 1.13 2001/02/20 21:55:00 is Exp $ */
/* $NetBSD: aster.c,v 1.14 2001/04/26 05:58:41 is Exp $ */
/*-
* Copyright (c) 1998,2001 The NetBSD Foundation, Inc.
@ -110,7 +110,6 @@ asterattach(parent, self, auxp)
struct aster_softc *astrsc;
struct zbus_args *zap;
struct supio_attach_args supa;
char *cardname;
astrsc = (struct aster_softc *)self;
zap = auxp;
@ -121,25 +120,21 @@ asterattach(parent, self, auxp)
switch (zap->manid) {
case 5001:
cardname = "VMC ISDN Blaster";
supa.supio_name = "isic31";
supa.supio_name = "isic31VMC ISDN Blaster";
break;
case 2092:
cardname = "BSC ISDN Master/Master II";
supa.supio_name = "isic31";
supa.supio_name = "isic31BSC ISDN Master/Master II";
break;
case 5000:
cardname = "ITH ISDN Master II";
supa.supio_name = "isic13";
supa.supio_name = "isic13ITH ISDN Master II";
break;
case 2189:
cardname = "Zeus ISDN Link";
supa.supio_name = "isic@B";
supa.supio_name = "isic@BZeus ISDN Link";
break;
case 4626:
if (zap->serno == 0) {
cardname = "Individual Comp. ISDN Surfer";
supa.supio_name = "isic1C";
supa.supio_name =
"isic1CIndividual Comp. ISDN Surfer";
((volatile u_int8_t *)zap->va)[0x00fe] = 0xff;
if (((volatile u_int8_t *)zap->va)[0x00fe] & 0x80)
supa.supio_ipl = 6;
@ -149,7 +144,7 @@ asterattach(parent, self, auxp)
}
if (parent)
printf(" IPL %d: %s\n", supa.supio_ipl, cardname);
printf(" IPL %d: %s\n", supa.supio_ipl, supa.supio_name+6);
supa.supio_iot = &astrsc->sc_bst;

11
sys/arch/amiga/dev/isic_supio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_supio.c,v 1.6 2001/03/25 16:14:00 is Exp $ */
/* $NetBSD: isic_supio.c,v 1.7 2001/04/26 05:58:41 is Exp $ */
/*
* Copyright (c) 1998,2001 Ignatios Souvatzis. All rights reserved.
@ -89,7 +89,7 @@ extern const struct isdn_layer1_bri_driver isic_std_driver;
/*static*/ void aster_write_fifo __P((struct l1_softc *sc, int what,
const void *data, size_t size));
static int supio_isicattach __P((struct l1_softc *sc));
static int supio_isicattach __P((struct l1_softc *sc, char *));
struct isic_supio_softc {
struct l1_softc sc_isic;
@ -185,7 +185,7 @@ isic_supio_attach(parent, self, aux)
/* MI initialization of card */
printf("\n");
supio_isicattach(sc);
supio_isicattach(sc, sap->supio_name+6);
ssc->sc_isr.isr_intr = isicintr;
ssc->sc_isr.isr_arg = sc;
@ -259,7 +259,7 @@ aster_write_reg(struct l1_softc *sc, int what, bus_size_t offs, u_int8_t data)
#define TERMFMT "\n"
int
supio_isicattach(struct l1_softc *sc)
supio_isicattach(struct l1_softc *sc, char *cardname)
{
static char *ISACversion[] = {
"2085 Version A1/A2 or 2086/2186 Version 1.1",
@ -353,7 +353,8 @@ supio_isicattach(struct l1_softc *sc)
/* init higher protocol layers */
/* MPH_Status_Ind(sc->sc_unit, STI_ATTACH, sc->sc_cardtyp); */
sc->sc_l2 = isdn_attach_layer1_bri(sc, sc->sc_dev.dv_xname, "some isic card", &isic_std_driver);
sc->sc_l2 = isdn_attach_layer1_bri(sc, sc->sc_dev.dv_xname,
cardname, &isic_std_driver);
/* announce chip versions */