Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/prep Separate consinit.
details: https://anonhg.NetBSD.org/src/rev/a8c8840fa746
branches: trunk
changeset: 526119:a8c8840fa746
user: nonaka <nonaka%NetBSD.org@localhost>
date: Thu Apr 25 20:36:50 2002 +0000
description:
Separate consinit.
diffstat:
sys/arch/prep/conf/files.prep | 3 +-
sys/arch/prep/prep/consinit.c | 143 ++++++++++++++++++++++++++++++++++++++++++
sys/arch/prep/prep/machdep.c | 96 +---------------------------
3 files changed, 146 insertions(+), 96 deletions(-)
diffs (281 lines):
diff -r da7838dc3c67 -r a8c8840fa746 sys/arch/prep/conf/files.prep
--- a/sys/arch/prep/conf/files.prep Thu Apr 25 20:17:04 2002 +0000
+++ b/sys/arch/prep/conf/files.prep Thu Apr 25 20:36:50 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.prep,v 1.29 2002/04/22 09:41:20 augustss Exp $
+# $NetBSD: files.prep,v 1.30 2002/04/25 20:38:18 nonaka Exp $
#
# prep-specific configuration info
#
@@ -21,6 +21,7 @@
file arch/prep/prep/bus_space.c
file arch/prep/prep/clock.c
file arch/prep/prep/conf.c
+file arch/prep/prep/consinit.c
file arch/prep/prep/disksubr.c disk
file arch/prep/prep/extintr.c
file arch/prep/prep/machdep.c
diff -r da7838dc3c67 -r a8c8840fa746 sys/arch/prep/prep/consinit.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/prep/consinit.c Thu Apr 25 20:36:50 2002 +0000
@@ -0,0 +1,143 @@
+/* $NetBSD: consinit.c,v 1.1 2002/04/25 20:36:50 nonaka Exp $ */
+
+/*
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+
+#include <machine/bootinfo.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/cons.h>
+
+#include "gten.h"
+#if (NGTEN > 0)
+#include <machine/gtenvar.h>
+#endif
+
+/* Implied by gten support. */
+#if (NGTEN > 0)
+#include <dev/pci/pcivar.h>
+#endif
+
+#include "vga.h"
+#if (NVGA > 0)
+#include <dev/ic/mc6845reg.h>
+#include <dev/ic/pcdisplayvar.h>
+#include <dev/ic/vgareg.h>
+#include <dev/ic/vgavar.h>
+#endif
+
+#include "pckbc.h"
+#if (NPCKBC > 0)
+#include <dev/isa/isareg.h>
+#include <dev/ic/i8042reg.h>
+#include <dev/ic/pckbcvar.h>
+#endif
+
+#include "com.h"
+#if (NCOM > 0)
+#include <sys/termios.h>
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
+void comsoft(void);
+#endif
+
+/*
+ * consinit
+ * Initialize system console.
+ */
+void
+consinit(void)
+{
+ struct btinfo_console *consinfo;
+ static int initted = 0;
+#if (NGTEN > 0)
+ struct prep_pci_chipset pc;
+#endif
+
+ if (initted)
+ return;
+ initted = 1;
+
+ consinfo = (struct btinfo_console *)lookup_bootinfo(BTINFO_CONSOLE);
+ if (!consinfo)
+ panic("not found console information in bootinfo");
+
+#if (NPFB > 0)
+ if (!strcmp(consinfo->devname, "fb")) {
+ pfb_cnattach(consinfo->addr);
+#if (NPCKBC > 0)
+ pckbc_cnattach(&prep_isa_io_space_tag, IO_KBD, KBCMDP,
+ PCKBC_KBD_SLOT);
+#endif
+ return;
+ }
+#endif
+
+#if (NVGA > 0) || (NGTEN > 0)
+ if (!strcmp(consinfo->devname, "vga")) {
+#if (NGTEN > 0)
+ (*platform->pci_get_chipset_tag)(&pc);
+#endif
+#if (NGTEN > 0)
+ if (!gten_cnattach(&pc, &prep_mem_space_tag))
+ goto dokbd;
+#endif
+#if (NVGA > 0)
+ if (!vga_cnattach(&prep_io_space_tag, &prep_mem_space_tag,
+ -1, 1))
+ goto dokbd;
+#endif
+dokbd:
+#if (NPCKBC > 0)
+ pckbc_cnattach(&prep_isa_io_space_tag, IO_KBD, KBCMDP,
+ PCKBC_KBD_SLOT);
+#endif
+ return;
+ }
+#endif /* VGA | GTEN */
+
+#if (NCOM > 0)
+ if (!strcmp(consinfo->devname, "com")) {
+ bus_space_tag_t tag = &prep_isa_io_space_tag;
+
+ if(comcnattach(tag, consinfo->addr, consinfo->speed, COM_FREQ,
+ ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
+ panic("can't init serial console");
+
+ return;
+ }
+#endif
+ panic("invalid console device %s", consinfo->devname);
+}
diff -r da7838dc3c67 -r a8c8840fa746 sys/arch/prep/prep/machdep.c
--- a/sys/arch/prep/prep/machdep.c Thu Apr 25 20:17:04 2002 +0000
+++ b/sys/arch/prep/prep/machdep.c Thu Apr 25 20:36:50 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37 2002/04/23 12:41:08 kleink Exp $ */
+/* $NetBSD: machdep.c,v 1.38 2002/04/25 20:36:50 nonaka Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -71,31 +71,6 @@
#include <dev/cons.h>
-#include "gten.h"
-#if (NGTEN > 0)
-#include <machine/gtenvar.h>
-#endif
-
-/* Implied by gten support. */
-#if (NGTEN > 0)
-#include <dev/pci/pcivar.h>
-#endif
-
-#include "vga.h"
-#if (NVGA > 0)
-#include <dev/ic/mc6845reg.h>
-#include <dev/ic/pcdisplayvar.h>
-#include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
-#endif
-
-#include "pckbc.h"
-#if (NPCKBC > 0)
-#include <dev/isa/isareg.h>
-#include <dev/ic/i8042reg.h>
-#include <dev/ic/pckbcvar.h>
-#endif
-
#include "com.h"
#if (NCOM > 0)
#include <sys/termios.h>
@@ -584,75 +559,6 @@
return (NULL);
}
-/*
- * consinit
- * Initialize system console.
- */
-void
-consinit()
-{
- struct btinfo_console *consinfo;
- static int initted = 0;
-#if (NGTEN > 0)
- struct prep_pci_chipset pc;
-#endif
-
- if (initted)
- return;
- initted = 1;
-
- consinfo = (struct btinfo_console *)lookup_bootinfo(BTINFO_CONSOLE);
- if (!consinfo)
- panic("not found console information in bootinfo");
-
-#if (NPFB > 0)
- if (!strcmp(consinfo->devname, "fb")) {
- pfb_cnattach(consinfo->addr);
-#if (NPCKBC > 0)
- pckbc_cnattach(&prep_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
-#endif
- return;
- }
-#endif
-
-#if (NVGA > 0) || (NGTEN > 0)
- if (!strcmp(consinfo->devname, "vga")) {
-#if (NGTEN > 0)
- (*platform->pci_get_chipset_tag)(&pc);
-#endif
-#if (NGTEN > 0)
- if (!gten_cnattach(&pc, &prep_mem_space_tag))
- goto dokbd;
-#endif
-#if (NVGA > 0)
- if (!vga_cnattach(&prep_io_space_tag, &prep_mem_space_tag,
- -1, 1))
- goto dokbd;
-#endif
-dokbd:
-#if (NPCKBC > 0)
- pckbc_cnattach(&prep_isa_io_space_tag, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT);
-#endif
- return;
- }
-#endif /* VGA | GTEN */
-
-#if (NCOM > 0)
- if (!strcmp(consinfo->devname, "com")) {
- bus_space_tag_t tag = &prep_isa_io_space_tag;
-
- if(comcnattach(tag, consinfo->addr, consinfo->speed, COM_FREQ,
- ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
- panic("can't init serial console");
-
- return;
- }
-#endif
- panic("invalid console device %s", consinfo->devname);
-}
-
void
dumpsys()
{
Home |
Main Index |
Thread Index |
Old Index