Module Name: src Committed By: phx Date: Wed Feb 15 12:11:43 UTC 2012
Modified Files: src/sys/arch/amigappc/amigappc: machdep.c src/sys/arch/amigappc/conf: files.amigappc Log Message: Port amiga calls config_console() from machdep.c now, so we have to do the same. Otherwise no console is configured anymore. While being at it adapt files.amigappc to the latest changes in files.amiga. Ok by releng@. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amigappc/amigappc/machdep.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amigappc/conf/files.amigappc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amigappc/amigappc/machdep.c diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.50 src/sys/arch/amigappc/amigappc/machdep.c:1.51 --- src/sys/arch/amigappc/amigappc/machdep.c:1.50 Thu Nov 24 03:35:56 2011 +++ src/sys/arch/amigappc/amigappc/machdep.c Wed Feb 15 12:11:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.50 2011/11/24 03:35:56 mrg Exp $ */ +/* $NetBSD: machdep.c,v 1.51 2012/02/15 12:11:42 phx Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,9 +32,10 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/11/24 03:35:56 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2012/02/15 12:11:42 phx Exp $"); #include <sys/param.h> +#include <sys/device.h> #include <sys/mount.h> #include <sys/msgbuf.h> #include <sys/kernel.h> @@ -54,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include <amiga/amiga/cc.h> #include <amiga/amiga/cia.h> #include <amiga/amiga/custom.h> +#include <amiga/amiga/device.h> #include <amiga/amiga/isr.h> #include <amiga/amiga/memlist.h> #include <amigappc/amigappc/p5reg.h> @@ -642,10 +644,11 @@ void consinit(void) { + /* preconfigure graphics cards */ custom_chips_init(); - /* - ** Initialize the console before we print anything out. - */ + config_console(); + + /* Initialize the console before we print anything out. */ cninit(); } Index: src/sys/arch/amigappc/conf/files.amigappc diff -u src/sys/arch/amigappc/conf/files.amigappc:1.24 src/sys/arch/amigappc/conf/files.amigappc:1.25 --- src/sys/arch/amigappc/conf/files.amigappc:1.24 Fri Jan 14 12:54:39 2011 +++ src/sys/arch/amigappc/conf/files.amigappc Wed Feb 15 12:11:43 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.amigappc,v 1.24 2011/01/14 12:54:39 phx Exp $ +# $NetBSD: files.amigappc,v 1.25 2012/02/15 12:11:43 phx Exp $ # maxpartitions must be first item in files.${ARCH}.newconf maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL! @@ -33,8 +33,8 @@ defflag LEV6_DEFER defparam IOBZCLOCK -file dev/cons.c ite | ser -file dev/cninit.c ite | ser +file dev/cons.c +file dev/cninit.c file arch/amigappc/amigappc/amiga_init.c file arch/amigappc/amigappc/autoconf.c file arch/amigappc/amigappc/machdep.c @@ -149,11 +149,11 @@ file arch/amiga/dev/ite.c ite needs-fla file arch/amiga/dev/kbdmap.c ite file arch/amiga/dev/kf_custom.c kfont_custom file arch/amiga/dev/kf_iso8859_1_8x8.c kfont_cons_iso8859_1 & - ( ite | amidisplaycc ) + ( ite | wsdisplay ) file arch/amiga/dev/kf_iso8859_1_8x11.c kfont_cons_iso8859_1 & kfont_8x11 file arch/amiga/dev/kf_iso8859_2_8x8.c kfont_cons_iso8859_2 & - ( ite | amidisplaycc ) + ( ite | wsdisplay ) file arch/amiga/dev/kf_iso8859_2_8x11.c kfont_cons_iso8859_2 & kfont_8x11