Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish the rest of the pms->opms rename for non-wscons PS/2 mice.

Browse Source
This commit is contained in:
sommerfe 1999-01-23 22:18:41 +00:00
parent 075abac71c
commit 83940dae72
14 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm32/arm32/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.37 1998/12/08 15:52:31 augustss Exp $ */
/* $NetBSD: conf.c,v 1.38 1999/01/23 22:18:41 sommerfe Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -158,7 +158,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "ss.h"
#include "tun.h"
#include "qms.h"
#include "pms.h"
#include "opms.h"
#include "beep.h"
#include "kbd.h"
#include "audio.h"
@ -240,7 +240,7 @@ struct cdevsw cdevsw[] = {
cdev_vidcvid_init(NVIDCVIDEO,vidcvideo), /* 37: vidcvideo device */
cdev_cpu_init(NCPU,cpu), /* 38: cpu device */
cdev_lkm_dummy(), /* 39: reserved */
cdev_mouse_init(NPMS,pms), /* 40: PS2 mouse driver */
cdev_mouse_init(NOPMS,pms), /* 40: PS2 mouse driver */
cdev_lkm_dummy(), /* 41: reserved */
cdev_iic_init(NIIC, iic), /* 42: IIC bus driver */
cdev_rtc_init(NRTC, rtc), /* 43: RTC driver */

4
sys/arch/arm32/conf/A7000
View File

@ -1,4 +1,4 @@
# $NetBSD: A7000,v 1.32 1998/10/12 16:13:03 bouyer Exp $
# $NetBSD: A7000,v 1.33 1999/01/23 22:18:42 sommerfe Exp $
#
# A7000 - Full A7000 configuration
#
@ -139,7 +139,7 @@ kbd* at iomd?
#qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

4
sys/arch/arm32/conf/A7INST
View File

@ -1,4 +1,4 @@
# $NetBSD: A7INST,v 1.21 1998/10/12 16:13:03 bouyer Exp $
# $NetBSD: A7INST,v 1.22 1999/01/23 22:18:42 sommerfe Exp $
#
# A7INST - A7000 install configuration
#
@ -139,7 +139,7 @@ kbd* at iomd?
#qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

4
sys/arch/arm32/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.52 1998/11/25 20:30:45 hwr Exp $
# $NetBSD: GENERIC,v 1.53 1999/01/23 22:18:42 sommerfe Exp $
#
# GENERIC -- everything that's currently supported
#
@ -141,7 +141,7 @@ kbd* at iomd?
qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

4
sys/arch/arm32/conf/Makefile.arm32
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.arm32,v 1.43 1999/01/15 23:37:05 thorpej Exp $
# $NetBSD: Makefile.arm32,v 1.44 1999/01/23 22:18:42 sommerfe Exp $
# Makefile for NetBSD
#
@ -143,7 +143,7 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
__CLEANKERNEL: .USE
@echo "${.TARGET}ing the kernel objects"
rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
[Ee]rrs linterrs makelinks assym.h.tmp assym.h
[Ee]rrs linterrs makelinks assym.h.tmp assym.h modedefs.c
__CLEANDEPEND: .USE
rm -f .depend

4
sys/arch/arm32/conf/RC7500
View File

@ -1,4 +1,4 @@
# $NetBSD: RC7500,v 1.26 1998/10/12 16:13:03 bouyer Exp $
# $NetBSD: RC7500,v 1.27 1999/01/23 22:18:42 sommerfe Exp $
#
# RC7500 - Config for the VLSI RC7500 board
#
@ -163,7 +163,7 @@ vt5 at vidc?
kbd* at iomd?
# pms mouse
pms* at iomd?
opms* at iomd?
# quadrature mouse
#qms* at iomd?

4
sys/arch/arm32/conf/RISCPC
View File

@ -1,4 +1,4 @@
# $NetBSD: RISCPC,v 1.22 1998/10/12 16:13:04 bouyer Exp $
# $NetBSD: RISCPC,v 1.23 1999/01/23 22:18:42 sommerfe Exp $
#
# RISCPC -- Full RiscPC config
#
@ -139,7 +139,7 @@ kbd* at iomd?
qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

4
sys/arch/arm32/conf/RPCINST
View File

@ -1,4 +1,4 @@
# $NetBSD: RPCINST,v 1.20 1998/10/12 16:13:04 bouyer Exp $
# $NetBSD: RPCINST,v 1.21 1999/01/23 22:18:42 sommerfe Exp $
#
# RPCINST -- RiscPC install configuration
#
@ -139,7 +139,7 @@ kbd* at iomd?
qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

4
sys/arch/arm32/conf/SHARK
View File

@ -1,4 +1,4 @@
# $NetBSD: SHARK,v 1.18 1998/10/14 11:13:14 augustss Exp $
# $NetBSD: SHARK,v 1.19 1999/01/23 22:18:43 sommerfe Exp $
#
# SHARK
#
@ -157,7 +157,7 @@ ofisapc* at ofbus?
pc* at ofisapc?
# PS/2 Mouse
pms0 at spckbd? irq 12
opms0 at spckbd? irq 12
# CS8900 Ethernet@OFW
cs* at ofisa?

4
sys/arch/arm32/conf/VOYAGER
View File

@ -1,4 +1,4 @@
# $NetBSD: VOYAGER,v 1.43 1998/10/12 16:13:04 bouyer Exp $
# $NetBSD: VOYAGER,v 1.44 1999/01/23 22:18:43 sommerfe Exp $
#
# VOYAGER - Mark's development kernel
#
@ -139,7 +139,7 @@ kbd* at iomd?
qms* at iomd?
# PS2 mouse via IOMD
pms* at iomd?
opms* at iomd?
# IIC bus device
iic* at iomd?

16
sys/arch/arm32/conf/files.arm32
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm32,v 1.74 1998/10/12 16:13:04 bouyer Exp $
# $NetBSD: files.arm32,v 1.75 1999/01/23 22:18:43 sommerfe Exp $
#
# First try for arm-specific configuration info
#
@ -152,14 +152,14 @@ file arch/arm32/iomd/qms_iomd.c qms_iomd
define spckbd { [irq = -1], [port = -1] }
# PS/2 mouse device
device pms: tty
file arch/arm32/dev/pms.c pms & pms_iomd needs-flag
file arch/arm32/shark/pms.c pms & ofw needs-flag
major {pms = 40}
device opms: tty
file arch/arm32/dev/pms.c opms & opms_iomd needs-flag
file arch/arm32/shark/pms.c opms & ofw needs-flag
major {opms = 40}
attach pms at spckbd with pms
attach pms at iomd with pms_iomd
file arch/arm32/iomd/pms_iomd.c pms_iomd
attach opms at spckbd with opms
attach opms at iomd with opms_iomd
file arch/arm32/iomd/pms_iomd.c opms_iomd
# Standard keyboard driver
device kbd

16
sys/arch/arm32/dev/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.17 1998/08/15 03:02:33 mycroft Exp $ */
/* $NetBSD: pms.c,v 1.18 1999/01/23 22:18:43 sommerfe Exp $ */
/*-
* Copyright (c) 1996 D.C. Tsen
@ -83,7 +83,7 @@ static void pmsputbuffer __P((struct pms_softc *sc, struct mousebufrec *buf));
#endif
static __inline void pms_flush __P((struct pms_softc *sc));
extern struct cfdriver pms_cd;
extern struct cfdriver opms_cd;
/* pms device driver structure */
@ -267,9 +267,9 @@ pmsopen(dev, flag, mode, p)
struct pms_softc *sc;
/* validate the unit and the softc */
if (unit >= pms_cd.cd_ndevs)
if (unit >= opms_cd.cd_ndevs)
return ENXIO;
sc = pms_cd.cd_devs[unit];
sc = opms_cd.cd_devs[unit];
if (!sc)
return ENXIO;
@ -310,7 +310,7 @@ pmsclose(dev, flag, mode, p)
int mode;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
/* remove the timeout */
untimeout(pmswatchdog, (void *) sc);
@ -334,7 +334,7 @@ pmsread(dev, uio, flag)
struct uio *uio;
int flag;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
int s;
int error = 0;
size_t length;
@ -383,7 +383,7 @@ pmsioctl(dev, cmd, addr, flag, p)
int flag;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct mouseinfo info;
int s;
int error = 0;
@ -631,7 +631,7 @@ pmspoll(dev, events, p)
int events;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
int revents = 0;
int s = spltty();

4
sys/arch/arm32/iomd/pms_iomd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms_iomd.c,v 1.2 1998/08/15 03:02:33 mycroft Exp $ */
/* $NetBSD: pms_iomd.c,v 1.3 1999/01/23 22:18:43 sommerfe Exp $ */
/*-
* Copyright (c) 1996 D.C. Tsen
@ -58,7 +58,7 @@ static int pms_iomd_probe __P((struct device *, struct cfdata *, void *));
static void pms_iomd_attach __P((struct device *, struct device *, void *));
static void pms_iomd_intenable __P((struct pms_softc *sc, int enable));
struct cfattach pms_iomd_ca = {
struct cfattach opms_iomd_ca = {
sizeof(struct pms_softc), pms_iomd_probe, pms_iomd_attach
};

18
sys/arch/arm32/shark/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.3 1998/08/15 03:02:34 mycroft Exp $ */
/* $NetBSD: pms.c,v 1.4 1999/01/23 22:18:43 sommerfe Exp $ */
/*
* Copyright 1997
@ -192,12 +192,12 @@ int pmsintr __P((void *));
*/
/* Autoconfiguration data structures */
struct cfattach pms_ca =
struct cfattach opms_ca =
{
sizeof(struct pms_softc), pmsprobe, pmsattach,
};
extern struct cfdriver pms_cd;
extern struct cfdriver opms_cd;
/* variable to control which debugs printed if kernel compiled with
** option KERNEL_DEBUG.
@ -422,11 +422,11 @@ pmsopen(dev, flag, mode, p)
/* Sanity check the minor device number we have been instructed
** to open and set up our softc structure pointer.
*/
if (unit >= pms_cd.cd_ndevs)
if (unit >= opms_cd.cd_ndevs)
{
return ENXIO;
}
sc = pms_cd.cd_devs[unit];
sc = opms_cd.cd_devs[unit];
if (!sc)
{
return ENXIO;
@ -502,7 +502,7 @@ pmsclose(dev, flag, mode, p)
int mode;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
/* Disable the mouse device and interrupts on it. Note that if we don't
** flush the device first it seems to generate LOTs of interrupts after
@ -563,7 +563,7 @@ pmsread(dev, uio, flag)
struct uio *uio;
int flag;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
int s;
int error = 0;
size_t length;
@ -665,7 +665,7 @@ pmsioctl(dev, cmd, addr, flag, p)
int flag;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
struct mouseinfo info;
int oldIpl;
int error;
@ -954,7 +954,7 @@ pmspoll(dev, events, p)
int events;
struct proc *p;
{
struct pms_softc *sc = pms_cd.cd_devs[PMSUNIT(dev)];
struct pms_softc *sc = opms_cd.cd_devs[PMSUNIT(dev)];
int revents = 0;
int oldIpl;