PERFORCE change 73543 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=73543

Change 73543 by jmallett at jmallett_windward on 2005/03/19 22:12:08

	use ivars not softc.

Affected files ...

.. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 edit

Differences ...

==== //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#3 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#4 $
  */
 
 #include <sys/param.h>
@@ -56,7 +56,7 @@
 static driver_t arcs_cpu_driver = {
 	"arcs_cpu",
 	arcs_cpu_methods,
-	sizeof (struct ARCS_Component *)
+	1
 };
 
 static devclass_t arcs_cpu_devclass;
@@ -68,7 +68,7 @@
 {
 	struct ARCS_Component *component, *child;
 
-	component = device_get_softc(dev);
+	component = device_get_ivars(dev);
 	if (component == NULL)
 		return (EINVAL);
 	if (component->Flags & ARCS_Component_Flags_Failed)

==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#6 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#7 $
  */
 
 #include <sys/param.h>
@@ -114,7 +114,7 @@
 	if (device != NULL) {
 		me = device_add_child(parent, device, unit);
 		if (me != NULL)
-			device_set_softc(me, this);
+			device_set_ivars(me, this);
 	} else if (bootverbose) {
 		device_printf(parent,
 			      "Not attaching ARCS device "
@@ -139,6 +139,5 @@
 	root = ARCS_GetChild(NULL);
 	if (root != NULL)
 		arcs_configure(dev, root);
-	device_add_child(dev, "arcs_disk", 1);
 	return (0);
 }

==== //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#3 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#4 $
  */
 
 #include <sys/param.h>
@@ -56,7 +56,7 @@
 static driver_t arcs_fpu_driver = {
 	"arcs_fpu",
 	arcs_fpu_methods,
-	sizeof (struct ARCS_Component *)
+	1
 };
 
 static devclass_t arcs_fpu_devclass;
@@ -68,7 +68,7 @@
 {
 	struct ARCS_Component *component, *child;
 
-	component = device_get_softc(dev);
+	component = device_get_ivars(dev);
 	if (component == NULL)
 		return (EINVAL);
 	if (component->Flags & ARCS_Component_Flags_Failed)

==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#4 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#5 $
  */
 
 #include <sys/param.h>
@@ -56,7 +56,7 @@
 static driver_t arcs_system_driver = {
 	"arcs_system",
 	arcs_system_methods,
-	sizeof (struct ARCS_Component *)
+	1
 };
 
 static devclass_t arcs_system_devclass;
@@ -78,7 +78,7 @@
 	struct mainbus_name *mainbus;
 	const char *system;
 
-	component = device_get_softc(dev);
+	component = device_get_ivars(dev);
 	if (component == NULL)
 		return (EINVAL);
 	if (component->Flags & ARCS_Component_Flags_Failed)