diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-07-31 16:04:51 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-07-31 16:04:51 +0000 |
| commit | 719914f7d11cca5a6e29b46198ed50c4f1e1fa27 (patch) | |
| tree | b2a3c1737c957e2304815cde026ae0dce5ac6ff6 /sys/dev/isa | |
| parent | 6aa735007a06d259dcbcbfa42a14b0285e4a6474 (diff) | |
Factorization of the bluetooth and usb hid input driver logic, to reduce code
duplication and divergence.
Thanks to mlarkin@ for bluetooth devices tests.
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/pcppi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c index 57349b16018..74582d37c4f 100644 --- a/sys/dev/isa/pcppi.c +++ b/sys/dev/isa/pcppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcppi.c,v 1.8 2009/10/13 20:55:41 miod Exp $ */ +/* $OpenBSD: pcppi.c,v 1.9 2010/07/31 16:04:50 miod Exp $ */ /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */ /* @@ -45,11 +45,11 @@ #include <dev/ic/i8253reg.h> #include "pckbd.h" -#include "ukbd.h" -#if NPCKBD > 0 || NUKBD > 0 +#include "hidkbd.h" +#if NPCKBD > 0 || NHIDKBD > 0 #include <dev/ic/pckbcvar.h> #include <dev/pckbc/pckbdvar.h> -#include <dev/usb/ukbdvar.h> +#include <dev/usb/hidkbdvar.h> void pcppi_kbd_bell(void *, u_int, u_int, u_int, int); #endif @@ -174,8 +174,8 @@ pcppi_attach(parent, self, aux) #if NPCKBD > 0 pckbd_hookup_bell(pcppi_kbd_bell, sc); #endif -#if NUKBD > 0 - ukbd_hookup_bell(pcppi_kbd_bell, sc); +#if NHIDKBD > 0 + hidkbd_hookup_bell(pcppi_kbd_bell, sc); #endif pa.pa_cookie = sc; @@ -259,7 +259,7 @@ pcppi_bell_stop(arg) splx(s); } -#if NPCKBD > 0 || NUKBD > 0 +#if NPCKBD > 0 || NHIDKBD > 0 void pcppi_kbd_bell(arg, pitch, period, volume, poll) void *arg; @@ -272,4 +272,4 @@ pcppi_kbd_bell(arg, pitch, period, volume, poll) pcppi_bell(arg, volume ? pitch : 0, (period * hz) / 1000, poll ? PCPPI_BELL_POLL : 0); } -#endif /* NPCKBD > 0 || NUKBD > 0 */ +#endif /* NPCKBD > 0 || NHIDKBD > 0 */ |