From 8381108e2a3e58680c6e63d3e13c7f17da087552 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 15 May 2003 18:51:18 +0000 Subject: [PATCH] Don't install machine/mouse.h on i386 and prep; there are no users for the old busmouse interface any longer, we use wsmouse now. --- distrib/sets/lists/comp/md.i386 | 3 +- distrib/sets/lists/comp/md.prep | 3 +- distrib/sets/lists/comp/obsolete.i386 | 3 +- distrib/sets/lists/comp/obsolete.prep | 3 +- sys/arch/i386/include/Makefile | 4 +-- sys/arch/i386/include/mouse.h | 49 --------------------------- sys/arch/prep/include/Makefile | 4 +-- sys/arch/prep/include/mouse.h | 49 --------------------------- 8 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 sys/arch/i386/include/mouse.h delete mode 100644 sys/arch/prep/include/mouse.h diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386 index e8c425815fdc..0afcefadf75c 100644 --- a/distrib/sets/lists/comp/md.i386 +++ b/distrib/sets/lists/comp/md.i386 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.72 2003/04/26 10:51:16 fvdl Exp $ +# $NetBSD: md.i386,v 1.73 2003/05/15 18:51:19 wiz Exp $ ./lib/libm387.so base-sys-shlib ./usr/include/i386 comp-c-include ./usr/include/i386/_G_config.h comp-c-include @@ -41,7 +41,6 @@ ./usr/include/i386/lock.h comp-c-include ./usr/include/i386/math.h comp-c-include ./usr/include/i386/mcontext.h comp-c-include -./usr/include/i386/mouse.h comp-c-include ./usr/include/i386/mtrr.h comp-c-include ./usr/include/i386/npx.h comp-c-include ./usr/include/i386/param.h comp-c-include diff --git a/distrib/sets/lists/comp/md.prep b/distrib/sets/lists/comp/md.prep index 3ea1cdd9b341..c810d93d7d2e 100644 --- a/distrib/sets/lists/comp/md.prep +++ b/distrib/sets/lists/comp/md.prep @@ -1,4 +1,4 @@ -# $NetBSD: md.prep,v 1.13 2003/01/18 17:50:29 thorpej Exp $ +# $NetBSD: md.prep,v 1.14 2003/05/15 18:51:19 wiz Exp $ ./usr/include/prep comp-c-include ./usr/include/prep/_G_config.h comp-c-include ./usr/include/prep/ansi.h comp-c-include @@ -34,7 +34,6 @@ ./usr/include/prep/limits.h comp-c-include ./usr/include/prep/math.h comp-c-include ./usr/include/prep/mcontext.h comp-c-include -./usr/include/prep/mouse.h comp-c-include ./usr/include/prep/param.h comp-c-include ./usr/include/prep/pcb.h comp-c-include ./usr/include/prep/pio.h comp-c-include diff --git a/distrib/sets/lists/comp/obsolete.i386 b/distrib/sets/lists/comp/obsolete.i386 index 8d084f4167c2..5c882ffb5242 100644 --- a/distrib/sets/lists/comp/obsolete.i386 +++ b/distrib/sets/lists/comp/obsolete.i386 @@ -1,2 +1,3 @@ -# $NetBSD: obsolete.i386,v 1.5 2002/11/17 02:48:04 lukem Exp $ +# $NetBSD: obsolete.i386,v 1.6 2003/05/15 18:51:19 wiz Exp $ ./usr/include/i386/conf.h +./usr/include/i386/mouse.h diff --git a/distrib/sets/lists/comp/obsolete.prep b/distrib/sets/lists/comp/obsolete.prep index 44cab0462843..0460c14c223c 100644 --- a/distrib/sets/lists/comp/obsolete.prep +++ b/distrib/sets/lists/comp/obsolete.prep @@ -1,2 +1,3 @@ -# $NetBSD: obsolete.prep,v 1.2 2002/11/17 02:48:07 lukem Exp $ +# $NetBSD: obsolete.prep,v 1.3 2003/05/15 18:51:19 wiz Exp $ ./usr/include/prep/conf.h +./usr/include/prep/mouse.h diff --git a/sys/arch/i386/include/Makefile b/sys/arch/i386/include/Makefile index f00689c3a942..f478d8439071 100644 --- a/sys/arch/i386/include/Makefile +++ b/sys/arch/i386/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/01/17 23:10:28 thorpej Exp $ +# $NetBSD: Makefile,v 1.25 2003/05/15 18:51:18 wiz Exp $ INCSDIR= /usr/include/i386 @@ -15,7 +15,7 @@ INCS= ansi.h aout_machdep.h apmvar.h asm.h atomic.h \ joystick.h \ kcore.h \ limits.h lock.h \ - math.h mcontext.h mouse.h mtrr.h \ + math.h mcontext.h mtrr.h \ npx.h \ param.h pcb.h pccons.h pio.h pmap.h pmc.h proc.h profile.h psl.h \ pte.h ptrace.h \ diff --git a/sys/arch/i386/include/mouse.h b/sys/arch/i386/include/mouse.h deleted file mode 100644 index 2d4a16c27d73..000000000000 --- a/sys/arch/i386/include/mouse.h +++ /dev/null @@ -1,49 +0,0 @@ -/* $NetBSD: mouse.h,v 1.4 1994/10/27 04:16:10 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 Erik Forsberg. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _I386_MOUSE_H_ -#define _I386_MOUSE_H_ - -struct mouseinfo { - unsigned char status; - char xmotion, ymotion; -}; - -#define BUTSTATMASK 0x07 /* Any mouse button down if any bit set */ -#define BUTCHNGMASK 0x38 /* Any mouse button changed if any bit set */ - -#define BUT3STAT 0x01 /* Button 3 down if set */ -#define BUT2STAT 0x02 /* Button 2 down if set */ -#define BUT1STAT 0x04 /* Button 1 down if set */ -#define BUT3CHNG 0x08 /* Button 3 changed if set */ -#define BUT2CHNG 0x10 /* Button 2 changed if set */ -#define BUT1CHNG 0x20 /* Button 1 changed if set */ -#define MOVEMENT 0x40 /* Mouse movement detected */ - -/* Ioctl definitions */ - -#define MOUSEIOC ('M'<<8) -#define MOUSEIOCREAD (MOUSEIOC|60) - -#endif /* !_I386_MOUSE_H_ */ diff --git a/sys/arch/prep/include/Makefile b/sys/arch/prep/include/Makefile index faaf269d0be4..161bdda58615 100644 --- a/sys/arch/prep/include/Makefile +++ b/sys/arch/prep/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/01/18 06:25:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.15 2003/05/15 18:51:18 wiz Exp $ INCSDIR= /usr/include/prep @@ -13,7 +13,7 @@ INCS= ansi.h aout_machdep.h asm.h \ intr.h ipkdb.h \ kcore.h kgdb.h \ limits.h lock.h \ - math.h mcontext.h mouse.h \ + math.h mcontext.h \ param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \ psl.h pte.h ptrace.h \ reg.h reloc.h \ diff --git a/sys/arch/prep/include/mouse.h b/sys/arch/prep/include/mouse.h deleted file mode 100644 index f91b3a80fe87..000000000000 --- a/sys/arch/prep/include/mouse.h +++ /dev/null @@ -1,49 +0,0 @@ -/* $NetBSD: mouse.h,v 1.1 2000/02/29 15:21:30 nonaka Exp $ */ - -/*- - * Copyright (c) 1992, 1993 Erik Forsberg. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _PREP_MOUSE_H_ -#define _PREP_MOUSE_H_ - -struct mouseinfo { - unsigned char status; - char xmotion, ymotion; -}; - -#define BUTSTATMASK 0x07 /* Any mouse button down if any bit set */ -#define BUTCHNGMASK 0x38 /* Any mouse button changed if any bit set */ - -#define BUT3STAT 0x01 /* Button 3 down if set */ -#define BUT2STAT 0x02 /* Button 2 down if set */ -#define BUT1STAT 0x04 /* Button 1 down if set */ -#define BUT3CHNG 0x08 /* Button 3 changed if set */ -#define BUT2CHNG 0x10 /* Button 2 changed if set */ -#define BUT1CHNG 0x20 /* Button 1 changed if set */ -#define MOVEMENT 0x40 /* Mouse movement detected */ - -/* Ioctl definitions */ - -#define MOUSEIOC ('M'<<8) -#define MOUSEIOCREAD (MOUSEIOC|60) - -#endif /* !_PREP_MOUSE_H_ */