From 5d90a8316091b2c740611b583756689d25ab078a Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 1 Jul 2005 15:05:07 +0000 Subject: [PATCH] constify --- sys/dev/pcmcia/isic_pcmcia.c | 18 +++++++++--------- sys/dev/pcmcia/isic_pcmcia_avm_fritz.c | 6 +++--- sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c index 094a71f19b43..bec2f37df7fe 100644 --- a/sys/dev/pcmcia/isic_pcmcia.c +++ b/sys/dev/pcmcia/isic_pcmcia.c @@ -35,7 +35,7 @@ */ #include -__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 #include @@ -95,12 +95,12 @@ CFATTACH_DECL(isic_pcmcia, sizeof(struct pcmcia_isic_softc), isic_pcmcia_detach, isic_pcmcia_activate); struct isic_pcmcia_card_entry { - int32_t vendor; /* vendor ID */ - int32_t product; /* product ID */ - char *cis1_info[4]; /* CIS info to match */ - char *name; /* name of controller */ - int function; /* expected PCMCIA function type */ - int card_type; /* card type found */ + int32_t vendor; /* vendor ID */ + int32_t product; /* product ID */ + const char *cis1_info[4]; /* CIS info to match */ + const char *name; /* name of controller */ + int function; /* expected PCMCIA function type */ + int card_type; /* card type found */ isic_pcmcia_attach_func attach; /* card initialization */ }; @@ -304,7 +304,7 @@ isic_pcmcia_activate(self, act) int 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 B1", "2085 Version B2", @@ -312,7 +312,7 @@ isic_pcmcia_isdn_attach(struct isic_softc *sc, const char *cardname) "Unknown Version" }; - static char *HSCXversion[] = { + static const char *HSCXversion[] = { "82525 Version A1", "Unknown (0x01)", "82525 Version A2", diff --git a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c index 0171f6cb665a..62cd677bcfd2 100644 --- a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c +++ b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c @@ -33,7 +33,7 @@ * 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] * @@ -43,7 +43,7 @@ *---------------------------------------------------------------------------*/ #include -__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" #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_handle_t h = sc->sc_maps[0].h; 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 diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c index 96d2c7e020ee..cdd2144fc35f 100644 --- a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c +++ b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c @@ -35,7 +35,7 @@ */ #include -__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" #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) { case ISIC_WHAT_ISAC: 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; case ISIC_WHAT_HSCXA: 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; case ISIC_WHAT_HSCXB: 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; } }