quell cast-qual and shadow warnings

This commit is contained in:
drochner 2005-06-01 18:07:04 +00:00
parent d481be4d04
commit b10340ac93
13 changed files with 57 additions and 59 deletions

View File

@ -27,14 +27,14 @@
* i4b - Siemens HSCX chip (B-channel) handling
* --------------------------------------------
*
* $Id: hscx.c,v 1.10 2005/02/27 00:27:01 perry Exp $
* $Id: hscx.c,v 1.11 2005/06/01 18:16:22 drochner Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.10 2005/02/27 00:27:01 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.11 2005/06/01 18:16:22 drochner Exp $");
#include <sys/param.h>
#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001
@ -344,7 +344,6 @@ isic_hscx_irq(register struct isic_softc *sc, u_char ista, int h_chan, u_char ex
* a look at isic_bchannel_start() in i4b_bchan.c !
*/
int activity = -1;
int len;
int nextlen;

View File

@ -27,14 +27,14 @@
* i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
* --------------------------------------------------
*
* $Id: isic_l1fsm.c,v 1.10 2005/02/27 00:27:01 perry Exp $
* $Id: isic_l1fsm.c,v 1.11 2005/06/01 18:16:22 drochner Exp $
*
* last edit-date: [Fri Jan 5 11:36:11 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.10 2005/02/27 00:27:01 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.11 2005/06/01 18:16:22 drochner Exp $");
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.10 2005/02/27 00:27:01 perry Exp $"
#include "nisacsx.h"
#if DO_I4B_DEBUG
static char *state_text[N_STATES] = {
static const char *state_text[N_STATES] = {
"F3 Deactivated",
"F4 Awaiting Signal",
"F5 Identifying Input",
@ -97,7 +97,7 @@ static char *state_text[N_STATES] = {
"Illegal State"
};
static char *event_text[N_EVENTS] = {
static const char *event_text[N_EVENTS] = {
"EV_PHAR PH_ACT_REQ",
"EV_T3 Timer 3 expired",
"EV_INFO0 INFO0 received",
@ -539,9 +539,9 @@ isic_next_state(struct isic_softc *sc, int event)
/*---------------------------------------------------------------------------*
* return pointer to current state description
*---------------------------------------------------------------------------*/
char *
const char *
isic_printstate(struct isic_softc *sc)
{
return((char *) state_text[sc->sc_I430state]);
return(state_text[sc->sc_I430state]);
}
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: ifpci2.c,v 1.5 2005/02/27 00:27:33 perry Exp $ */
/* $NetBSD: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
* $Id: ifpci2.c,v 1.5 2005/02/27 00:27:33 perry Exp $
* $Id: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.5 2005/02/27 00:27:33 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $");
#include <sys/param.h>
@ -453,7 +453,7 @@ avma1pp2_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t siz
bus_space_write_4(sc->sc_maps[0].t, sc->sc_maps[0].h, ISACSX_INDEX, 0);
/* evidently each byte must be written as a long */
for (i = 0; i < size; i++)
bus_space_write_4(sc->sc_maps[0].t, sc->sc_maps[0].h, ISACSX_DATA, ((unsigned char *)buf)[i]);
bus_space_write_4(sc->sc_maps[0].t, sc->sc_maps[0].h, ISACSX_DATA, ((const unsigned char *)buf)[i]);
break;
case ISIC_WHAT_HSCXA:
hscx_write_fifo(0, buf, size, sc);
@ -467,7 +467,7 @@ avma1pp2_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t siz
static void
hscx_write_fifo(int chan, const void *buf, size_t len, struct isic_softc *sc)
{
u_int32_t *ip;
const u_int32_t *ip;
size_t cnt;
int dataoff;
l1_bchan_state_t *Bchan = &sc->sc_chan[chan];
@ -488,7 +488,7 @@ hscx_write_fifo(int chan, const void *buf, size_t len, struct isic_softc *sc)
AVMA1PPSETCMDLONG(cnt);
hscx_write_reg(chan, cnt, sc);
ip = (u_int32_t *)buf;
ip = (const u_int32_t *)buf;
cnt = 0;
while (cnt < len)
{

View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_pci.c,v 1.23 2005/02/27 00:27:33 perry Exp $ */
/* $NetBSD: isic_pci.c,v 1.24 2005/06/01 18:16:22 drochner Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.23 2005/02/27 00:27:33 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.24 2005/06/01 18:16:22 drochner Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@ -177,7 +177,7 @@ isic_pci_isdn_attach(psc, pa, cardname)
pci_intr_handle_t ih;
const char *intrstr;
static char *ISACversion[] = {
static const char *ISACversion[] = {
"2085 Version A1/A2 or 2086/2186 Version 1.1",
"2085 Version B1",
"2085 Version B2",
@ -185,7 +185,7 @@ isic_pci_isdn_attach(psc, pa, cardname)
"Unknown Version"
};
static char *HSCXversion[] = {
static const char *HSCXversion[] = {
"82525 Version A1",
"Unknown (0x01)",
"82525 Version A2",

View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.13 2005/02/27 00:27:33 perry Exp $ */
/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.14 2005/06/01 18:16:22 drochner Exp $ */
/*
* Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
@ -32,7 +32,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.13 2005/02/27 00:27:33 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.14 2005/06/01 18:16:22 drochner Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -130,15 +130,15 @@ eqs1pp_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t size)
switch (what) {
case ISIC_WHAT_ISAC:
bus_space_write_1(t, h, ELSA_OFF_ALE, IPAC_ISAC_OFF);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, (u_int8_t*)buf, size);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, buf, size);
break;
case ISIC_WHAT_HSCXA:
bus_space_write_1(t, h, ELSA_OFF_ALE, IPAC_HSCXA_OFF);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, (u_int8_t*)buf, size);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, buf, size);
break;
case ISIC_WHAT_HSCXB:
bus_space_write_1(t, h, ELSA_OFF_ALE, IPAC_HSCXB_OFF);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, (u_int8_t*)buf, size);
bus_space_write_multi_1(t, h, ELSA_OFF_RW, buf, size);
break;
}
}

View File

@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
* --------------------------------------------
*
* $Id: i4b_i4bdrv.c,v 1.26 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_i4bdrv.c,v 1.27 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.26 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.27 2005/06/01 18:07:04 drochner Exp $");
#include "isdn.h"
@ -543,7 +543,6 @@ isdnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
case I4B_CTRL_INFO_REQ:
{
msg_ctrl_info_req_t *mcir;
struct isdn_l3_driver *d;
int isdnif;
mcir = (msg_ctrl_info_req_t *)data;

View File

@ -1,4 +1,4 @@
/* $NetBSD: i4b_l2.h,v 1.10 2005/02/26 22:39:49 perry Exp $ */
/* $NetBSD: i4b_l2.h,v 1.11 2005/06/01 18:07:04 drochner Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
@ -29,7 +29,7 @@
* i4b_l2.h - ISDN layer 2 (Q.921) definitions
* ---------------------------------------------
*
* $Id: i4b_l2.h,v 1.10 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_l2.h,v 1.11 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -314,13 +314,13 @@ extern void i4b_l1_activate ( l2_softc_t *l2sc );
extern int i4b_l2_nr_ok ( int nr, int va, int vs );
extern void i4b_make_rand_ri ( l2_softc_t *l2sc );
extern void i4b_mdl_assign_ind ( l2_softc_t *l2sc );
extern void i4b_mdl_error_ind ( l2_softc_t *l2sc, char *where, int errorcode );
extern void i4b_mdl_error_ind ( l2_softc_t *l2sc, const char *where, int errorcode );
extern void i4b_next_l2state ( l2_softc_t *l2sc, struct isdn_l3_driver *drv, int event );
extern void i4b_nr_error_recovery ( l2_softc_t *l2sc );
extern int i4b_ph_activate_ind ( l2_softc_t* );
extern int i4b_ph_deactivate_ind ( l2_softc_t* );
extern void i4b_print_frame ( int len, u_char *buf );
extern char *i4b_print_l2state ( l2_softc_t *l2sc );
extern const char *i4b_print_l2state ( l2_softc_t *l2sc );
extern void i4b_print_l2var ( l2_softc_t *l2sc );
extern void i4b_rxd_ack(l2_softc_t *l2sc, struct isdn_l3_driver *drv, int nr);
extern void i4b_rxd_i_frame ( l2_softc_t *, struct isdn_l3_driver *drv, struct mbuf *m );

View File

@ -27,7 +27,7 @@
* i4b_l2fsm.c - layer 2 FSM
* -------------------------
*
* $Id: i4b_l2fsm.c,v 1.7 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_l2fsm.c,v 1.8 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l2fsm.c,v 1.7 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l2fsm.c,v 1.8 2005/06/01 18:07:04 drochner Exp $");
#ifdef __FreeBSD__
#include "i4bq921.h"
@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_l2fsm.c,v 1.7 2005/02/26 22:39:49 perry Exp $");
#if DO_I4B_DEBUG
static char *l2state_text[N_STATES] = {
static const char *l2state_text[N_STATES] = {
"ST_TEI_UNAS",
"ST_ASG_AW_TEI",
"ST_EST_AW_TEI",
@ -90,7 +90,7 @@ static char *l2state_text[N_STATES] = {
"Illegal State"
};
static char *l2event_text[N_EVENTS] = {
static const char *l2event_text[N_EVENTS] = {
"EV_DLESTRQ",
"EV_DLUDTRQ",
"EV_MDASGRQ",
@ -309,9 +309,9 @@ void i4b_next_l2state(l2_softc_t *l2sc, struct isdn_l3_driver *drv, int event)
/*---------------------------------------------------------------------------*
* return pointer to current state description
*---------------------------------------------------------------------------*/
char *i4b_print_l2state(l2_softc_t *l2sc)
const char *i4b_print_l2state(l2_softc_t *l2sc)
{
return((char *) l2state_text[l2sc->Q921_state]);
return(l2state_text[l2sc->Q921_state]);
}
#endif

View File

@ -27,7 +27,7 @@
* i4b_l3.h - layer 3 header file
* ------------------------------
*
* $Id: i4b_l3.h,v 1.5 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_l3.h,v 1.6 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -57,7 +57,7 @@ extern void i4b_l3_tx_status ( call_desc_t *cd, u_char q850cause );
extern int i4b_get_dl_stat( call_desc_t *cd );
extern void i4b_print_frame ( int len, u_char *buf );
extern void next_l3state ( call_desc_t *cd, int event );
extern char *print_l3state ( call_desc_t *cd );
extern const char *print_l3state ( call_desc_t *cd );
extern unsigned char setup_cr ( call_desc_t *cd, unsigned char cr );
extern void T303_start ( call_desc_t *cd );
extern void T303_stop ( call_desc_t *cd );

View File

@ -27,7 +27,7 @@
* i4b_l3fsm.c - layer 3 FSM
* -------------------------
*
* $Id: i4b_l3fsm.c,v 1.10 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_l3fsm.c,v 1.11 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l3fsm.c,v 1.10 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l3fsm.c,v 1.11 2005/06/01 18:07:04 drochner Exp $");
#ifdef __FreeBSD__
#include "i4bq931.h"
@ -116,7 +116,7 @@ static void F_DECF1(call_desc_t *cd), F_DECF2(call_desc_t *cd), F_DECF3(call_des
static void F_DLRI(call_desc_t *cd), F_DLRIA(call_desc_t *cd), F_DECF4(call_desc_t *cd);
#if DO_I4B_DEBUG
static char *l3state_text[N_STATES] = {
static const char *l3state_text[N_STATES] = {
"ST_U0 - Null",
"ST_U1 - Out Init",
"ST_U3 - Out Proc",
@ -140,7 +140,7 @@ static char *l3state_text[N_STATES] = {
"Illegal State"
};
static char *l3event_text[N_EVENTS] = {
static const char *l3event_text[N_EVENTS] = {
"EV_SETUPRQ - L4 SETUP REQ", /* setup request from L4 */
"EV_DISCRQ - L4 DISC REQ", /* disconnect request from L4 */
"EV_RELRQ - L4 REL REQ", /* release request from L4 */
@ -275,9 +275,9 @@ void next_l3state(call_desc_t *cd, int event)
/*---------------------------------------------------------------------------*
* return pointer to current state description
*---------------------------------------------------------------------------*/
char *print_l3state(call_desc_t *cd)
const char *print_l3state(call_desc_t *cd)
{
return((char *) l3state_text[cd->Q931state]);
return(l3state_text[cd->Q931state]);
}
#endif

View File

@ -27,7 +27,7 @@
* i4b_l4.c - kernel interface to userland
* -----------------------------------------
*
* $Id: i4b_l4.c,v 1.28 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_l4.c,v 1.29 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l4.c,v 1.28 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l4.c,v 1.29 2005/06/01 18:07:04 drochner Exp $");
#include "isdn.h"
#include "irip.h"
@ -129,16 +129,16 @@ isdn_detach_isdnif(struct isdn_l3_driver *l3drv)
struct isdn_l3_driver *sc;
int s = splnet();
int isdnif = l3drv->isdnif;
int max;
int maxidx;
i4b_l4_contr_ev_ind(isdnif, 0);
SLIST_REMOVE(&isdnif_list, l3drv, isdn_l3_driver, l3drvq);
max = -1;
maxidx = -1;
SLIST_FOREACH(sc, &isdnif_list, l3drvq)
if (sc->isdnif > max)
max = sc->isdnif;
next_isdnif = max+1;
if (sc->isdnif > maxidx)
maxidx = sc->isdnif;
next_isdnif = maxidx+1;
free_all_cd_of_isdnif(isdnif);

View File

@ -27,7 +27,7 @@
* i4b_lme.c - layer management entity
* -------------------------------------
*
* $Id: i4b_lme.c,v 1.7 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_lme.c,v 1.8 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_lme.c,v 1.7 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_lme.c,v 1.8 2005/06/01 18:07:04 drochner Exp $");
#ifdef __FreeBSD__
#include "i4bq921.h"
@ -99,10 +99,10 @@ i4b_mdl_assign_ind(l2_softc_t *l2sc)
* i4b_mdl_error_ind handler (Q.921 01/94 pp 156)
*---------------------------------------------------------------------------*/
void
i4b_mdl_error_ind(l2_softc_t *l2sc, char *where, int errorcode)
i4b_mdl_error_ind(l2_softc_t *l2sc, const char *where, int errorcode)
{
#if DO_I4B_DEBUG
static char *error_text[] = {
static const char *error_text[] = {
"MDL_ERR_A: rx'd unsolicited response - supervisory (F=1)",
"MDL_ERR_B: rx'd unsolicited response - DM (F=1)",
"MDL_ERR_C: rx'd unsolicited response - UA (F=1)",

View File

@ -27,7 +27,7 @@
* i4b_q931.c - Q931 received messages handling
* --------------------------------------------
*
* $Id: i4b_q931.c,v 1.16 2005/02/26 22:39:49 perry Exp $
* $Id: i4b_q931.c,v 1.17 2005/06/01 18:07:04 drochner Exp $
*
* $FreeBSD$
*
@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_q931.c,v 1.16 2005/02/26 22:39:49 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_q931.c,v 1.17 2005/06/01 18:07:04 drochner Exp $");
#ifdef __FreeBSD__
#include "i4bq931.h"
@ -538,7 +538,7 @@ i4b_decode_q931_cs0_ie(call_desc_t *cd, int msg_len, u_char *msg_ptr)
void
i4b_decode_q931_message(call_desc_t *cd, u_char message_type)
{
char *m = NULL;
const char *m = NULL;
cd->event = EV_ILL;