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

options PMS_DISABLE_POWERHOOK has been obsolete for a while now, 

remove what little still remains of it.
This commit is contained in:
jakllsch 2011-09-07 19:05:13 +00:00
parent 958c749ae4
commit 3d6f16cbff
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pckbport/files.pckbport
View File

@ -1,4 +1,4 @@
# $NetBSD: files.pckbport,v 1.7 2008/12/14 00:42:33 jmcneill Exp $
# $NetBSD: files.pckbport,v 1.8 2011/09/07 19:05:13 jakllsch Exp $
# devices attached at pckbport, for use with wscons
defflag opt_wskbdmap.h WSKBD_USONLY
@ -13,7 +13,7 @@ file dev/pckbport/wskbdmap_mfii.c pckbd
defparam PCKBD_LAYOUT
defflag PCKBD_CNATTACH_MAY_FAIL
defflag opt_pms.h PMS_DISABLE_POWERHOOK
obsolete defflag opt_pms.h PMS_DISABLE_POWERHOOK
defflag opt_pms.h PMS_SYNAPTICS_TOUCHPAD
defflag opt_pms.h PMS_ELANTECH_TOUCHPAD
device pms: wsmousedev

7
sys/dev/pckbport/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.31 2011/05/24 16:42:53 joerg Exp $ */
/* $NetBSD: pms.c,v 1.32 2011/09/07 19:05:13 jakllsch Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.31 2011/05/24 16:42:53 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.32 2011/09/07 19:05:13 jakllsch Exp $");
#include "opt_pms.h"
@ -232,9 +232,6 @@ pmsattach(device_t parent, device_t self, void *aux)
kthread_create(PRI_NONE, 0, NULL, pms_reset_thread, sc,
&sc->sc_event_thread, "%s", device_xname(sc->sc_dev));
#ifndef PMS_DISABLE_POWERHOOK
sc->sc_suspended = 0;
#endif
if (!pmf_device_register(self, pms_suspend, pms_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
}

6
sys/dev/pckbport/pmsvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmsvar.h,v 1.8 2008/12/14 00:42:33 jmcneill Exp $ */
/* $NetBSD: pmsvar.h,v 1.9 2011/09/07 19:05:13 jakllsch Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@ -53,10 +53,6 @@ struct pms_softc { /* driver status information */
int sc_kbcslot;
int sc_enabled; /* input enabled? */
#ifndef PMS_DISABLE_POWERHOOK
void *sc_powerhook; /* cookie from power hook */
int sc_suspended; /* suspended? */
#endif /* !PMS_DISABLE_POWERHOOK */
int inputstate; /* number of bytes received for this packet */
u_int buttons; /* mouse button status */
enum pms_type protocol;