From owner-p4-projects@FreeBSD.ORG Mon Dec 8 19:09:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2102D1065676; Mon, 8 Dec 2008 19:09:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D93AD106564A for ; Mon, 8 Dec 2008 19:09:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C77D58FC08 for ; Mon, 8 Dec 2008 19:09:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8J9YDv010312 for ; Mon, 8 Dec 2008 19:09:34 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8J9Y5B010310 for perforce@freebsd.org; Mon, 8 Dec 2008 19:09:34 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 8 Dec 2008 19:09:34 GMT Message-Id: <200812081909.mB8J9Y5B010310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 19:09:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154353 Change 154353 by ed@ed_flippo on 2008/12/08 19:08:52 - Only build libteken when building scterm-teken. - Try to make syscons build again on PC98. - Put proper #ifdef's in scterm-teken.c to let it build without UTF-8 support. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#32 edit .. //depot/projects/mpsafetty/sys/conf/files.amd64#8 edit .. //depot/projects/mpsafetty/sys/conf/files.i386#13 edit .. //depot/projects/mpsafetty/sys/conf/files.ia64#5 edit .. //depot/projects/mpsafetty/sys/conf/files.powerpc#10 edit .. //depot/projects/mpsafetty/sys/conf/files.sparc64#9 edit .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#15 edit .. //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#4 edit .. //depot/projects/mpsafetty/sys/pc98/cbus/sctermvar.h#1 add Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#32 (text+ko) ==== @@ -1430,7 +1430,6 @@ dev/syscons/star/star_saver.c optional star_saver dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -dev/syscons/teken/teken.c optional sc dev/syscons/warp/warp_saver.c optional warp_saver dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux dev/tdfx/tdfx_pci.c optional tdfx pci ==== //depot/projects/mpsafetty/sys/conf/files.amd64#8 (text+ko) ==== @@ -199,6 +199,7 @@ dev/syscons/scterm-teken.c optional sc dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc +dev/syscons/teken/teken.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi isa/atrtc.c standard ==== //depot/projects/mpsafetty/sys/conf/files.i386#13 (text+ko) ==== @@ -224,6 +224,7 @@ dev/syscons/scvesactl.c optional sc vga vesa dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc +dev/syscons/teken/teken.c optional sc dev/uart/uart_cpu_i386.c optional uart dev/acpica/acpi_if.m standard dev/wpi/if_wpi.c optional wpi ==== //depot/projects/mpsafetty/sys/conf/files.ia64#5 (text+ko) ==== @@ -60,6 +60,7 @@ dev/syscons/scterm-teken.c optional sc dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc +dev/syscons/teken/teken.c optional sc dev/uart/uart_cpu_ia64.c optional uart dev/acpica/acpi_if.m standard ia64/acpica/OsdEnvironment.c optional acpi ==== //depot/projects/mpsafetty/sys/conf/files.powerpc#10 (text+ko) ==== @@ -39,6 +39,7 @@ dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc +dev/syscons/teken/teken.c optional sc dev/tsec/if_tsec.c optional tsec dev/tsec/if_tsec_ocp.c optional tsec mpc85xx dev/uart/uart_bus_ocp.c optional uart mpc85xx ==== //depot/projects/mpsafetty/sys/conf/files.sparc64#9 (text+ko) ==== @@ -55,6 +55,7 @@ dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc +dev/syscons/teken/teken.c optional sc dev/uart/uart_cpu_sparc64.c optional uart dev/uart/uart_kbd_sun.c optional uart sc kern/syscalls.c optional ktr ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#15 (text+ko) ==== @@ -269,11 +269,14 @@ vm_offset_t p; int cursor, attr; +#ifdef TEKEN_UTF8 if (c >= 0x80) { /* XXX: Don't display UTF-8 yet. */ attr = (FG_YELLOW|BG_RED) << 8; ch = '?'; - } else { + } else +#endif /* TEKEN_UTF8 */ + { attr = scteken_attr(a); ch = c; } @@ -299,11 +302,14 @@ unsigned int width; int attr, row; +#ifdef TEKEN_UTF8 if (c >= 0x80) { /* XXX: Don't display UTF-8 yet. */ attr = (FG_YELLOW|BG_RED) << 8; ch = '?'; - } else { + } else +#endif /* TEKEN_UTF8 */ + { attr = scteken_attr(a); ch = c; } ==== //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include -#include +#include #define MAX_ESC_PAR 5