[src/trunk]: src/sys/arch/amigappc Port amiga calls config_console() from mac...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/85fe1898d0fb
branches:  trunk
changeset: 773751:85fe1898d0fb
user:      phx <phx%NetBSD.org@localhost>
date:      Wed Feb 15 12:11:42 2012 +0000

description:
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@.

diffstat:

 sys/arch/amigappc/amigappc/machdep.c  |  13 ++++++++-----
 sys/arch/amigappc/conf/files.amigappc |  10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r e80ce15f1a5a -r 85fe1898d0fb sys/arch/amigappc/amigappc/machdep.c
--- a/sys/arch/amigappc/amigappc/machdep.c      Wed Feb 15 11:59:30 2012 +0000
+++ b/sys/arch/amigappc/amigappc/machdep.c      Wed Feb 15 12:11:42 2012 +0000
@@ -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 @@
 #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 @@
 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();
 }
 
diff -r e80ce15f1a5a -r 85fe1898d0fb sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc     Wed Feb 15 11:59:30 2012 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc     Wed Feb 15 12:11:42 2012 +0000
@@ -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 @@
 
 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/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