diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-12-29 12:31:30 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-12-29 12:31:30 +0000 |
| commit | 2ca2908e55b127ccb757644ccaad6d6203f003ad (patch) | |
| tree | c7e47f7b517bc501938d4c7f78d61f1f97479110 | |
| parent | 4b0b2232ddc2400195b4e6d50d2617f49b2a34b8 (diff) | |
go via pckbc_enqeue_cmd() in pckbd_enable() if on; fixes PR 4615
ok miod@, mickey@
| -rw-r--r-- | sys/dev/ic/pckbc.c | 5 | ||||
| -rw-r--r-- | sys/dev/pckbc/pckbd.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index ae82e0c34d5..76bda02eb2c 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc.c,v 1.10 2005/08/06 19:49:19 jcs Exp $ */ +/* $OpenBSD: pckbc.c,v 1.11 2005/12/29 12:31:29 martin Exp $ */ /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */ /* @@ -633,7 +633,6 @@ pckbc_poll_cmd(self, slot, cmd, len, responselen, respbuf, slow) u_char *respbuf; int slow; { - struct pckbc_internal *t = self; struct pckbc_devcmd nc; if ((len > 4) || (responselen > 4)) @@ -645,7 +644,7 @@ pckbc_poll_cmd(self, slot, cmd, len, responselen, respbuf, slow) nc.responselen = responselen; nc.flags = (slow ? KBC_CMDFLAG_SLOW : 0); - pckbc_poll_cmd1(t, slot, &nc); + pckbc_poll_cmd1(self, slot, &nc); if (nc.status == 0 && respbuf) bcopy(nc.response, respbuf, responselen); diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c index 44b0e22f6d5..d411c73646c 100644 --- a/sys/dev/pckbc/pckbd.c +++ b/sys/dev/pckbc/pckbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbd.c,v 1.7 2005/02/22 16:17:31 mickey Exp $ */ +/* $OpenBSD: pckbd.c,v 1.8 2005/12/29 12:31:29 martin Exp $ */ /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -383,8 +383,8 @@ pckbd_enable(v, on) pckbc_slot_enable(sc->id->t_kbctag, sc->id->t_kbcslot, 1); cmd[0] = KBC_ENABLE; - res = pckbc_enqueue_cmd(sc->id->t_kbctag, sc->id->t_kbcslot, - cmd, 1, 0, 1, 0); + res = pckbc_poll_cmd(sc->id->t_kbctag, sc->id->t_kbcslot, + cmd, 1, 0, NULL, 0); if (res) { printf("pckbd_enable: command error\n"); return (res); |