From owner-p4-projects@FreeBSD.ORG Sat Mar 19 09:13:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED0FA16A4D0; Sat, 19 Mar 2005 09:13:12 +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 6417916A4CE for ; Sat, 19 Mar 2005 09:13:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06AEB43D1D for ; Sat, 19 Mar 2005 09:13:12 +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 j2J9DB2a095991 for ; Sat, 19 Mar 2005 09:13:11 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2J9DBbo095988 for perforce@freebsd.org; Sat, 19 Mar 2005 09:13:11 GMT (envelope-from jmallett@freebsd.org) Date: Sat, 19 Mar 2005 09:13:11 GMT Message-Id: <200503190913.j2J9DBbo095988@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 73511 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 09:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=73511 Change 73511 by jmallett@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 @@ -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 @@ -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)