Adapt to -Wcast-qual by adding a const and using __UNVOLATILE() in

a couple of places where memcpy() is used.
This commit is contained in:
he 2005-06-02 14:41:26 +00:00
parent 1db1f704fc
commit 05721f8fb4
1 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: i82596.c,v 1.8 2005/02/27 00:27:01 perry Exp $ */
/* $NetBSD: i82596.c,v 1.9 2005/06/02 14:41:26 he Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.8 2005/02/27 00:27:01 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.9 2005/06/02 14:41:26 he Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.8 2005/02/27 00:27:01 perry Exp $");
/* Supported chip variants */
char *i82596_typenames[] = { "unknowen", "DX/SX", "CA" };
const char *i82596_typenames[] = { "unknowen", "DX/SX", "CA" };
@ -421,11 +421,11 @@ iee_cb_setup(struct iee_softc *sc, uint32_t cmd)
case IEE_CB_CMD_NOP: /* NOP CMD */
break;
case IEE_CB_CMD_IAS: /* Individual Address Setup */
memcpy((void*)cb->cb_ind_addr, LLADDR(ifp->if_sadl),
memcpy(__UNVOLATILE(cb->cb_ind_addr), LLADDR(ifp->if_sadl),
ETHER_ADDR_LEN);
break;
case IEE_CB_CMD_CONF: /* Configure */
memcpy((void*)cb->cb_cf, sc->sc_cf, sc->sc_cf[0]
memcpy(__UNVOLATILE(cb->cb_cf), sc->sc_cf, sc->sc_cf[0]
& IEE_CF_0_CNT_M);
break;
case IEE_CB_CMD_MCS: /* Multicast Setup */
@ -453,8 +453,8 @@ iee_cb_setup(struct iee_softc *sc, uint32_t cmd)
cb->cb_mcast.mc_size = 0;
break;
}
memcpy((void*) &cb->cb_mcast.mc_addrs[
cb->cb_mcast.mc_size * ETHER_ADDR_LEN],
memcpy(__UNVOLATILE(&cb->cb_mcast.mc_addrs[
cb->cb_mcast.mc_size * ETHER_ADDR_LEN]),
enm->enm_addrlo, ETHER_ADDR_LEN);
ETHER_NEXT_MULTI(step, enm);
cb->cb_mcast.mc_size++;