From 2ce42987d3ee48eeab510a217bfbdd94847bd649 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Fri, 21 Jul 1995 22:52:01 +0000 Subject: Obtained from: partly from ancient patches of mine via 1.1.5 Move static termioschars() from a couple of drivers to tty.c. Now there is only one copy of ttydefchars[]. --- sys/dev/cy/cy.c | 12 +----------- sys/dev/cy/cy_isa.c | 12 +----------- sys/dev/sio/sio.c | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 81f702249235d..090901fbf4f28 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.7 1995/05/30 08:01:34 rgrimes Exp $ + * $Id: cy.c,v 1.8 1995/07/05 12:15:52 bde Exp $ */ #include "cy.h" @@ -75,9 +75,7 @@ #include #include #include -#define TTYDEFCHARS /* XXX TK2.0 */ #include -#undef TTYDEFCHARS #include #include #include @@ -159,14 +157,6 @@ #define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq) #define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq) #define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq) -static void termioschars __P((struct termios *t)); -static void -termioschars(t) - struct termios *t; -{ - - bcopy(ttydefchars, t->c_cc, sizeof t->c_cc); -} #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE) diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 81f702249235d..090901fbf4f28 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.7 1995/05/30 08:01:34 rgrimes Exp $ + * $Id: cy.c,v 1.8 1995/07/05 12:15:52 bde Exp $ */ #include "cy.h" @@ -75,9 +75,7 @@ #include #include #include -#define TTYDEFCHARS /* XXX TK2.0 */ #include -#undef TTYDEFCHARS #include #include #include @@ -159,14 +157,6 @@ #define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq) #define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq) #define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq) -static void termioschars __P((struct termios *t)); -static void -termioschars(t) - struct termios *t; -{ - - bcopy(ttydefchars, t->c_cc, sizeof t->c_cc); -} #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE) diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 4e09485528cb0..d8801961a33c6 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.101 1995/06/28 17:58:14 ache Exp $ + * $Id: sio.c,v 1.102 1995/07/05 14:30:07 bde Exp $ */ #include "sio.h" @@ -46,9 +46,7 @@ #include #include #include -#define TTYDEFCHARS /* XXX TK2.0 */ #include -#undef TTYDEFCHARS #include #include #include @@ -74,14 +72,6 @@ #define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq) #define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq) #define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq) -static void termioschars __P((struct termios *t)); -static void -termioschars(t) - struct termios *t; -{ - - bcopy(ttydefchars, t->c_cc, sizeof t->c_cc); -} #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE) -- cgit v1.3