Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Feb 2015 20:11:02 +0000 (UTC)
From:      "Jayachandran C." <jchandra@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r279368 - head/sys/dev/fdt
Message-ID:  <201502272011.t1RKB2LG074243@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jchandra
Date: Fri Feb 27 20:11:02 2015
New Revision: 279368
URL: https://svnweb.freebsd.org/changeset/base/279368

Log:
  Allow creating subclass of FDT simplebus
  
  Provide sys/dev/fdt/simplebus.h with the class declaration so that it
  is possible to subclass FDT simplebus.
  
  Differential Revision:	https://reviews.freebsd.org/D1886
  Reviewed by:	nwhitehorn, imp

Added:
  head/sys/dev/fdt/simplebus.h   (contents, props changed)
Modified:
  head/sys/dev/fdt/simplebus.c

Modified: head/sys/dev/fdt/simplebus.c
==============================================================================
--- head/sys/dev/fdt/simplebus.c	Fri Feb 27 19:23:01 2015	(r279367)
+++ head/sys/dev/fdt/simplebus.c	Fri Feb 27 20:11:02 2015	(r279368)
@@ -38,26 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-struct simplebus_range {
-	uint64_t bus;
-	uint64_t host;
-	uint64_t size;
-};
-
-struct simplebus_softc {
-	device_t dev;
-	phandle_t node;
-
-	struct simplebus_range *ranges;
-	int nranges;
-
-	pcell_t acells, scells;
-};
-
-struct simplebus_devinfo {
-	struct ofw_bus_devinfo	obdinfo;
-	struct resource_list	rl;
-};
+#include <dev/fdt/simplebus.h>
 
 /*
  * Bus interface.
@@ -115,11 +96,9 @@ static device_method_t	simplebus_methods
 	DEVMETHOD_END
 };
 
-static driver_t simplebus_driver = {
-	"simplebus",
-	simplebus_methods,
-	sizeof(struct simplebus_softc)
-};
+DEFINE_CLASS_0(simplebus, simplebus_driver, simplebus_methods,
+    sizeof(struct simplebus_softc));
+
 static devclass_t simplebus_devclass;
 EARLY_DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass,
     0, 0, BUS_PASS_BUS);

Added: head/sys/dev/fdt/simplebus.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/fdt/simplebus.h	Fri Feb 27 20:11:02 2015	(r279368)
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2013 Nathan Whitehorn
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_FDT_SIMPLEBUS_PRIVATE_H
+#define	_FDT_SIMPLEBUS_PRIVATE_H
+
+/* FDT simplebus */
+DECLARE_CLASS(simplebus_driver);
+
+struct simplebus_range {
+	uint64_t bus;
+	uint64_t host;
+	uint64_t size;
+};
+
+/* devinfo and softc */
+struct simplebus_softc {
+	device_t dev;
+	phandle_t node;
+
+	struct simplebus_range *ranges;
+	int nranges;
+
+	pcell_t acells, scells;
+};
+
+struct simplebus_devinfo {
+	struct ofw_bus_devinfo	obdinfo;
+	struct resource_list	rl;
+};
+#endif	/* _FDT_SIMPLEBUS_PRIVATE_H */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502272011.t1RKB2LG074243>