diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2013-04-20 08:01:38 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2013-04-20 08:01:38 +0000 |
| commit | 0f31d6358b1e2e8dcb0d57fdf3001253c9ac33df (patch) | |
| tree | bc7493c8961aa1f972fef306c6ddf3f03bada68d /sys/arch/hppa | |
| parent | 6e30bd61c377223ee85c64c276862b404041066f (diff) | |
Enable active PS/2 multiplexing if available.
Supported for i386 and amd64 except SMALL_KERNEL.
Based on Miod's former work on this subject.
ok mpi
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/gsc/gsckbc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/hppa/gsc/gsckbc.c b/sys/arch/hppa/gsc/gsckbc.c index 3a450c53118..c7624a5ddb3 100644 --- a/sys/arch/hppa/gsc/gsckbc.c +++ b/sys/arch/hppa/gsc/gsckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gsckbc.c,v 1.14 2012/08/10 17:49:31 shadchin Exp $ */ +/* $OpenBSD: gsckbc.c,v 1.15 2013/04/20 08:01:37 tobias Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -469,7 +469,7 @@ pckbc_poll_data1(iot, ioh, ioh_c, slot, checkaux) bus_space_tag_t iot; bus_space_handle_t ioh, ioh_c; pckbc_slot_t slot; - int checkaux; /* ignored on hppa */ + struct pckbc_internal *t; /* ignored on hppa */ { int i; u_char stat; @@ -568,7 +568,7 @@ pckbc_flush(self, slot) { struct pckbc_internal *t = self; - pckbc_poll_data1(t->t_iot, t->t_ioh_d, t->t_ioh_d, slot, 0); + pckbc_poll_data1(t->t_iot, t->t_ioh_d, t->t_ioh_d, slot, t); } int @@ -580,7 +580,7 @@ pckbc_poll_data(self, slot) struct pckbc_slotdata *q = t->t_slotdata[slot]; int c; - c = pckbc_poll_data1(t->t_iot, t->t_ioh_d, t->t_ioh_d, slot, 0); + c = pckbc_poll_data1(t->t_iot, t->t_ioh_d, t->t_ioh_d, slot, t); if (c != -1 && q && CMD_IN_QUEUE(q)) { /* we jumped into a running command - try to deliver the response */ @@ -655,7 +655,7 @@ pckbc_poll_cmd1(t, slot, cmd) return; } for (i = 10; i; i--) { /* 1s ??? */ - c = pckbc_poll_data1(iot, ioh, ioh, slot, 0); + c = pckbc_poll_data1(iot, ioh, ioh, slot, t); if (c != -1) break; } @@ -696,7 +696,7 @@ pckbc_poll_cmd1(t, slot, cmd) else i = 10; /* 1s ??? */ while (i--) { - c = pckbc_poll_data1(iot, ioh, ioh, slot, 0); + c = pckbc_poll_data1(iot, ioh, ioh, slot, t); if (c != -1) break; } |