summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pckbc/pckbd.c12
-rw-r--r--sys/dev/pckbc/pms.c4
-rw-r--r--sys/dev/pckbc/pms_intelli.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 215491e4dd0..bdbd516d755 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.10 2007/10/17 01:16:04 fgsch Exp $ */
+/* $OpenBSD: pckbd.c,v 1.11 2007/10/17 01:32:46 deraadt Exp $ */
/* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -211,14 +211,14 @@ pckbd_set_xtscancode(kbctag, kbcslot)
#endif
cmd[0] = KBC_SETTABLE;
cmd[1] = table;
- if (pckbc_poll_cmd(kbctag, kbcslot, cmd, 2, 0, 0, 0)) {
+ if (pckbc_poll_cmd(kbctag, kbcslot, cmd, 2, 0, NULL, 0)) {
#ifdef DEBUG
printf("pckbd: table set of %d failed\n", table);
#endif
if (table > 1) {
cmd[0] = KBC_RESET;
(void)pckbc_poll_cmd(kbctag, kbcslot, cmd,
- 1, 1, 0, 1);
+ 1, 1, NULL, 1);
pckbc_flush(kbctag, kbcslot);
continue;
@@ -358,7 +358,7 @@ pckbdattach(parent, self, aux)
*/
cmd[0] = KBC_ENABLE;
(void) pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,
- cmd, 1, 0, 0, 0);
+ cmd, 1, 0, NULL, 0);
sc->sc_enabled = 1;
} else {
sc->id = malloc(sizeof(struct pckbd_internal),
@@ -368,7 +368,7 @@ pckbdattach(parent, self, aux)
/* no interrupts until enabled */
cmd[0] = KBC_DISABLE;
(void) pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot,
- cmd, 1, 0, 0, 0);
+ cmd, 1, 0, NULL, 0);
sc->sc_enabled = 0;
}
@@ -663,7 +663,7 @@ pckbd_cnattach(kbctag, kbcslot)
/* Just to be sure. */
cmd[0] = KBC_ENABLE;
- res = pckbc_poll_cmd(kbctag, kbcslot, cmd, 1, 0, 0, 0);
+ res = pckbc_poll_cmd(kbctag, kbcslot, cmd, 1, 0, NULL, 0);
#if 0
if (res)
return (res);
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 30b6c7ebd95..90fa7606586 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.1 2007/08/01 12:16:59 kettenis Exp $ */
+/* $OpenBSD: pms.c,v 1.2 2007/10/17 01:32:46 deraadt Exp $ */
/* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -159,7 +159,7 @@ pmsattach(parent, self, aux)
/* no interrupts until enabled */
cmd[0] = PMS_DEV_DISABLE;
- res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 0, 0, 0);
+ res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 0, NULL, 0);
if (res)
printf("pmsattach: disable error\n");
pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 0);
diff --git a/sys/dev/pckbc/pms_intelli.c b/sys/dev/pckbc/pms_intelli.c
index da9accf0a06..c6409c40646 100644
--- a/sys/dev/pckbc/pms_intelli.c
+++ b/sys/dev/pckbc/pms_intelli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms_intelli.c,v 1.1 2007/08/01 12:16:59 kettenis Exp $ */
+/* $OpenBSD: pms_intelli.c,v 1.2 2007/10/17 01:32:46 deraadt Exp $ */
/* $NetBSD: psm_intelli.c,v 1.8 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -84,7 +84,7 @@ pmsi_setintellimode(tag, slot)
cmd[0] = PMS_SET_SAMPLE;
for (i = 0; i < 3; i++) {
cmd[1] = rates[i];
- res = pckbc_poll_cmd(tag, slot, cmd, 2, 0, 0, 0);
+ res = pckbc_poll_cmd(tag, slot, cmd, 2, 0, NULL, 0);
if (res)
return (res);
}
@@ -203,7 +203,7 @@ pmsiattach(parent, self, aux)
/* no interrupts until enabled */
cmd[0] = PMS_DEV_DISABLE;
- res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 0, 0, 0);
+ res = pckbc_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 0, NULL, 0);
if (res)
printf("pmsiattach: disable error\n");
pckbc_slot_enable(sc->sc_kbctag, sc->sc_kbcslot, 0);