Module Name: src
Committed By: jdolecek
Date: Mon May 4 20:06:38 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_ec.c acpi_quirks.c wss_acpi.c
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_quirks.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/wss_acpi.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/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.82 src/sys/dev/acpi/acpi_ec.c:1.83
--- src/sys/dev/acpi/acpi_ec.c:1.82 Tue Apr 28 10:04:32 2020
+++ src/sys/dev/acpi/acpi_ec.c Mon May 4 20:06:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.82 2020/04/28 10:04:32 jmcneill Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.83 2020/05/04 20:06:38 jdolecek Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.82 2020/04/28 10:04:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.83 2020/05/04 20:06:38 jdolecek Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -101,7 +101,7 @@ ACPI_MODULE_NAME ("acpi_ec")
#define EC_STATUS_SCI 0x20
#define EC_STATUS_SMI 0x40
-static const char *ec_hid[] = {
+static const char * const ec_hid[] = {
"PNP0C09",
NULL,
};
Index: src/sys/dev/acpi/acpi_quirks.c
diff -u src/sys/dev/acpi/acpi_quirks.c:1.20 src/sys/dev/acpi/acpi_quirks.c:1.21
--- src/sys/dev/acpi/acpi_quirks.c:1.20 Mon Nov 14 02:44:59 2011
+++ src/sys/dev/acpi/acpi_quirks.c Mon May 4 20:06:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_quirks.c,v 1.20 2011/11/14 02:44:59 jmcneill Exp $ */
+/* $NetBSD: acpi_quirks.c,v 1.21 2020/05/04 20:06:38 jdolecek Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.20 2011/11/14 02:44:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.21 2020/05/04 20:06:38 jdolecek Exp $");
#include "opt_acpi.h"
@@ -84,7 +84,7 @@ ACPI_MODULE_NAME ("acpi_quirks")
static int acpi_quirks_revcmp(uint32_t, uint32_t, int);
-static struct acpi_quirk acpi_quirks[] = {
+static const struct acpi_quirk acpi_quirks[] = {
{ ACPI_SIG_FADT, "ASUS ", 0x30303031, AQ_LTE, "CUV4X-D ",
ACPI_QUIRK_BROKEN },
@@ -152,7 +152,7 @@ int
acpi_find_quirks(void)
{
ACPI_TABLE_HEADER fadt, dsdt, xsdt, *hdr;
- struct acpi_quirk *aq;
+ const struct acpi_quirk *aq;
ACPI_STATUS rv;
size_t i, len;
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.32 src/sys/dev/acpi/wss_acpi.c:1.33
--- src/sys/dev/acpi/wss_acpi.c:1.32 Wed May 8 13:40:17 2019
+++ src/sys/dev/acpi/wss_acpi.c Mon May 4 20:06:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.32 2019/05/08 13:40:17 isaki Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.33 2020/05/04 20:06:38 jdolecek Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.32 2019/05/08 13:40:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.33 2020/05/04 20:06:38 jdolecek Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -59,7 +59,7 @@ struct wss_acpi_hint {
int offset_ad1848; /* offset from start of DAC region */
};
-static struct wss_acpi_hint wss_acpi_hints[] = {
+static const struct wss_acpi_hint wss_acpi_hints[] = {
{ "NMX2210", 1, 2, WSS_CODEC },
{ "CSC0000", 0, 1, 0 }, /* Dell Latitude CPi */
{ "CSC0100", 0, 1, 0 }, /* CS4610 with CS4236 codec */
@@ -114,7 +114,7 @@ wss_acpi_attach(device_t parent, device_
struct acpi_drq *playdrq, *recdrq;
struct audio_attach_args arg;
ACPI_STATUS rv;
- struct wss_acpi_hint *wah;
+ const struct wss_acpi_hint *wah;
sc->sc_ad1848.sc_ad1848.sc_dev = self;
wah = &wss_acpi_hints[
