From owner-svn-src-head@freebsd.org Thu Feb 21 19:19:31 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C27DC14ECF78; Thu, 21 Feb 2019 19:19:31 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5EA4389403; Thu, 21 Feb 2019 19:19:31 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FA4721F2C; Thu, 21 Feb 2019 19:19:31 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1LJJVJm005498; Thu, 21 Feb 2019 19:19:31 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1LJJUiA005495; Thu, 21 Feb 2019 19:19:30 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201902211919.x1LJJUiA005495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Thu, 21 Feb 2019 19:19:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344445 - head/sys/dev/syscons X-SVN-Group: head X-SVN-Commit-Author: bde X-SVN-Commit-Paths: head/sys/dev/syscons X-SVN-Commit-Revision: 344445 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5EA4389403 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 19:19:32 -0000 Author: bde Date: Thu Feb 21 19:19:30 2019 New Revision: 344445 URL: https://svnweb.freebsd.org/changeset/base/344445 Log: Fix the dumb and sc terminal emulators to compile and work. First remove ifdefs of the unsupported option SC_DUMB_TERMINAL which prevented building using both in the same kernel and broke regression tests. This option will be replaced by per-emulator supported options. The dumb emulator rotted with KSE in r83366, but usually compiled since it is ifdefed to nothing unless SC_DUMB_TERMINAL is defined. The type of an unused function parameter changed. Both emulators rotted when 2 new methods were added while the emulators were removed. Only null methods are needed, but null function pointers give panics instead. The wildcard in the default for the unsupported option SC_DFLT_TERM never really worked. It tends to prefer the dumb emulator when multiple emulators are configured. Change it to prefer scteken for compatibility. Modified: head/sys/dev/syscons/scterm-dumb.c head/sys/dev/syscons/scterm-sc.c head/sys/dev/syscons/syscons.h Modified: head/sys/dev/syscons/scterm-dumb.c ============================================================================== --- head/sys/dev/syscons/scterm-dumb.c Thu Feb 21 18:41:41 2019 (r344444) +++ head/sys/dev/syscons/scterm-dumb.c Thu Feb 21 19:19:30 2019 (r344445) @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include #if defined(__sparc64__) || defined(__powerpc__) @@ -42,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef SC_DUMB_TERMINAL - /* dumb terminal emulator */ static sc_term_init_t dumb_init; @@ -53,6 +53,8 @@ static sc_term_ioctl_t dumb_ioctl; static sc_term_clear_t dumb_clear; static sc_term_input_t dumb_input; static void dumb_nop(void); +static sc_term_fkeystr_t dumb_fkeystr; +static sc_term_sync_t dumb_sync; static sc_term_sw_t sc_term_dumb = { { NULL, NULL }, @@ -70,6 +72,8 @@ static sc_term_sw_t sc_term_dumb = { dumb_clear, (sc_term_notify_t *)dumb_nop, dumb_input, + dumb_fkeystr, + dumb_sync, }; SCTERM_MODULE(dumb, sc_term_dumb); @@ -108,7 +112,7 @@ dumb_puts(scr_stat *scp, u_char *buf, int len) static int dumb_ioctl(scr_stat *scp, struct tty *tp, u_long cmd, caddr_t data, - int flag, struct proc *p) + struct thread *td) { vid_info_t *vi; @@ -146,10 +150,19 @@ dumb_input(scr_stat *scp, int c, struct tty *tp) return FALSE; } +static const char * +dumb_fkeystr(scr_stat *scp, int c) +{ + return (NULL); +} + static void +dumb_sync(scr_stat *scp) +{ +} + +static void dumb_nop(void) { /* nothing */ } - -#endif /* SC_DUMB_TERMINAL */ Modified: head/sys/dev/syscons/scterm-sc.c ============================================================================== --- head/sys/dev/syscons/scterm-sc.c Thu Feb 21 18:41:41 2019 (r344444) +++ head/sys/dev/syscons/scterm-sc.c Thu Feb 21 19:19:30 2019 (r344445) @@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifndef SC_DUMB_TERMINAL - #define MAX_ESC_PAR 5 /* attribute flags */ @@ -89,6 +87,8 @@ static sc_term_default_attr_t scterm_default_attr; static sc_term_clear_t scterm_clear; static sc_term_notify_t scterm_notify; static sc_term_input_t scterm_input; +static sc_term_fkeystr_t scterm_fkeystr; +static sc_term_sync_t scterm_sync; static sc_term_sw_t sc_term_sc = { { NULL, NULL }, @@ -106,6 +106,8 @@ static sc_term_sw_t sc_term_sc = { scterm_clear, scterm_notify, scterm_input, + scterm_fkeystr, + scterm_sync, }; SCTERM_MODULE(sc, sc_term_sc); @@ -780,6 +782,17 @@ scterm_input(scr_stat *scp, int c, struct tty *tp) return FALSE; } +static const char * +scterm_fkeystr(scr_stat *scp, int c) +{ + return (NULL); +} + +static void +scterm_sync(scr_stat *scp) +{ +} + /* * Calculate hardware attributes word using logical attributes mask and * hardware colors @@ -807,5 +820,3 @@ mask2attr(term_stat *tcp) return (attr << 8); } - -#endif /* SC_DUMB_TERMINAL */ Modified: head/sys/dev/syscons/syscons.h ============================================================================== --- head/sys/dev/syscons/syscons.h Thu Feb 21 18:41:41 2019 (r344444) +++ head/sys/dev/syscons/syscons.h Thu Feb 21 19:19:30 2019 (r344445) @@ -378,7 +378,7 @@ typedef struct sc_ttysoftc { /* terminal emulator */ #ifndef SC_DFLT_TERM -#define SC_DFLT_TERM "*" /* any */ +#define SC_DFLT_TERM "scteken" #endif typedef int sc_term_init_t(scr_stat *scp, void **tcp, int code);