Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci build fix: forgot to add sc_board to softc



details:   https://anonhg.NetBSD.org/src/rev/b37a9be36e43
branches:  trunk
changeset: 768026:b37a9be36e43
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Aug 06 19:21:27 2011 +0000

description:
build fix: forgot to add sc_board to softc

diffstat:

 sys/dev/pci/coram.c    |  10 +++-------
 sys/dev/pci/coramvar.h |  11 ++++++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r 874bf0d38dd5 -r b37a9be36e43 sys/dev/pci/coram.c
--- a/sys/dev/pci/coram.c       Sat Aug 06 17:25:03 2011 +0000
+++ b/sys/dev/pci/coram.c       Sat Aug 06 19:21:27 2011 +0000
@@ -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" },
 };
 
diff -r 874bf0d38dd5 -r b37a9be36e43 sys/dev/pci/coramvar.h
--- a/sys/dev/pci/coramvar.h    Sat Aug 06 17:25:03 2011 +0000
+++ b/sys/dev/pci/coramvar.h    Sat Aug 06 19:21:27 2011 +0000
@@ -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 */



Home | Main Index | Thread Index | Old Index