Rename MOUSE_GETINFO to MOUSE_GETHWINFO. The name collided with the one

in console.h.
Pointed out by bde.

6 files changed, 12 insertions, 12 deletions

diff --git a/share/man/man4/man4.i386/psm.4 b/share/man/man4/man4.i386/psm.4
index 9588f22..16da252 100644
--- a/share/man/man4/man4.i386/psm.4
+++ b/share/man/man4/man4.i386/psm.4
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: psm.4,v 1.7 1997/02/22 13:25:39 peter Exp $
 .\"
 .Dd January 13, 1997
 .Dt PSM 4 i386
@@ -198,7 +198,7 @@ driver uses the same internal queue. Therefore, interleaving the
 command and 
 .Fn read
 operation is not recommended.
-.It Dv MOUSE_GETINFO
+.It Dv MOUSE_GETHWINFO
 Returns the hardware information in the following structure.
 .Bd -literal
 typedef struct mousehw {
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 9588f22..16da252 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: psm.4,v 1.7 1997/02/22 13:25:39 peter Exp $
 .\"
 .Dd January 13, 1997
 .Dt PSM 4 i386
@@ -198,7 +198,7 @@ driver uses the same internal queue. Therefore, interleaving the
 command and 
 .Fn read
 operation is not recommended.
-.It Dv MOUSE_GETINFO
+.It Dv MOUSE_GETHWINFO
 Returns the hardware information in the following structure.
 .Bd -literal
 typedef struct mousehw {
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index a9396f1..86f4528 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -19,7 +19,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$
+ *	$Id: mouse.h,v 1.7 1997/02/22 09:34:50 peter Exp $
  */
 
 #ifndef _MACHINE_MOUSE_H_
@@ -55,7 +55,7 @@ typedef struct mouseinfo {
 #define MOVEMENT	0x40	/* Mouse movement detected */
 
 #define MOUSE_GETSTATE		_IOR('M',0,mousestatus_t)
-#define MOUSE_GETINFO		_IOR('M',1,mousehw_t)
+#define MOUSE_GETHWINFO		_IOR('M',1,mousehw_t)
 #define MOUSE_GETMODE		_IOR('M',2,mousemode_t)
 #define MOUSE_SETMODE		_IOW('M',3,mousemode_t)
 
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index a9396f1..86f4528 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.h
@@ -19,7 +19,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$
+ *	$Id: mouse.h,v 1.7 1997/02/22 09:34:50 peter Exp $
  */
 
 #ifndef _MACHINE_MOUSE_H_
@@ -55,7 +55,7 @@ typedef struct mouseinfo {
 #define MOVEMENT	0x40	/* Mouse movement detected */
 
 #define MOUSE_GETSTATE		_IOR('M',0,mousestatus_t)
-#define MOUSE_GETINFO		_IOR('M',1,mousehw_t)
+#define MOUSE_GETHWINFO		_IOR('M',1,mousehw_t)
 #define MOUSE_GETMODE		_IOR('M',2,mousemode_t)
 #define MOUSE_SETMODE		_IOW('M',3,mousemode_t)
 
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index 432c1be..ef11885 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -19,7 +19,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: psm.c,v 1.41 1997/07/20 14:10:08 bde Exp $
+ * $Id: psm.c,v 1.42 1997/09/14 03:19:13 peter Exp $
  */
 
 /*
@@ -1306,7 +1306,7 @@ psmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
     /* Perform IOCTL command */
     switch (cmd) {
 
-    case MOUSE_GETINFO:
+    case MOUSE_GETHWINFO:
         *(mousehw_t *) addr = sc->hw;
         break;
 
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index a9396f1..86f4528 100644
--- a/sys/sys/mouse.h
+++ b/sys/sys/mouse.h
@@ -19,7 +19,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$
+ *	$Id: mouse.h,v 1.7 1997/02/22 09:34:50 peter Exp $
  */
 
 #ifndef _MACHINE_MOUSE_H_
@@ -55,7 +55,7 @@ typedef struct mouseinfo {
 #define MOVEMENT	0x40	/* Mouse movement detected */
 
 #define MOUSE_GETSTATE		_IOR('M',0,mousestatus_t)
-#define MOUSE_GETINFO		_IOR('M',1,mousehw_t)
+#define MOUSE_GETHWINFO		_IOR('M',1,mousehw_t)
 #define MOUSE_GETMODE		_IOR('M',2,mousemode_t)
 #define MOUSE_SETMODE		_IOW('M',3,mousemode_t)