From 5e88cf0250fc8c37836170785661a8ad00c849cb Mon Sep 17 00:00:00 2001 From: shadchin Date: Wed, 14 May 2014 18:18:01 +0000 Subject: [PATCH] Remove unused code. ok miod@ --- usr.sbin/wsmoused/mouse_protocols.c | 20 +------------------- usr.sbin/wsmoused/wsmoused.c | 3 +-- usr.sbin/wsmoused/wsmoused.h | 3 +-- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/usr.sbin/wsmoused/mouse_protocols.c b/usr.sbin/wsmoused/mouse_protocols.c index dfe38bbaf04..ab13b42f464 100644 --- a/usr.sbin/wsmoused/mouse_protocols.c +++ b/usr.sbin/wsmoused/mouse_protocols.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse_protocols.c,v 1.13 2009/06/05 03:37:10 miod Exp $ */ +/* $OpenBSD: mouse_protocols.c,v 1.14 2014/05/14 18:18:01 shadchin Exp $ */ /* * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon @@ -194,24 +194,6 @@ SetMouseSpeed(int old, int new, unsigned int cflag) mouse.portname, strerror(errno)); return; } - /* this will query the initial baudrate only once */ - if (mouse.old_baudrate < 0) { - switch (cfgetispeed(&tty)) { - case B9600: - mouse.old_baudrate = 9600; - break; - case B4800: - mouse.old_baudrate = 4800; - break; - case B2400: - mouse.old_baudrate = 2400; - break; - case B1200: - default: - mouse.old_baudrate = 1200; - break; - } - } tty.c_iflag = IGNBRK | IGNPAR; tty.c_oflag = 0; tty.c_lflag = 0; diff --git a/usr.sbin/wsmoused/wsmoused.c b/usr.sbin/wsmoused/wsmoused.c index c060ae855bb..be3d87280c1 100644 --- a/usr.sbin/wsmoused/wsmoused.c +++ b/usr.sbin/wsmoused/wsmoused.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmoused.c,v 1.30 2014/05/14 18:14:09 shadchin Exp $ */ +/* $OpenBSD: wsmoused.c,v 1.31 2014/05/14 18:18:01 shadchin Exp $ */ /* * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon @@ -90,7 +90,6 @@ mouse_t mouse = { .ttyname = NULL, .proto = P_UNKNOWN, .baudrate = 1200, - .old_baudrate = 1200, .rate = MOUSE_RATE_UNKNOWN, .resolution = MOUSE_RES_UNKNOWN, .mfd = -1, diff --git a/usr.sbin/wsmoused/wsmoused.h b/usr.sbin/wsmoused/wsmoused.h index 192e4fb1539..b432aed7826 100644 --- a/usr.sbin/wsmoused/wsmoused.h +++ b/usr.sbin/wsmoused/wsmoused.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmoused.h,v 1.9 2014/05/14 18:14:09 shadchin Exp $ */ +/* $OpenBSD: wsmoused.h,v 1.10 2014/05/14 18:18:01 shadchin Exp $ */ /* * Copyright (c) 2001 Jean-Baptiste Marchand, Julien Montagne and Jerome Verdon @@ -99,7 +99,6 @@ typedef struct mouse_s { char *ttyname; /* wsdisplay control tty device */ int proto; /* MOUSE_PROTO_XXX */ int baudrate; - int old_baudrate; unsigned char rate; /* report rate */ unsigned int resolution; /* MOUSE_RES_XXX or a positive number */ int mfd; /* mouse file descriptor */ -- 2.20.1