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

Rename isa_isic.c to i4b_isic_isa.c and isadaic.c to i4b_daic_isa.c 

to improve naming consistency.
This commit is contained in:
martin 2001-02-17 15:38:09 +00:00
parent 618dd31ddd
commit 48501b8e83
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/isa/files.isa
View File

@ -1,4 +1,4 @@
# $NetBSD: files.isa,v 1.107 2001/01/05 13:09:17 martin Exp $ # $NetBSD: files.isa,v 1.108 2001/02/17 15:38:09 martin Exp $
# #
# Config file and device description for machine-independent ISA code. # Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be # Included by ports that need it. Requires that the SCSI files be
@ -434,20 +434,20 @@ attach lm at isa with lm_isa
file dev/isa/lm_isa.c lm_isa file dev/isa/lm_isa.c lm_isa
# ISDN devices # ISDN devices
attach isic at isa with isa_isic attach isic at isa with isic_isa
file dev/isa/isa_isic.c isa_isic file dev/isa/i4b_isic_isa.c isic_isa
attach daic at isa with isa_daic attach daic at isa with daic_isa
file dev/isa/isadaic.c isa_daic file dev/isa/i4b_daic_isa.c daic_isa
defopt opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3 defopt opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3
ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1 ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1
file dev/isa/i4b_tel_s08.c isa_isic file dev/isa/i4b_tel_s08.c isic_isa
file dev/isa/i4b_tel_s016.c isa_isic file dev/isa/i4b_tel_s016.c isic_isa
file dev/isa/i4b_tel_s0163.c isa_isic file dev/isa/i4b_tel_s0163.c isic_isa
file dev/isa/i4b_avm_a1.c isa_isic file dev/isa/i4b_avm_a1.c isic_isa
file dev/isa/i4b_usr_sti.c isa_isic file dev/isa/i4b_usr_sti.c isic_isa
file dev/isa/i4b_itk_ix1.c isa_isic file dev/isa/i4b_itk_ix1.c isic_isa
# #
# ISA Plug 'n Play autoconfiguration glue. # ISA Plug 'n Play autoconfiguration glue.

28
sys/dev/isa/isadaic.c → sys/dev/isa/i4b_daic_isa.c
View File

@ -45,29 +45,29 @@
#include <dev/ic/daicvar.h> #include <dev/ic/daicvar.h>
/* driver state */ /* driver state */
struct isa_daic_softc { struct daic_isa_softc {
struct daic sc_daic; /* MI driver state */ struct daic sc_daic; /* MI driver state */
void *sc_ih; /* interrupt handler */ void *sc_ih; /* interrupt handler */
}; };
/* local functions */ /* local functions */
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
static int isa_daic_probe __P((struct device *, void *, void *)); static int daic_isa_probe __P((struct device *, void *, void *));
#else #else
static int isa_daic_probe __P((struct device *, struct cfdata *, void *)); static int daic_isa_probe __P((struct device *, struct cfdata *, void *));
#endif #endif
static void isa_daic_attach __P((struct device *, struct device *, void *)); static void daic_isa_attach __P((struct device *, struct device *, void *));
static int isa_daic_intr __P((void *)); static int daic_isa_intr __P((void *));
struct cfattach isa_daic_ca = { struct cfattach daic_isa_ca = {
sizeof(struct isa_daic_softc), isa_daic_probe, isa_daic_attach sizeof(struct daic_isa_softc), daic_isa_probe, daic_isa_attach
}; };
static int static int
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
isa_daic_probe(parent, match, aux) daic_isa_probe(parent, match, aux)
#else #else
isa_daic_probe(parent, cf, aux) daic_isa_probe(parent, cf, aux)
#endif #endif
struct device *parent; struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
@ -110,11 +110,11 @@ bad:
} }
static void static void
isa_daic_attach(parent, self, aux) daic_isa_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {
struct isa_daic_softc *sc = (void *)self; struct daic_isa_softc *sc = (void *)self;
struct isa_attach_args *ia = aux; struct isa_attach_args *ia = aux;
bus_space_tag_t memt = ia->ia_memt; bus_space_tag_t memt = ia->ia_memt;
bus_space_handle_t memh; bus_space_handle_t memh;
@ -131,16 +131,16 @@ isa_daic_attach(parent, self, aux)
daic_attach(self, &sc->sc_daic); daic_attach(self, &sc->sc_daic);
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_NET, isa_daic_intr, sc); IPL_NET, daic_isa_intr, sc);
} }
/* /*
* Controller interrupt. * Controller interrupt.
*/ */
static int static int
isa_daic_intr(arg) daic_isa_intr(arg)
void *arg; void *arg;
{ {
struct isa_daic_softc *sc = arg; struct daic_isa_softc *sc = arg;
return daic_intr(&sc->sc_daic); return daic_intr(&sc->sc_daic);
} }

24
sys/dev/isa/isa_isic.c → sys/dev/isa/i4b_isic_isa.c
View File

@ -30,10 +30,10 @@
* *
*--------------------------------------------------------------------------- *---------------------------------------------------------------------------
* *
* isa_isic.c - ISA bus frontend for i4b_isic driver * isic_isa.c - ISA bus frontend for i4b_isic driver
* -------------------------------------------------- * --------------------------------------------------
* *
* $Id: isa_isic.c,v 1.2 2001/01/09 00:46:01 martin Exp $ * $Id: i4b_isic_isa.c,v 1.1 2001/02/17 15:38:09 martin Exp $
* *
* last edit-date: [Tue Jan 9 01:43:45 2001] * last edit-date: [Tue Jan 9 01:43:45 2001]
* *
@ -89,20 +89,20 @@
/* local functions */ /* local functions */
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
static int isa_isic_probe __P((struct device *, void *, void *)); static int isic_isa_probe __P((struct device *, void *, void *));
#else #else
static int isa_isic_probe __P((struct device *, struct cfdata *, void *)); static int isic_isa_probe __P((struct device *, struct cfdata *, void *));
#endif #endif
static void isa_isic_attach __P((struct device *, struct device *, void *)); static void isic_isa_attach __P((struct device *, struct device *, void *));
static int setup_io_map __P((int flags, bus_space_tag_t iot, static int setup_io_map __P((int flags, bus_space_tag_t iot,
bus_space_tag_t memt, bus_size_t iobase, bus_size_t maddr, bus_space_tag_t memt, bus_size_t iobase, bus_size_t maddr,
int *num_mappings, struct isic_io_map *maps, int *iosize, int *num_mappings, struct isic_io_map *maps, int *iosize,
int *msize)); int *msize));
static void args_unmap __P((int *num_mappings, struct isic_io_map *maps)); static void args_unmap __P((int *num_mappings, struct isic_io_map *maps));
struct cfattach isa_isic_ca = { struct cfattach isic_isa_ca = {
sizeof(struct l1_softc), isa_isic_probe, isa_isic_attach sizeof(struct l1_softc), isic_isa_probe, isic_isa_attach
}; };
#define ISIC_FMT "%s: " #define ISIC_FMT "%s: "
@ -114,9 +114,9 @@ struct cfattach isa_isic_ca = {
*/ */
static int static int
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
isa_isic_probe(parent, match, aux) isic_isa_probe(parent, match, aux)
#else #else
isa_isic_probe(parent, cf, aux) isic_isa_probe(parent, cf, aux)
#endif #endif
struct device *parent; struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
@ -136,7 +136,7 @@ isa_isic_probe(parent, cf, aux)
int ret = 0; int ret = 0;
#if 0 #if 0
printf("isic%d: enter isa_isic_probe\n", cf->cf_unit); printf("isic%d: enter isic_isa_probe\n", cf->cf_unit);
#endif #endif
/* check irq */ /* check irq */
@ -341,7 +341,7 @@ done:
args_unmap(&args.ia_num_mappings, &args.ia_maps[0]); args_unmap(&args.ia_num_mappings, &args.ia_maps[0]);
#if 0 #if 0
printf("isic%d: exit isa_isic_probe, return = %d\n", cf->cf_unit, ret); printf("isic%d: exit isic_isa_probe, return = %d\n", cf->cf_unit, ret);
#endif #endif
return ret; return ret;
@ -792,7 +792,7 @@ isicattach(int flags, struct l1_softc *sc)
* Attach the card * Attach the card
*/ */
static void static void
isa_isic_attach(parent, self, aux) isic_isa_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {