Module Name: src
Committed By: jmcneill
Date: Sat Aug 6 19:21:27 UTC 2011
Modified Files:
src/sys/dev/pci: coram.c coramvar.h
Log Message:
build fix: forgot to add sc_board to softc
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/coram.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/coramvar.h
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/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.6 src/sys/dev/pci/coram.c:1.7
--- src/sys/dev/pci/coram.c:1.6 Sat Aug 6 11:51:11 2011
+++ src/sys/dev/pci/coram.c Sat Aug 6 19:21:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.6 2011/08/06 11:51:11 jmcneill Exp $ */
+/* $NetBSD: coram.c,v 1.7 2011/08/06 19:21:27 jmcneill Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.6 2011/08/06 11:51:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.7 2011/08/06 19:21:27 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,11 +54,7 @@
/* #define CORAM_DEBUG */
/* #define CORAM_ATTACH_I2C */
-static const struct coram_board {
- uint16_t vendor;
- uint16_t product;
- const char *name;
-} coram_boards[] = {
+static const struct coram_board coram_boards[] = {
{ PCI_VENDOR_HAUPPAUGE, 0x7911, "Hauppauge HVR-1250" },
};
Index: src/sys/dev/pci/coramvar.h
diff -u src/sys/dev/pci/coramvar.h:1.2 src/sys/dev/pci/coramvar.h:1.3
--- src/sys/dev/pci/coramvar.h:1.2 Thu Aug 4 22:25:08 2011
+++ src/sys/dev/pci/coramvar.h Sat Aug 6 19:21:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coramvar.h,v 1.2 2011/08/04 22:25:08 jmcneill Exp $ */
+/* $NetBSD: coramvar.h,v 1.3 2011/08/06 19:21:27 jmcneill Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -38,6 +38,12 @@
#define KERNADDR(p) ((void *)((p)->addr))
#define DMAADDR(p) ((p)->map->dm_segs[0].ds_addr)
+struct coram_board {
+ uint16_t vendor;
+ uint16_t product;
+ const char *name;
+};
+
struct coram_sram_ch {
uint32_t csc_cmds;
uint32_t csc_iq;
@@ -94,8 +100,7 @@
void *sc_tuner;
void *sc_demod;
- pci_vendor_id_t sc_vendor;
- pci_product_id_t sc_product;
+ const struct coram_board *sc_board;
};
#endif /* !_DEV_PCI_CORAMVAR_H */
