PERFORCE change 73501 for review

[Juli Mallett]

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

Change 73501 by jmallett at jmallett_windward on 2005/03/19 03:29:35

	Make an ARCS device and try to use it to hang stuff off.

Affected files ...

.. //depot/projects/mips/sys/conf/files.mips#41 edit
.. //depot/projects/mips/sys/dev/arcs/arcs.c#5 edit
.. //depot/projects/mips/sys/dev/arcs/arcs.h#5 edit
.. //depot/projects/mips/sys/dev/arcs/arcs_dev.c#1 add
.. //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 edit
.. //depot/projects/mips/sys/mips/conf/INDY#17 edit
.. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#39 edit

Differences ...

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

@@ -60,6 +60,7 @@
 # This stanza is device files.
 dev/arcs/arcs.c			optional	arcs
 dev/arcs/arcs_console.c		optional	arcs
+dev/arcs/arcs_dev.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#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.c#4 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs.c#5 $
  */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@
 #define	ARCS_FV_GetEnvironmentVariable_Offset	(30 * sizeof (ARCS_Pointer_t))
 
 int
-arcs_attach(void *arcs_base)
+arcs_init(void *arcs_base)
 {
 	uint32_t *arcs_signature;
 

==== //depot/projects/mips/sys/dev/arcs/arcs.h#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.h#4 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs.h#5 $
  */
 
 #ifndef	_DEV_ARCS_ARCS_H_
@@ -56,7 +56,7 @@
 /*
  * Bookkeeping.
  */
-int arcs_attach(void *);
+int arcs_init(void *);
 const char *arcs_systemid(void);
 void arcs_cnattach(void);
 

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

@@ -23,12 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#2 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_disk.c#3 $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
+#include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
@@ -67,7 +68,7 @@
 
 static devclass_t arcs_disk_devclass;
 
-DRIVER_MODULE(arcs_disk, root, arcs_disk_driver, arcs_disk_devclass, 0, 0);
+DRIVER_MODULE(arcs_disk, arcs, arcs_disk_driver, arcs_disk_devclass, 0, 0);
 
 /*
  * Disk device control interface.
@@ -127,7 +128,7 @@
 
 	sc->sc_disk = disk_alloc();
 	sc->sc_disk->d_strategy = arcs_disk_strategy;
-	sc->sc_disk->d_name = "ufs_disk";
+	sc->sc_disk->d_name = "arcs_disk";
 	sc->sc_disk->d_sectorsize = ARCS_DISK_BSIZE;
 	sc->sc_disk->d_mediasize = (off_t)8/*XXX*/ * ARCS_DISK_BSIZE;
 	sc->sc_disk->d_fwsectors = 0;

==== //depot/projects/mips/sys/mips/conf/INDY#17 (text+ko) ====

@@ -18,6 +18,7 @@
 
 # Hardware support
 device		arcs			#ARCS Firmware + Console.
+device		arcs_disk		#ARCS Disk.
 device		imc			#IMC bus.
 device		hpc			#HPC bus.
 device		gio			#GIO bus.

==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#39 (text+ko) ====

@@ -91,7 +91,7 @@
 	/*
 	 * Initialise the ARCS stuff.
 	 */
-	arcs_attach((void *)MIPS_PHYS_TO_KSEG1(0x00001000));
+	arcs_init((void *)MIPS_PHYS_TO_KSEG1(0x00001000));
 	arcs_cnattach();
 
 	bootverbose = 1;