From owner-p4-projects@FreeBSD.ORG Sat Dec 6 18:12:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BBD21065678; Sat, 6 Dec 2008 18:12:00 +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 C43B01065675 for ; Sat, 6 Dec 2008 18:11:59 +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 B1F2A8FC17 for ; Sat, 6 Dec 2008 18:11:59 +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 mB6IBx9S076983 for ; Sat, 6 Dec 2008 18:11:59 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB6IBxeF076981 for perforce@freebsd.org; Sat, 6 Dec 2008 18:11:59 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 6 Dec 2008 18:11:59 GMT Message-Id: <200812061811.mB6IBxeF076981@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 154201 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: Sat, 06 Dec 2008 18:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=154201 Change 154201 by ed@ed_flippo on 2008/12/06 18:10:59 Somewhat make device status reports work. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#13 edit .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#8 edit .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#4 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#13 (text+ko) ==== @@ -398,4 +398,7 @@ static void scteken_respond(void *arg, const void *buf, size_t len) { + scr_stat *scp = arg; + + sc_respond(scp, buf, len); } ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#8 (text+ko) ==== @@ -3569,7 +3569,7 @@ #endif /* !SC_NO_FONT_LOADING */ void -sc_paste(scr_stat *scp, u_char *p, int count) +sc_paste(scr_stat *scp, const u_char *p, int count) { struct tty *tp; u_char *rmap; @@ -3584,6 +3584,22 @@ } void +sc_respond(scr_stat *scp, const u_char *p, int count) +{ + struct tty *tp; + + tp = SC_DEV(scp->sc, scp->sc->cur_scp->index); + if (!tty_opened(tp)) + return; + for (; count > 0; --count) + ttydisc_rint(tp, *p++, 0); +#if 0 + /* XXX: we can't call ttydisc_rint_done() here! */ + ttydisc_rint_done(tp); +#endif +} + +void sc_bell(scr_stat *scp, int pitch, int duration) { if (cold || shutdown_in_progress || !enable_bell) ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#4 (text+ko) ==== @@ -563,7 +563,8 @@ int sc_switch_scr(sc_softc_t *sc, u_int next_scr); void sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard); int sc_init_emulator(scr_stat *scp, char *name); -void sc_paste(scr_stat *scp, u_char *p, int count); +void sc_paste(scr_stat *scp, const u_char *p, int count); +void sc_respond(scr_stat *scp, const u_char *p, int count); void sc_bell(scr_stat *scp, int pitch, int duration); /* schistory.c */