Module Name: src
Committed By: maxv
Date: Sat Jun 23 06:40:43 UTC 2018
Modified Files:
src/sys/dev/ic: awi.c elinkxl.c rt2860.c wi.c
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/ic/awi.c
cvs rdiff -u -r1.122 -r1.123 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/rt2860.c
cvs rdiff -u -r1.245 -r1.246 src/sys/dev/ic/wi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/awi.c
diff -u src/sys/dev/ic/awi.c:1.92 src/sys/dev/ic/awi.c:1.93
--- src/sys/dev/ic/awi.c:1.92 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/awi.c Sat Jun 23 06:40:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: awi.c,v 1.92 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: awi.c,v 1.93 2018/06/23 06:40:43 maxv Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.92 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.93 2018/06/23 06:40:43 maxv Exp $");
#include "opt_inet.h"
@@ -159,7 +159,7 @@ static struct mbuf *awi_ether_modcap(str
(((u_int8_t *)(p))[2] = (((u_int32_t)(v) >> 16) & 0xff)), \
(((u_int8_t *)(p))[3] = (((u_int32_t)(v) >> 24) & 0xff)))
-struct awi_chanset awi_chanset[] = {
+static const struct awi_chanset awi_chanset[] = {
/* PHY type domain min max def */
{ AWI_PHY_TYPE_FH, AWI_REG_DOMAIN_JP, 6, 17, 6 },
{ AWI_PHY_TYPE_FH, AWI_REG_DOMAIN_ES, 0, 26, 1 },
@@ -1358,7 +1358,7 @@ awi_init_mibs(struct awi_softc *sc)
{
int chan, i, error;
struct ieee80211com *ic = &sc->sc_ic;
- struct awi_chanset *cs;
+ const struct awi_chanset *cs;
if ((error = awi_mib(sc, AWI_CMD_GET_MIB, AWI_MIB_LOCAL, AWI_WAIT)) ||
(error = awi_mib(sc, AWI_CMD_GET_MIB, AWI_MIB_ADDR, AWI_WAIT)) ||
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.122 src/sys/dev/ic/elinkxl.c:1.123
--- src/sys/dev/ic/elinkxl.c:1.122 Fri Jun 22 04:17:42 2018
+++ src/sys/dev/ic/elinkxl.c Sat Jun 23 06:40:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.122 2018/06/22 04:17:42 msaitoh Exp $ */
+/* $NetBSD: elinkxl.c,v 1.123 2018/06/23 06:40:43 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.122 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.123 2018/06/23 06:40:43 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ struct ex_media {
* Media table for 3c90x chips. Note that chips with MII have no
* `native' media.
*/
-struct ex_media ex_native_media[] = {
+static const struct ex_media ex_native_media[] = {
{ ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER|IFM_10_T,
ELINKMEDIA_10BASE_T },
{ ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER|IFM_10_T|IFM_FDX,
@@ -523,7 +523,7 @@ ex_probemedia(struct ex_softc *sc)
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct ifmedia *ifm = &sc->ex_mii.mii_media;
- struct ex_media *exm;
+ const struct ex_media *exm;
uint16_t config1, reset_options, default_media;
int defmedia = 0;
const char *sep = "", *defmedianame = NULL;
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.30 src/sys/dev/ic/rt2860.c:1.31
--- src/sys/dev/ic/rt2860.c:1.30 Sun Jan 14 18:23:03 2018
+++ src/sys/dev/ic/rt2860.c Sat Jun 23 06:40:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.30 2018/01/14 18:23:03 maxv Exp $ */
+/* $NetBSD: rt2860.c,v 1.31 2018/06/23 06:40:43 maxv Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/* $FreeBSD: head/sys/dev/ral/rt2860.c 306591 2016-10-02 20:35:55Z avos $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.30 2018/01/14 18:23:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.31 2018/06/23 06:40:43 maxv Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -196,7 +196,7 @@ static const struct rfprog {
RT2860_RF2850
};
-struct {
+static const struct {
uint8_t n, r, k;
} rt3090_freqs[] = {
RT3070_RF3052
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.245 src/sys/dev/ic/wi.c:1.246
--- src/sys/dev/ic/wi.c:1.245 Fri Jun 22 04:17:42 2018
+++ src/sys/dev/ic/wi.c Sat Jun 23 06:40:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.245 2018/06/22 04:17:42 msaitoh Exp $ */
+/* $NetBSD: wi.c,v 1.246 2018/06/23 06:40:43 maxv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.245 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.246 2018/06/23 06:40:43 maxv Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -243,8 +243,7 @@ static int wi_sysctl_verify_debug(SYSCTL
#define WI_INTRS (WI_EV_RX | WI_EV_ALLOC | WI_EV_INFO | \
WI_EV_TX | WI_EV_TX_EXC | WI_EV_CMD)
-struct wi_card_ident
-wi_card_ident[] = {
+static const struct wi_card_ident wi_card_ident[] = {
/* CARD_ID CARD_NAME FIRM_TYPE */
{ WI_NIC_LUCENT_ID, WI_NIC_LUCENT_STR, WI_LUCENT },
{ WI_NIC_SONY_ID, WI_NIC_SONY_STR, WI_LUCENT },
@@ -2144,7 +2143,7 @@ allmulti:
STATIC void
wi_read_nicid(struct wi_softc *sc)
{
- struct wi_card_ident *id;
+ const struct wi_card_ident *id;
char *p;
int len;
u_int16_t ver[4];
