From owner-p4-projects@FreeBSD.ORG Fri May 9 11:11:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9CDB37B404; Fri, 9 May 2003 11:11:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B38C37B401 for ; Fri, 9 May 2003 11:11:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB8B143F93 for ; Fri, 9 May 2003 11:11:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IBX0U077379 for ; Fri, 9 May 2003 11:11:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IBXoR077376 for perforce@freebsd.org; Fri, 9 May 2003 11:11:33 -0700 (PDT) Date: Fri, 9 May 2003 11:11:33 -0700 (PDT) Message-Id: <200305091811.h49IBXoR077376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30855 Change 30855 by peter@peter_daintree on 2003/05/09 11:11:25 Fix syscons as a console on amd64. It was a simple case of adding __amd64__ to the ifdefs Affected files ... .. //depot/projects/hammer/sys/dev/syscons/syscons.c#7 edit Differences ... ==== //depot/projects/hammer/sys/dev/syscons/syscons.c#7 (text+ko) ==== @@ -145,7 +145,7 @@ static int scparam(struct tty *tp, struct termios *t); static void scstart(struct tty *tp); static void scinit(int unit, int flags); -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags); #endif static void scshutdown(void *arg, int howto); @@ -1361,7 +1361,7 @@ static void sccnprobe(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1379,7 +1379,7 @@ /* initialize required fields */ cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL); -#endif /* __i386__ || __ia64__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* @@ -1394,7 +1394,7 @@ static void sccninit(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1402,7 +1402,7 @@ scinit(unit, flags | SC_KERNEL_CONSOLE); sc_console_unit = unit; sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* SHOULDN'T REACH HERE */ @@ -1417,7 +1417,7 @@ if (sc_console_unit < 0) return; /* shouldn't happen */ -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ #if 0 /* XXX */ sc_clear_screen(sc_console); sccnupdate(sc_console); @@ -1425,7 +1425,7 @@ scterm(sc_console_unit, SC_KERNEL_CONSOLE); sc_console_unit = -1; sc_console = NULL; -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* do nothing XXX */ @@ -2806,7 +2806,7 @@ sc->flags |= SC_INIT_DONE; } -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags) { @@ -2862,7 +2862,7 @@ sc->keyboard = -1; sc->adapter = -1; } -#endif +#endif /* __i386__ || __ia64__ || __amd64__ */ static void scshutdown(void *arg, int howto)