From 10648a4e044ba5f0477edafc24a3e6d405214273 Mon Sep 17 00:00:00 2001 From: fvdl Date: Thu, 27 Feb 2003 01:48:44 +0000 Subject: [PATCH] Moved to x86/x86 --- sys/arch/i386/i386/consinit.c | 230 ---------------------------------- 1 file changed, 230 deletions(-) delete mode 100644 sys/arch/i386/i386/consinit.c diff --git a/sys/arch/i386/i386/consinit.c b/sys/arch/i386/i386/consinit.c deleted file mode 100644 index 1c7249818ec9..000000000000 --- a/sys/arch/i386/i386/consinit.c +++ /dev/null @@ -1,230 +0,0 @@ -/* $NetBSD: consinit.c,v 1.10 2003/02/26 21:28:21 fvdl Exp $ */ - -/* - * Copyright (c) 1998 - * Matthias Drochner. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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 -__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2003/02/26 21:28:21 fvdl Exp $"); - -#include "opt_kgdb.h" - -#include -#include -#include -#include -#include - -#include "vga.h" -#include "ega.h" -#include "pcdisplay.h" -#if (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) -#include -#include -#if (NVGA > 0) -#include -#include -#endif -#if (NEGA > 0) -#include -#endif -#if (NPCDISPLAY > 0) -#include -#endif -#endif - -#include "pckbc.h" -#if (NPCKBC > 0) -#include -#include -#include -#endif -#include "pckbd.h" /* for pckbc_machdep_cnattach */ - -#include "pc.h" -#if (NPC > 0) -#include -#endif - -#include "com.h" -#if (NCOM > 0) -#include -#include -#include -#endif - -#include "ukbd.h" -#if (NUKBD > 0) -#include -#endif - -#ifndef CONSDEVNAME -#define CONSDEVNAME "pc" -#endif - -#if (NCOM > 0) -#ifndef CONADDR -#define CONADDR 0x3f8 -#endif -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -#ifndef CONMODE -#define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */ -#endif -int comcnmode = CONMODE; -#endif /* NCOM */ - -const struct btinfo_console default_consinfo = { - {0, 0}, - CONSDEVNAME, -#if (NCOM > 0) - CONADDR, CONSPEED -#else - 0, 0 -#endif -}; - -#ifdef KGDB -#ifndef KGDB_DEVNAME -#define KGDB_DEVNAME "com" -#endif -const char kgdb_devname[] = KGDB_DEVNAME; - -#if (NCOM > 0) -#ifndef KGDB_DEVADDR -#define KGDB_DEVADDR 0x3f8 -#endif -int comkgdbaddr = KGDB_DEVADDR; -#ifndef KGDB_DEVRATE -#define KGDB_DEVRATE TTYDEF_SPEED -#endif -int comkgdbrate = KGDB_DEVRATE; -#ifndef KGDB_DEVMODE -#define KGDB_DEVMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */ -#endif -int comkgdbmode = KGDB_DEVMODE; -#endif /* NCOM */ - -#endif /* KGDB */ - -/* - * consinit: - * initialize the system console. - * XXX - shouldn't deal with this initted thing, but then, - * it shouldn't be called from init386 either. - */ -void -consinit() -{ - const struct btinfo_console *consinfo; - static int initted; - - if (initted) - return; - initted = 1; - -#ifndef CONS_OVERRIDE - consinfo = lookup_bootinfo(BTINFO_CONSOLE); - if (!consinfo) -#endif - consinfo = &default_consinfo; - -#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) - if (!strcmp(consinfo->devname, "pc")) { -#if (NVGA > 0) - if (!vga_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM, - -1, 1)) - goto dokbd; -#endif -#if (NEGA > 0) - if (!ega_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM)) - goto dokbd; -#endif -#if (NPCDISPLAY > 0) - if (!pcdisplay_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM)) - goto dokbd; -#endif -#if (NPC > 0) - pccnattach(); -#endif - if (0) goto dokbd; /* XXX stupid gcc */ -dokbd: -#if (NPCKBC > 0) - pckbc_cnattach(X86_BUS_SPACE_IO, IO_KBD, KBCMDP, - PCKBC_KBD_SLOT); -#endif -#if NPCKBC == 0 && NUKBD > 0 - ukbd_cnattach(); -#endif - return; - } -#endif /* PC | VT | VGA | PCDISPLAY */ -#if (NCOM > 0) - if (!strcmp(consinfo->devname, "com")) { - bus_space_tag_t tag = X86_BUS_SPACE_IO; - - if (comcnattach(tag, consinfo->addr, consinfo->speed, - COM_FREQ, comcnmode)) - panic("can't init serial console @%x", consinfo->addr); - - return; - } -#endif - panic("invalid console device %s", consinfo->devname); -} - -#if (NPCKBC > 0) && (NPCKBD == 0) -/* - * glue code to support old console code with the - * mi keyboard controller driver - */ -int -pckbc_machdep_cnattach(kbctag, kbcslot) - pckbc_tag_t kbctag; - pckbc_slot_t kbcslot; -{ -#if (NPC > 0) && (NPCCONSKBD > 0) - return (pcconskbd_cnattach(kbctag, kbcslot)); -#else - return (ENXIO); -#endif -} -#endif - -#ifdef KGDB -void -kgdb_port_init() -{ -#if (NCOM > 0) - if(!strcmp(kgdb_devname, "com")) { - bus_space_tag_t tag = X86_BUS_SPACE_IO; - - com_kgdb_attach(tag, comkgdbaddr, comkgdbrate, COM_FREQ, - comkgdbmode); - } -#endif -} -#endif