From owner-p4-projects@FreeBSD.ORG Sat Mar 19 03:30:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6027016A4D0; Sat, 19 Mar 2005 03:30:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2333416A4CE for ; Sat, 19 Mar 2005 03:30:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFCAB43D3F for ; Sat, 19 Mar 2005 03:30:09 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2J3U9Or069657 for ; Sat, 19 Mar 2005 03:30:09 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J3U9Sb069654 for perforce@freebsd.org; Sat, 19 Mar 2005 03:30:09 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 03:30:09 GMT Message-Id: <200503190330.j2J3U9Sb069654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 73501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Mar 2005 03:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=73501 Change 73501 by jmallett@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 @@ -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 #include #include +#include #include #include #include @@ -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;