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

Filename cleanup police (per discussion with Soren S. Jorvang):

Browse Source 
remove all (legacy) "i4b_" prefixes outside of sys/netisdn.
Prefix all card specific driver support files with the basename
of the driver bus attachement file.

Renamed here:
isapnp_isic.c -> isic_isapnp.c
i4b_ctx_s0P.c -> isic_isapnp_ctx_s0P.c
i4b_drn_ngo.c -> isic_isapnp_drn_ngo.c
i4b_dynalink.c -> isic_isapnp_dynalink.c
i4b_elsa_qs1i.c -> isic_isapnp_elsa_qs1i.c
i4b_siemens_isurf.c -> isic_isapnp_siemens_isurf.c
i4b_sws.c -> isic_isapnp_sws.c
i4b_tel_s0P.c -> isic_isapnp_tel_s0P.c
This commit is contained in:
martin 2001-02-18 09:24:49 +00:00
parent 6b94acce7c
commit 40db0102c3
9 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/isapnp/files.isapnp
View File

@ -1,4 +1,4 @@
# $NetBSD: files.isapnp,v 1.25 2001/01/05 13:09:17 martin Exp $
# $NetBSD: files.isapnp,v 1.26 2001/02/18 09:24:49 martin Exp $
#
# Config file and device description for machine-independent ISAPnP code.
# Included by ports that need it.
@ -84,18 +84,18 @@ attach aic at isapnp with aic_isapnp
file dev/isapnp/aic_isapnp.c aic_isapnp
# ISDN devices
attach isic at isapnp with isapnp_isic
file dev/isapnp/isapnp_isic.c isapnp_isic
attach isic at isapnp with isic_isapnp
file dev/isapnp/isic_isapnp.c isic_isapnp
defopt opt_isicpnp.h ISICPNP_TEL_S0_16_3_P ISICPNP_CRTX_S0_P ISICPNP_DRN_NGO
ISICPNP_ELSA_QS1ISA ISICPNP_ELSA_PCC16
ISICPNP_SEDLBAUER ISICPNP_DYNALINK
ISICPNP_SIEMENS_ISURF2
file dev/isapnp/i4b_tel_s0P.c isapnp_isic
file dev/isapnp/i4b_ctx_s0P.c isapnp_isic
file dev/isapnp/i4b_drn_ngo.c isapnp_isic
file dev/isapnp/i4b_elsa_qs1i.c isapnp_isic
file dev/isapnp/i4b_sws.c isapnp_isic
file dev/isapnp/i4b_dynalink.c isapnp_isic
file dev/isapnp/i4b_siemens_isurf.c isapnp_isic
file dev/isapnp/isic_isapnp_tel_s0P.c isic_isapnp
file dev/isapnp/isic_isapnp_ctx_s0P.c isic_isapnp
file dev/isapnp/isic_isapnp_drn_ngo.c isic_isapnp
file dev/isapnp/isic_isapnp_elsa_qs1i.c isic_isapnp
file dev/isapnp/isic_isapnp_sws.c isic_isapnp
file dev/isapnp/isic_isapnp_dynalink.c isic_isapnp
file dev/isapnp/isic_isapnp_siemens_isurf.c isic_isapnp

36
sys/dev/isapnp/isapnp_isic.c → sys/dev/isapnp/isic_isapnp.c
View File

@ -33,7 +33,7 @@
* isapnp_isic.c - ISA-P&P bus frontend for i4b_isic driver
* --------------------------------------------------------
*
* $Id: isapnp_isic.c,v 1.1.1.1 2001/01/05 12:50:16 martin Exp $
* $Id: isic_isapnp.c,v 1.1 2001/02/18 09:24:52 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@ -83,21 +83,24 @@
#include "opt_isicpnp.h"
#ifdef __BROKEN_INDIRECT_CONFIG
static int isapnp_isic_probe __P((struct device *, void *, void *));
static int isic_isapnp_probe __P((struct device *, void *, void *));
#else
static int isapnp_isic_probe __P((struct device *, struct cfdata *, void *));
static int isic_isapnp_probe __P((struct device *, struct cfdata *, void *));
#endif
static void isapnp_isic_attach __P((struct device *, struct device *, void *));
static void isic_isapnp_attach __P((struct device *, struct device *, void *));
struct cfattach isapnp_isic_ca = {
sizeof(struct l1_softc), isapnp_isic_probe, isapnp_isic_attach
struct cfattach isic_isapnp_ca = {
sizeof(struct l1_softc), isic_isapnp_probe, isic_isapnp_attach
};
typedef void (*allocmaps_func)(struct isapnp_attach_args *ipa, struct l1_softc *sc);
typedef void (*attach_func)(struct l1_softc *sc);
/* map allocators */
#if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_SEDLBAUER) \
|| defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2)
static void generic_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc);
#endif
#ifdef ISICPNP_DRN_NGO
static void ngo_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc);
#endif
@ -114,15 +117,15 @@ extern void isic_attach_sws __P((struct l1_softc *sc));
extern void isic_attach_Eqs1pi __P((struct l1_softc *sc));
extern void isic_attach_siemens_isurf __P((struct l1_softc *sc));
struct isapnp_isic_card_desc {
struct isic_isapnp_card_desc {
char *devlogic; /* ISAPNP logical device ID */
char *name; /* Name of the card */
int card_type; /* isic card type identifier */
allocmaps_func allocmaps; /* map allocator function */
attach_func attach; /* card attach and init function */
};
static const struct isapnp_isic_card_desc
isapnp_isic_descriptions[] =
static const struct isic_isapnp_card_desc
isic_isapnp_descriptions[] =
{
#ifdef ISICPNP_CRTX_S0_P
{ "CTX0000", "Creatix ISDN S0-16 P&P", CARD_TYPEP_CS0P,
@ -153,16 +156,16 @@ isapnp_isic_descriptions[] =
generic_pnp_mapalloc, isic_attach_siemens_isurf },
#endif
};
#define NUM_DESCRIPTIONS (sizeof(isapnp_isic_descriptions)/sizeof(isapnp_isic_descriptions[0]))
#define NUM_DESCRIPTIONS (sizeof(isic_isapnp_descriptions)/sizeof(isic_isapnp_descriptions[0]))
/*
* Probe card
*/
static int
#ifdef __BROKEN_INDIRECT_CONFIG
isapnp_isic_probe(parent, match, aux)
isic_isapnp_probe(parent, match, aux)
#else
isapnp_isic_probe(parent, cf, aux)
isic_isapnp_probe(parent, cf, aux)
#endif
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
@ -173,7 +176,7 @@ isapnp_isic_probe(parent, cf, aux)
void *aux;
{
struct isapnp_attach_args *ipa = aux;
const struct isapnp_isic_card_desc *desc = isapnp_isic_descriptions;
const struct isic_isapnp_card_desc *desc = isic_isapnp_descriptions;
int i;
for (i = 0; i < NUM_DESCRIPTIONS; i++, desc++)
@ -201,7 +204,7 @@ isapnp_isic_probe(parent, cf, aux)
#endif
static void
isapnp_isic_attach(parent, self, aux)
isic_isapnp_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
@ -225,7 +228,7 @@ isapnp_isic_attach(parent, self, aux)
struct l1_softc *sc = (void *)self;
struct isapnp_attach_args *ipa = aux;
const struct isapnp_isic_card_desc *desc = isapnp_isic_descriptions;
const struct isic_isapnp_card_desc *desc = isic_isapnp_descriptions;
int i;
for (i = 0; i < NUM_DESCRIPTIONS; i++, desc++)
@ -362,6 +365,8 @@ isapnp_isic_attach(parent, self, aux)
}
}
#if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_SEDLBAUER) \
|| defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2)
static void
generic_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc)
{
@ -371,6 +376,7 @@ generic_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc)
sc->sc_maps[0].h = ipa->ipa_io[0].h;
sc->sc_maps[0].size = 0; /* foreign mapping, leave it alone */
}
#endif
#ifdef ISICPNP_DRN_NGO
static void

2
sys/dev/isapnp/i4b_ctx_s0P.c → sys/dev/isapnp/isic_isapnp_ctx_s0P.c
View File

@ -27,7 +27,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
* ============================================================
*
* $Id: i4b_ctx_s0P.c,v 1.1.1.1 2001/01/05 12:50:18 martin Exp $
* $Id: isic_isapnp_ctx_s0P.c,v 1.1 2001/02/18 09:24:53 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_drn_ngo.c → sys/dev/isapnp/isic_isapnp_drn_ngo.c
View File

@ -27,7 +27,7 @@
* i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
* --------------------------------------------------------
*
* $Id: i4b_drn_ngo.c,v 1.1.1.1 2001/01/05 12:50:18 martin Exp $
* $Id: isic_isapnp_drn_ngo.c,v 1.1 2001/02/18 09:24:53 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_dynalink.c → sys/dev/isapnp/isic_isapnp_dynalink.c
View File

@ -33,7 +33,7 @@
* isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
* ==================================================
*
* $Id: i4b_dynalink.c,v 1.1.1.1 2001/01/05 12:50:17 martin Exp $
* $Id: isic_isapnp_dynalink.c,v 1.1 2001/02/18 09:24:53 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_elsa_qs1i.c → sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
View File

@ -27,7 +27,7 @@
* isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
* =====================================================================
*
* $Id: i4b_elsa_qs1i.c,v 1.1.1.1 2001/01/05 12:50:17 martin Exp $
* $Id: isic_isapnp_elsa_qs1i.c,v 1.1 2001/02/18 09:24:54 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_siemens_isurf.c → sys/dev/isapnp/isic_isapnp_siemens_isurf.c
View File

@ -37,7 +37,7 @@
* Siemens I-Surf 2.0 PnP specific routines for isic driver
* --------------------------------------------------------
*
* $Id: i4b_siemens_isurf.c,v 1.1.1.1 2001/01/05 12:50:18 martin Exp $
* $Id: isic_isapnp_siemens_isurf.c,v 1.1 2001/02/18 09:24:54 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_sws.c → sys/dev/isapnp/isic_isapnp_sws.c
View File

@ -47,7 +47,7 @@
* EXPERIMENTAL !!!!
* =================
*
* $Id: i4b_sws.c,v 1.1.1.1 2001/01/05 12:50:17 martin Exp $
* $Id: isic_isapnp_sws.c,v 1.1 2001/02/18 09:24:54 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*

2
sys/dev/isapnp/i4b_tel_s0P.c → sys/dev/isapnp/isic_isapnp_tel_s0P.c
View File

@ -38,7 +38,7 @@
* EXPERIMENTAL !!!
* ================
*
* $Id: i4b_tel_s0P.c,v 1.1.1.1 2001/01/05 12:50:18 martin Exp $
* $Id: isic_isapnp_tel_s0P.c,v 1.1 2001/02/18 09:24:54 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*