PERFORCE change 73511 for review

[Juli Mallett]

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

Change 73511 by jmallett at jmallett_windward on 2005/03/19 09:12:35

	Some places to attach things (not 100% yet)

Affected files ...

.. //depot/projects/mips/sys/conf/files.mips#42 edit
.. //depot/projects/mips/sys/dev/arcs/arcs.c#7 edit
.. //depot/projects/mips/sys/dev/arcs/arcs.h#7 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_cpu.c#1 add
.. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_fpu.c#1 add
.. //depot/projects/mips/sys/dev/arcs/arcs_system.c#1 add

Differences ...

==== //depot/projects/mips/sys/conf/files.mips#42 (text+ko) ====

@@ -60,7 +60,10 @@
 # This stanza is device files.
 dev/arcs/arcs.c			optional	arcs
 dev/arcs/arcs_console.c		optional	arcs
+dev/arcs/arcs_cpu.c		optional	arcs
 dev/arcs/arcs_dev.c		optional	arcs
+dev/arcs/arcs_fpu.c		optional	arcs
+dev/arcs/arcs_system.c		optional	arcs
 dev/arcs/arcs_disk.c		optional	arcs_disk arcs
 
 mips/sgimips/gio/gio.c		optional	gio

==== //depot/projects/mips/sys/dev/arcs/arcs.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.c#6 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#7 $
  */
 
 #include <sys/param.h>
@@ -85,12 +85,18 @@
 
 	root = ARCS_GetChild(NULL);
 	if (root != NULL)
-		systemid = (const char *)(intptr_t)root->Identifier;
+		systemid = arcs_component_identifier(root);
 	else
 		systemid = "SGI-IP27";
 	return (systemid);
 }
 
+const char *
+arcs_component_identifier(struct ARCS_Component *component)
+{
+	return ((const char *)(intptr_t)component->Identifier);
+}
+
 struct ARCS_Mem *
 ARCS_GetMemoryDescriptor(const struct ARCS_Mem *mem)
 {

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

@@ -23,12 +23,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#6 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#7 $
  */
 
 #ifndef	_DEV_ARCS_ARCS_H_
 #define	_DEV_ARCS_ARCS_H_
 
+struct ARCS_Component;
+
 #ifdef sgimips
 #include "opt_model.h"
 
@@ -58,6 +60,7 @@
  */
 int arcs_init(void *);
 const char *arcs_systemid(void);
+const char *arcs_component_identifier(struct ARCS_Component *);
 void arcs_cnattach(void);
 
 /*

==== //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 (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#2 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_dev.c#3 $
  */
 
 #include <sys/param.h>
@@ -118,19 +118,15 @@
 		if (device != NULL) {
 			me = device_add_child(parent, device, unit);
 			if (me != NULL) {
-				device_set_desc(me,
-						(const char *)
-						(intptr_t)
-						this->Identifier);
+				device_set_softc(me, this);
 			}
 		} else {
 			device_printf(parent,
 				      "Not attaching ARCS device "
 				      "class %d, type %d, #%d: %s\n",
 				      this->Class, this->Type,
-				      this->Key, (const char *)
-						(intptr_t)
-						this->Identifier);
+				      this->Key,
+				      arcs_component_identifier(this));
 		}
 		c = ARCS_GetPeer(this);
 		if (c != NULL)