Module Name: src
Committed By: maxv
Date: Sat Jun 23 06:57:24 UTC 2018
Modified Files:
src/sys/dev/isa: gus.c
src/sys/dev/pci: if_ep_pci.c
src/sys/dev/usb: if_atu.c
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/if_ep_pci.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/if_atu.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/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.112 src/sys/dev/isa/gus.c:1.113
--- src/sys/dev/isa/gus.c:1.112 Tue Oct 31 21:53:48 2017
+++ src/sys/dev/isa/gus.c Sat Jun 23 06:57:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.112 2017/10/31 21:53:48 nat Exp $ */
+/* $NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.112 2017/10/31 21:53:48 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3239,7 +3239,7 @@ gus_halt_in_dma(void *addr)
}
-static ad1848_devmap_t gusmapping[] = {
+static const ad1848_devmap_t gusmapping[] = {
{ GUSMAX_DAC_LVL, AD1848_KIND_LVL, AD1848_AUX1_CHANNEL },
{ GUSMAX_LINE_IN_LVL, AD1848_KIND_LVL, AD1848_LINE_CHANNEL },
{ GUSMAX_MONO_LVL, AD1848_KIND_LVL, AD1848_MONO_CHANNEL },
@@ -3255,7 +3255,7 @@ static ad1848_devmap_t gusmapping[] = {
{ GUSMAX_RECORD_SOURCE, AD1848_KIND_RECORDSOURCE, -1 }
};
-static int nummap = sizeof(gusmapping) / sizeof(gusmapping[0]);
+static const int nummap = sizeof(gusmapping) / sizeof(gusmapping[0]);
STATIC int
gusmax_mixer_get_port(void *addr, mixer_ctrl_t *cp)
Index: src/sys/dev/pci/if_ep_pci.c
diff -u src/sys/dev/pci/if_ep_pci.c:1.53 src/sys/dev/pci/if_ep_pci.c:1.54
--- src/sys/dev/pci/if_ep_pci.c:1.53 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_ep_pci.c Sat Jun 23 06:57:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pci.c,v 1.53 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_ep_pci.c,v 1.54 2018/06/23 06:57:24 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.53 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.54 2018/06/23 06:57:24 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,7 +103,7 @@ static void ep_pci_attach(device_t , dev
CFATTACH_DECL_NEW(ep_pci, sizeof(struct ep_softc),
ep_pci_match, ep_pci_attach, NULL, NULL);
-static struct ep_pci_product {
+static const struct ep_pci_product {
u_int32_t epp_prodid; /* PCI product ID */
u_short epp_chipset; /* 3Com chipset used */
int epp_flags; /* initial softc flags */
@@ -149,7 +149,7 @@ static struct ep_pci_product {
static const struct ep_pci_product *
ep_pci_lookup(const struct pci_attach_args *pa)
{
- struct ep_pci_product *epp;
+ const struct ep_pci_product *epp;
if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_3COM)
return (NULL);
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.59 src/sys/dev/usb/if_atu.c:1.60
--- src/sys/dev/usb/if_atu.c:1.59 Fri Jun 22 04:17:42 2018
+++ src/sys/dev/usb/if_atu.c Sat Jun 23 06:57:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.59 2018/06/22 04:17:42 msaitoh Exp $ */
+/* $NetBSD: if_atu.c,v 1.60 2018/06/23 06:57:24 maxv Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.59 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.60 2018/06/23 06:57:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -209,7 +209,7 @@ static const struct atu_type atu_devs[]
RadioIntersil, ATU_NO_QUIRK },
};
-struct atu_radfirm {
+static const struct atu_radfirm {
enum atu_radio_type atur_type;
unsigned char *atur_internal;
size_t atur_internal_sz;
