[src/trunk]: src/sys/dev/pci Move softc definition to genfb_pcivar.h

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/25cfdf9ab6a8
branches:  trunk
changeset: 746951:25cfdf9ab6a8
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 24 11:32:49 2009 +0000

description:
Move softc definition to genfb_pcivar.h

diffstat:

 sys/dev/pci/genfb_pci.c    |  26 +++-------------------
 sys/dev/pci/genfb_pcivar.h |  52 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 22 deletions(-)

diffs (110 lines):

diff -r bde2112a3aa7 -r 25cfdf9ab6a8 sys/dev/pci/genfb_pci.c
--- a/sys/dev/pci/genfb_pci.c   Mon Aug 24 11:04:29 2009 +0000
+++ b/sys/dev/pci/genfb_pci.c   Mon Aug 24 11:32:49 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb_pci.c,v 1.22 2009/08/24 11:03:44 jmcneill Exp $ */
+/*     $NetBSD: genfb_pci.c,v 1.23 2009/08/24 11:32:49 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.22 2009/08/24 11:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.23 2009/08/24 11:32:49 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,6 +47,8 @@
 
 #include <dev/wsfb/genfbvar.h>
 
+#include <dev/pci/genfb_pcivar.h>
+
 #include "opt_wsfb.h"
 #include "opt_genfb.h"
 
@@ -56,26 +58,6 @@
 # define DPRINTF while (0) printf
 #endif
 
-struct range {
-       bus_addr_t offset;
-       bus_size_t size;
-       int flags;
-};
-
-struct pci_genfb_softc {
-       struct genfb_softc sc_gen;
-
-       pci_chipset_tag_t sc_pc;
-       pcitag_t sc_pcitag;
-       bus_space_tag_t sc_memt;
-       bus_space_tag_t sc_iot;
-       bus_space_handle_t sc_memh;
-       pcireg_t sc_bars[9];
-       struct range sc_ranges[8];
-       int sc_ranges_used;
-       int sc_want_wsfb;
-};
-
 static int     pci_genfb_match(device_t, cfdata_t, void *);
 static void    pci_genfb_attach(device_t, device_t, void *);
 static int     pci_genfb_ioctl(void *, void *, u_long, void *, int,
diff -r bde2112a3aa7 -r 25cfdf9ab6a8 sys/dev/pci/genfb_pcivar.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/genfb_pcivar.h        Mon Aug 24 11:32:49 2009 +0000
@@ -0,0 +1,52 @@
+/*     $NetBSD: genfb_pcivar.h,v 1.1 2009/08/24 11:32:49 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2007 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_DEV_PCI_GENFB_PCIVAR_H
+#define _SYS_DEV_PCI_GENFB_PCIVAR_H
+
+struct range {
+       bus_addr_t offset;
+       bus_size_t size;
+       int flags;
+};
+
+struct pci_genfb_softc {
+       struct genfb_softc sc_gen;
+
+       pci_chipset_tag_t sc_pc;
+       pcitag_t sc_pcitag;
+       bus_space_tag_t sc_memt;
+       bus_space_tag_t sc_iot;
+       bus_space_handle_t sc_memh;
+       pcireg_t sc_bars[9];
+       struct range sc_ranges[8];
+       int sc_ranges_used;
+       int sc_want_wsfb;
+};
+
+#endif /* !_SYS_DEV_PCI_GENFB_PCIVAR_H */