summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2002-04-22 10:44:46 +0000
committerwiz <wiz@NetBSD.org>2002-04-22 10:44:46 +0000
commit6a32f7f6a34f96b68e25974b1d674cf372e33bb1 (patch)
tree97c2ab75760f6dd52edc67584e63fa1846aced7f /sys/dev
parenta37bf11046c4476397b518a7ac19799f755fff95 (diff)
Move psm.c and psmreg.h to pms.c and pmsreg.h, since they contain the
pms (not psm) driver. Fix a debugging message to print the correct function name. Approved by Christos.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pckbc/files.pckbc4
-rw-r--r--sys/dev/pckbc/pms.c (renamed from sys/dev/pckbc/psm.c)8
-rw-r--r--sys/dev/pckbc/pmsreg.h (renamed from sys/dev/pckbc/psmreg.h)2
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc
index 80efc8c7daf..ec5b455b820 100644
--- a/sys/dev/pckbc/files.pckbc
+++ b/sys/dev/pckbc/files.pckbc
@@ -1,4 +1,4 @@
-# $NetBSD: files.pckbc,v 1.9 2002/04/14 01:45:29 mycroft Exp $
+# $NetBSD: files.pckbc,v 1.10 2002/04/22 10:44:46 wiz Exp $
# devices attached at pckbc, for use with wscons
device pckbd: wskbddev
@@ -9,4 +9,4 @@ defparam PCKBD_LAYOUT
device pms: wsmousedev
attach pms at pckbc
-file dev/pckbc/psm.c pms
+file dev/pckbc/pms.c pms
diff --git a/sys/dev/pckbc/psm.c b/sys/dev/pckbc/pms.c
index 8b2675c12ef..b5bdfd6761e 100644
--- a/sys/dev/pckbc/psm.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: psm.c,v 1.20 2002/03/28 21:54:27 christos Exp $ */
+/* $NetBSD: pms.c,v 1.1 2002/04/22 10:44:47 wiz Exp $ */
/*-
* Copyright (c) 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.20 2002/03/28 21:54:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.1 2002/04/22 10:44:47 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.20 2002/03/28 21:54:27 christos Exp $");
#include <dev/ic/pckbcvar.h>
-#include <dev/pckbc/psmreg.h>
+#include <dev/pckbc/pmsreg.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
@@ -469,7 +469,7 @@ pmsinput(vsc, data)
* too frequently -christos
*/
if (diff.tv_sec > 0 || diff.tv_usec > 25000) {
- DPRINTF(("psm_input: unusual delay, "
+ DPRINTF(("pms_input: unusual delay, "
"spawning reset thread\n"));
sc->inputstate = 0;
sc->sc_enabled = 0;
diff --git a/sys/dev/pckbc/psmreg.h b/sys/dev/pckbc/pmsreg.h
index c6da5dbf969..cc991cf2ae4 100644
--- a/sys/dev/pckbc/psmreg.h
+++ b/sys/dev/pckbc/pmsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: psmreg.h,v 1.1 1998/03/22 15:41:28 drochner Exp $ */
+/* $NetBSD: pmsreg.h,v 1.1 2002/04/22 10:44:47 wiz Exp $ */
/* mouse commands */
#define PMS_SET_SCALE11 0xe6 /* set scaling 1:1 */