Date: Mon, 1 Apr 2013 21:47:11 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 227297 for review Message-ID: <201304012147.r31LlB2B039193@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304012147.r31LlB2B039193>