This commit is contained in:
martin 2005-07-01 15:05:07 +00:00
parent f4f599fe83
commit 5d90a83160
3 changed files with 16 additions and 16 deletions

View File

@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.27 2005/02/27 00:27:43 perry Exp $"); __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.28 2005/07/01 15:05:07 martin Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/errno.h> #include <sys/errno.h>
@ -95,12 +95,12 @@ CFATTACH_DECL(isic_pcmcia, sizeof(struct pcmcia_isic_softc),
isic_pcmcia_detach, isic_pcmcia_activate); isic_pcmcia_detach, isic_pcmcia_activate);
struct isic_pcmcia_card_entry { struct isic_pcmcia_card_entry {
int32_t vendor; /* vendor ID */ int32_t vendor; /* vendor ID */
int32_t product; /* product ID */ int32_t product; /* product ID */
char *cis1_info[4]; /* CIS info to match */ const char *cis1_info[4]; /* CIS info to match */
char *name; /* name of controller */ const char *name; /* name of controller */
int function; /* expected PCMCIA function type */ int function; /* expected PCMCIA function type */
int card_type; /* card type found */ int card_type; /* card type found */
isic_pcmcia_attach_func attach; /* card initialization */ isic_pcmcia_attach_func attach; /* card initialization */
}; };
@ -304,7 +304,7 @@ isic_pcmcia_activate(self, act)
int int
isic_pcmcia_isdn_attach(struct isic_softc *sc, const char *cardname) isic_pcmcia_isdn_attach(struct isic_softc *sc, const char *cardname)
{ {
static char *ISACversion[] = { static const char *ISACversion[] = {
"2085 Version A1/A2 or 2086/2186 Version 1.1", "2085 Version A1/A2 or 2086/2186 Version 1.1",
"2085 Version B1", "2085 Version B1",
"2085 Version B2", "2085 Version B2",
@ -312,7 +312,7 @@ isic_pcmcia_isdn_attach(struct isic_softc *sc, const char *cardname)
"Unknown Version" "Unknown Version"
}; };
static char *HSCXversion[] = { static const char *HSCXversion[] = {
"82525 Version A1", "82525 Version A1",
"Unknown (0x01)", "Unknown (0x01)",
"82525 Version A2", "82525 Version A2",

View File

@ -33,7 +33,7 @@
* Fritz!Card pcmcia specific routines for isic driver * Fritz!Card pcmcia specific routines for isic driver
* --------------------------------------------------- * ---------------------------------------------------
* *
* $Id: isic_pcmcia_avm_fritz.c,v 1.8 2005/02/27 00:27:43 perry Exp $ * $Id: isic_pcmcia_avm_fritz.c,v 1.9 2005/07/01 15:05:07 martin Exp $
* *
* last edit-date: [Fri Jan 5 11:39:32 2001] * last edit-date: [Fri Jan 5 11:39:32 2001]
* *
@ -43,7 +43,7 @@
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.8 2005/02/27 00:27:43 perry Exp $"); __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.9 2005/07/01 15:05:07 martin Exp $");
#include "opt_isicpcmcia.h" #include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_AVM_A1 #ifdef ISICPCMCIA_AVM_A1
@ -188,7 +188,7 @@ avma1_pcmcia_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t
bus_space_tag_t t = sc->sc_maps[0].t; bus_space_tag_t t = sc->sc_maps[0].t;
bus_space_handle_t h = sc->sc_maps[0].h; bus_space_handle_t h = sc->sc_maps[0].h;
bus_space_write_1(t, h, ADDR_REG_OFFSET, what_map[what]); bus_space_write_1(t, h, ADDR_REG_OFFSET, what_map[what]);
bus_space_write_multi_1(t, h, DATA_REG_OFFSET, (u_int8_t*)buf, size); bus_space_write_multi_1(t, h, DATA_REG_OFFSET, buf, size);
} }
#endif #endif

View File

@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.9 2005/02/27 00:27:43 perry Exp $"); __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.10 2005/07/01 15:05:07 martin Exp $");
#include "opt_isicpcmcia.h" #include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_ISDNMC #ifdef ISICPCMCIA_ELSA_ISDNMC
@ -170,15 +170,15 @@ elsa_isdnmc_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t
switch (what) { switch (what) {
case ISIC_WHAT_ISAC: case ISIC_WHAT_ISAC:
bus_space_write_1(t, h, ADDR_LATCH, 0); bus_space_write_1(t, h, ADDR_LATCH, 0);
bus_space_write_multi_1(t, h, ISAC_DATA, (u_int8_t*)buf, size); bus_space_write_multi_1(t, h, ISAC_DATA, buf, size);
break; break;
case ISIC_WHAT_HSCXA: case ISIC_WHAT_HSCXA:
bus_space_write_1(t, h, ADDR_LATCH, 0); bus_space_write_1(t, h, ADDR_LATCH, 0);
bus_space_write_multi_1(t, h, HSCX_DATA, (u_int8_t*)buf, size); bus_space_write_multi_1(t, h, HSCX_DATA, buf, size);
break; break;
case ISIC_WHAT_HSCXB: case ISIC_WHAT_HSCXB:
bus_space_write_1(t, h, ADDR_LATCH, 0x40); bus_space_write_1(t, h, ADDR_LATCH, 0x40);
bus_space_write_multi_1(t, h, HSCX_DATA, (u_int8_t*)buf, size); bus_space_write_multi_1(t, h, HSCX_DATA, buf, size);
break; break;
} }
} }