[src/trunk]: src/sys/dev make the isdn drivers compile again with -Wconst, -W...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4cb043d096d8
branches:  trunk
changeset: 582852:4cb043d096d8
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jul 09 02:05:09 2005 +0000

description:
make the isdn drivers compile again with -Wconst, -Wshadow

diffstat:

 sys/dev/ic/iavc.c                          |  10 +++++-----
 sys/dev/isa/isic_isa.c                     |   8 ++++----
 sys/dev/isa/isic_isa_avm_a1.c              |   6 +++---
 sys/dev/isa/isic_isa_itk_ix1.c             |   8 ++++----
 sys/dev/isa/isic_isa_tel_s0163.c           |   6 +++---
 sys/dev/isapnp/isic_isapnp.c               |  10 +++++-----
 sys/dev/isapnp/isic_isapnp_ctx_s0P.c       |   6 +++---
 sys/dev/isapnp/isic_isapnp_drn_ngo.c       |   6 +++---
 sys/dev/isapnp/isic_isapnp_dynalink.c      |  10 +++++-----
 sys/dev/isapnp/isic_isapnp_elsa_qs1i.c     |  10 +++++-----
 sys/dev/isapnp/isic_isapnp_siemens_isurf.c |  10 +++++-----
 sys/dev/isapnp/isic_isapnp_sws.c           |  10 +++++-----
 sys/dev/isapnp/isic_isapnp_tel_s0P.c       |   6 +++---
 sys/dev/pci/ifpci.c                        |  10 +++++-----
 sys/dev/pci/iwic_bchan.c                   |  10 +++++-----
 sys/dev/pci/iwic_fsm.c                     |  12 ++++++------
 sys/dev/pci/iwicvar.h                      |  20 ++++++++++----------
 sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c  |  16 ++++++++--------
 18 files changed, 87 insertions(+), 87 deletions(-)

diffs (truncated from 679 to 300 lines):

diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/ic/iavc.c
--- a/sys/dev/ic/iavc.c Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/ic/iavc.c Sat Jul 09 02:05:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iavc.c,v 1.2 2005/02/27 00:27:01 perry Exp $   */
+/*     $NetBSD: iavc.c,v 1.3 2005/07/09 02:05:09 christos Exp $        */
 
 /*
  * Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.2 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.3 2005/07/09 02:05:09 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -582,7 +582,7 @@
 {
     u_int32_t Length;
     u_int8_t *p;
-    u_int8_t *cardtype, *serial, *profile, *version, *caps, *prot;
+    u_int8_t *cardtype, *serial, *profile, *vers, *caps, *prot;
 
     if (sc->sc_dma) {
        p = amcc_get_word(dmabuf, &Length);
@@ -604,7 +604,7 @@
     }
 #endif
 
-    version = (p + 1);
+    vers = (p + 1);
     p += (*p + 1); /* driver version */
     cardtype = (p + 1);
     p += (*p + 1); /* card type */
@@ -621,7 +621,7 @@
        int nbch = ((profile[3]<<8) | profile[2]);
 
        aprint_normal("%s: AVM %s, s/n %s, %d chans, f/w rev %s, prot %s\n",
-               sc->sc_dev.dv_xname, cardtype, serial, nbch, version, prot);
+               sc->sc_dev.dv_xname, cardtype, serial, nbch, vers, prot);
        aprint_verbose("%s: %s\n", sc->sc_dev.dv_xname, caps);
 
         capi_ll_control(&sc->sc_capi, CAPI_CTRL_PROFILE, (int) profile);
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isa/isic_isa.c
--- a/sys/dev/isa/isic_isa.c    Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isa/isic_isa.c    Sat Jul 09 02:05:09 2005 +0000
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.22 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.23 2005/07/09 02:05:09 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -381,7 +381,7 @@
 isicattach(int flags, struct isic_softc *sc)
 {
        int ret = 0;
-       char *drvid;
+       const char *drvid;
 
 #ifdef __FreeBSD__
 
@@ -405,7 +405,7 @@
 
 #endif /* __FreeBSD__ */
 
-       static char *ISACversion[] = {
+       static const char *ISACversion[] = {
                "2085 Version A1/A2 or 2086/2186 Version 1.1",
                "2085 Version B1",
                "2085 Version B2",
@@ -413,7 +413,7 @@
                "Unknown Version"
        };
 
-       static char *HSCXversion[] = {
+       static const char *HSCXversion[] = {
                "82525 Version A1",
                "Unknown (0x01)",
                "82525 Version A2",
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isa/isic_isa_avm_a1.c
--- a/sys/dev/isa/isic_isa_avm_a1.c     Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isa/isic_isa_avm_a1.c     Sat Jul 09 02:05:09 2005 +0000
@@ -35,14 +35,14 @@
  *     i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
  *     ------------------------------------------------------------
  *
- *     $Id: isic_isa_avm_a1.c,v 1.6 2005/02/27 00:27:17 perry Exp $
+ *     $Id: isic_isa_avm_a1.c,v 1.7 2005/07/09 02:05:09 christos Exp $
  *
  *      last edit-date: [Fri Jan  5 11:37:22 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.6 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicisa.h"
 #ifdef ISICISA_AVM_A1
@@ -149,7 +149,7 @@
 {
        bus_space_tag_t t = sc->sc_maps[what+4].t;
        bus_space_handle_t h = sc->sc_maps[what+4].h;
-       bus_space_write_multi_1(t, h, 0, (u_int8_t*)buf, size);
+       bus_space_write_multi_1(t, h, 0, buf, size);
 }
 #endif
 
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isa/isic_isa_itk_ix1.c
--- a/sys/dev/isa/isic_isa_itk_ix1.c    Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isa/isic_isa_itk_ix1.c    Sat Jul 09 02:05:09 2005 +0000
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.10 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.11 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicisa.h"
 
@@ -405,15 +405,15 @@
        switch (what) {
                case ISIC_WHAT_ISAC:
                        bus_space_write_1(t, h, ITK_ALE, 0);
-                       bus_space_write_multi_1(t, h, ITK_ISAC_DATA, (u_int8_t*)buf, size);
+                       bus_space_write_multi_1(t, h, ITK_ISAC_DATA, buf, size);
                        break;
                case ISIC_WHAT_HSCXA:
                        bus_space_write_1(t, h, ITK_ALE, HSCXA);
-                       bus_space_write_multi_1(t, h, ITK_HSCX_DATA, (u_int8_t*)buf, size);
+                       bus_space_write_multi_1(t, h, ITK_HSCX_DATA, buf, size);
                        break;
                case ISIC_WHAT_HSCXB:
                        bus_space_write_1(t, h, ITK_ALE, HSCXB);
-                       bus_space_write_multi_1(t, h, ITK_HSCX_DATA, (u_int8_t*)buf, size);
+                       bus_space_write_multi_1(t, h, ITK_HSCX_DATA, buf, size);
                        break;
        }
 }
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isa/isic_isa_tel_s0163.c
--- a/sys/dev/isa/isic_isa_tel_s0163.c  Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isa/isic_isa_tel_s0163.c  Sat Jul 09 02:05:09 2005 +0000
@@ -37,7 +37,7 @@
  *     isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
  *     ========================================================
  *
- *     $Id: isic_isa_tel_s0163.c,v 1.6 2005/02/27 00:27:17 perry Exp $
+ *     $Id: isic_isa_tel_s0163.c,v 1.7 2005/07/09 02:05:09 christos Exp $
  *
  *      last edit-date: [Fri Jan  5 11:37:22 2001]
  *
@@ -49,7 +49,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.6 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicisa.h"
 #ifdef ISICISA_TEL_S0_16_3
@@ -151,7 +151,7 @@
         bus_space_tag_t t = sc->sc_maps[what+1].t;
         bus_space_handle_t h = sc->sc_maps[what+1].h;
         bus_size_t o = sc->sc_maps[what+1].offset;
-        bus_space_write_multi_1(t, h, o + 0x1e, (u_int8_t*)buf, size);
+        bus_space_write_multi_1(t, h, o + 0x1e, buf, size);
 }
 #endif
 
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isapnp/isic_isapnp.c
--- a/sys/dev/isapnp/isic_isapnp.c      Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isapnp/isic_isapnp.c      Sat Jul 09 02:05:09 2005 +0000
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.19 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.20 2005/07/09 02:05:09 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -119,8 +119,8 @@
 extern void isic_attach_isapnp_itkix1(struct isic_softc *sc);
 
 struct isic_isapnp_card_desc {
-       char *devlogic;                 /* ISAPNP logical device ID */
-       char *name;                     /* Name of the card */
+       const char *devlogic;           /* ISAPNP logical device ID */
+       const 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 */
@@ -212,7 +212,7 @@
        struct device *parent, *self;
        void *aux;
 {
-       static char *ISACversion[] = {
+       static const char *ISACversion[] = {
                "2085 Version A1/A2 or 2086/2186 Version 1.1",
                "2085 Version B1",
                "2085 Version B2",
@@ -220,7 +220,7 @@
                "Unknown Version"
        };
 
-       static char *HSCXversion[] = {
+       static const char *HSCXversion[] = {
                "82525 Version A1",
                "Unknown (0x01)",
                "82525 Version A2",
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isapnp/isic_isapnp_ctx_s0P.c
--- a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c      Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c      Sat Jul 09 02:05:09 2005 +0000
@@ -27,14 +27,14 @@
  *     isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
  *     ============================================================
  *
- *     $Id: isic_isapnp_ctx_s0P.c,v 1.6 2005/02/27 00:27:21 perry Exp $
+ *     $Id: isic_isapnp_ctx_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.6 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicpnp.h"
 #if ISICPNP_CRTX_S0_P
@@ -141,7 +141,7 @@
         bus_space_tag_t t = sc->sc_maps[what+1].t;
         bus_space_handle_t h = sc->sc_maps[what+1].h;
         bus_size_t o = sc->sc_maps[what+1].offset;
-        bus_space_write_multi_1(t, h, o + 0x3e, (u_int8_t*)buf, size);
+        bus_space_write_multi_1(t, h, o + 0x3e, buf, size);
 }
 #endif
 
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isapnp/isic_isapnp_drn_ngo.c
--- a/sys/dev/isapnp/isic_isapnp_drn_ngo.c      Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isapnp/isic_isapnp_drn_ngo.c      Sat Jul 09 02:05:09 2005 +0000
@@ -27,14 +27,14 @@
  *     i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
  *     --------------------------------------------------------
  *
- *     $Id: isic_isapnp_drn_ngo.c,v 1.6 2005/02/27 00:27:21 perry Exp $
+ *     $Id: isic_isapnp_drn_ngo.c,v 1.7 2005/07/09 02:05:09 christos Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.6 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicpnp.h"
 #ifdef ISICPNP_DRN_NGO
@@ -489,7 +489,7 @@
        bus_space_tag_t t = sc->sc_maps[0].t;
        bus_space_handle_t hd = sc->sc_maps[0].h, ha = sc->sc_maps[1].h;
        bus_space_write_1(t, ha, offset[what].oa, offset[what].or);
-       bus_space_write_multi_1(t, hd, offset[what].od, (u_int8_t*)buf, size);
+       bus_space_write_multi_1(t, hd, offset[what].od, buf, size);
 }
 
 static void
diff -r 14cbb602cd98 -r 4cb043d096d8 sys/dev/isapnp/isic_isapnp_dynalink.c
--- a/sys/dev/isapnp/isic_isapnp_dynalink.c     Sat Jul 09 01:05:23 2005 +0000
+++ b/sys/dev/isapnp/isic_isapnp_dynalink.c     Sat Jul 09 02:05:09 2005 +0000
@@ -33,7 +33,7 @@
  *     isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
  *     ==================================================
  *
- *     $Id: isic_isapnp_dynalink.c,v 1.5 2005/02/27 00:27:21 perry Exp $
+ *     $Id: isic_isapnp_dynalink.c,v 1.6 2005/07/09 02:05:09 christos Exp $
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
@@ -75,7 +75,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.5 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.6 2005/07/09 02:05:09 christos Exp $");
 
 #include "opt_isicpnp.h"
 #ifdef ISICPNP_DYNALINK
@@ -501,15 +501,15 @@
        switch (what) {
                case ISIC_WHAT_ISAC:
                        bus_space_write_1(t, h, ADDR, 0);
-                       bus_space_write_multi_1(t, h, ISAC, (u_int8_t*)buf, size);
+                       bus_space_write_multi_1(t, h, ISAC, buf, size);