From owner-p4-projects@FreeBSD.ORG  Mon Apr  1 21:47:11 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8051C926; Mon,  1 Apr 2013 21:47:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 42B61923
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 21:47:11 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 325402D6
 for <perforce@freebsd.org>; Mon,  1 Apr 2013 21:47:11 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31LlBlk039196
 for <perforce@freebsd.org>; Mon, 1 Apr 2013 21:47:11 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31LlB2B039193
 for perforce@freebsd.org; Mon, 1 Apr 2013 21:47:11 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 1 Apr 2013 21:47:11 GMT
Message-Id: <201304012147.r31LlB2B039193@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 227297 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Apr 2013 21:47:11 -0000

http://p4web.freebsd.org/@@227297?ac=10

Change 227297 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 21:46:29

	Various BERI /boot/loader bugfixes.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_console.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/loader.h#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_console.c#2 (text+ko) ====

@@ -37,7 +37,9 @@
 
 #include <cons.h>
 
-static void	c_out(int c);
+static void	c_probe(struct console *);
+static int	c_init(int);
+static void	c_out(int);
 static int	c_in(void);
 static int	c_ready(void);
 
@@ -45,14 +47,28 @@
 	.c_name = "comconsole",
 	.c_desc = "altera jtag uart",
 	.c_flags = 0,
-	.c_probe = NULL,
-	.c_init = NULL,
+	.c_probe = c_probe,
+	.c_init = c_init,
 	.c_out = c_out,
 	.c_in = c_in,
 	.c_ready = c_ready,
 };
 
 static void
+c_probe(struct console *cp)
+{
+
+	cp->c_flags |= C_PRESENTIN|C_PRESENTOUT;
+}
+
+static int
+c_init(int arg)
+{
+
+	return (0);
+}
+
+static void
 c_out(int c)
 {
 

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/loader.h#2 (text+ko) ====

@@ -50,7 +50,7 @@
 int	md_load64(char *args, vm_offset_t *modulep);
 
 /* vers.c */
-extern char		*bootprog_name, *bootprog_rev;
-extern char		*bootprog_date, *bootprog_maker;
+extern char		bootprog_name[], bootprog_rev[];
+extern char		bootprog_date[], bootprog_maker[];
 
 #endif /* !_BOOT_LOADER_H_ */

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#2 (text+ko) ====

@@ -45,6 +45,7 @@
 
 struct devsw *devsw[] = {
 	&beri_disk,
+	NULL
 };
 
 struct arch_switch archsw;