Module Name: src
Committed By: jdolecek
Date: Fri Aug 31 18:43:30 UTC 2018
Modified Files:
src/sys/dev/ic: mvsata.c mvsatavar.h
src/sys/dev/pci: mvsata_pci.c
Log Message:
constify mvsata_pci_products[]
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/mvsatavar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/mvsata_pci.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/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.40 src/sys/dev/ic/mvsata.c:1.41
--- src/sys/dev/ic/mvsata.c:1.40 Sun Apr 8 11:57:43 2018
+++ src/sys/dev/ic/mvsata.c Fri Aug 31 18:43:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.40 2018/04/08 11:57:43 mlelstv Exp $ */
+/* $NetBSD: mvsata.c,v 1.41 2018/08/31 18:43:29 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.40 2018/04/08 11:57:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.41 2018/08/31 18:43:29 jdolecek Exp $");
#include "opt_mvsata.h"
@@ -255,7 +255,7 @@ mvsata_pmp_select(struct mvsata_port *mv
}
int
-mvsata_attach(struct mvsata_softc *sc, struct mvsata_product *product,
+mvsata_attach(struct mvsata_softc *sc, const struct mvsata_product *product,
int (*mvsata_sreset)(struct mvsata_softc *),
int (*mvsata_misc_reset)(struct mvsata_softc *),
int read_pre_amps)
Index: src/sys/dev/ic/mvsatavar.h
diff -u src/sys/dev/ic/mvsatavar.h:1.3 src/sys/dev/ic/mvsatavar.h:1.4
--- src/sys/dev/ic/mvsatavar.h:1.3 Sat Oct 7 16:05:32 2017
+++ src/sys/dev/ic/mvsatavar.h Fri Aug 31 18:43:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsatavar.h,v 1.3 2017/10/07 16:05:32 jdolecek Exp $ */
+/* $NetBSD: mvsatavar.h,v 1.4 2018/08/31 18:43:29 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -142,7 +142,7 @@ struct mvsata_softc {
void (*sc_enable_intr)(struct mvsata_port *, int);
};
-int mvsata_attach(struct mvsata_softc *, struct mvsata_product *,
+int mvsata_attach(struct mvsata_softc *, const struct mvsata_product *,
int (*mvsata_sreset)(struct mvsata_softc *),
int (*mvsata_misc_reset)(struct mvsata_softc *), int);
int mvsata_intr(struct mvsata_hc *);
Index: src/sys/dev/pci/mvsata_pci.c
diff -u src/sys/dev/pci/mvsata_pci.c:1.9 src/sys/dev/pci/mvsata_pci.c:1.10
--- src/sys/dev/pci/mvsata_pci.c:1.9 Wed Jun 21 22:48:05 2017
+++ src/sys/dev/pci/mvsata_pci.c Fri Aug 31 18:43:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata_pci.c,v 1.9 2017/06/21 22:48:05 jdolecek Exp $ */
+/* $NetBSD: mvsata_pci.c,v 1.10 2018/08/31 18:43:29 jdolecek Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.9 2017/06/21 22:48:05 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.10 2018/08/31 18:43:29 jdolecek Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,7 +108,7 @@ static void mvsata_pci_enable_intr(struc
CFATTACH_DECL_NEW(mvsata_pci, sizeof(struct mvsata_pci_softc),
mvsata_pci_match, mvsata_pci_attach, mvsata_pci_detach, NULL);
-struct mvsata_product mvsata_pci_products[] = {
+static const struct mvsata_product mvsata_pci_products[] = {
#define PCI_VP(v, p) PCI_VENDOR_ ## v, PCI_PRODUCT_ ## v ## _ ## p
{ PCI_VP(MARVELL, 88SX5040), 1, 4, gen1, 0 },
{ PCI_VP(MARVELL, 88SX5041), 1, 4, gen1, 0 },
