diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-10-18 17:39:55 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-10-18 17:39:55 +0000 |
| commit | 0d6fb507789c8998e96e421e68547e4d7181b666 (patch) | |
| tree | 7d5cf162a6e945f38bd6be6039e3e7b5d8a6f9f5 /sys | |
| parent | 0d26fb4dac8e1a3822d8362ad651e95c12e1dace (diff) | |
Define a new attribute, pckbcslot, which pckbc and gsckbc provide, and to
which pckbd and pms attach. This makes it simpler to add new controllers
pckbd/pms can attach to.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/conf/files.hppa | 6 | ||||
| -rw-r--r-- | sys/conf/files | 8 | ||||
| -rw-r--r-- | sys/dev/pckbc/files.pckbc | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa index 6cdb930d46e..9241d3b5392 100644 --- a/sys/arch/hppa/conf/files.hppa +++ b/sys/arch/hppa/conf/files.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: files.hppa,v 1.73 2007/08/24 15:17:52 kettenis Exp $ +# $OpenBSD: files.hppa,v 1.74 2007/10/18 17:39:52 miod Exp $ # # hppa-specific configuration info @@ -270,13 +270,13 @@ file arch/hppa/gsc/harmony.c harmony #file dev/pci/myri.c myri # PS/2 input ports -#device gsckbc {[slot = -1]} +device gsckbc: pckbcslot attach gsckbc at gsc file arch/hppa/gsc/gsckbc.c gsckbc # PS/2 keyboard device gsckbd: wskbddev -attach gsckbd at gsckbc +attach gsckbd at pckbcslot file arch/hppa/gsc/gsckbd.c gsckbd needs-flag file arch/hppa/gsc/gsckbdmap.c gsckbd diff --git a/sys/conf/files b/sys/conf/files index d32df9465ee..8dab37929c4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.412 2007/10/15 01:22:20 deraadt Exp $ +# $OpenBSD: files,v 1.413 2007/10/18 17:39:54 miod Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -302,12 +302,10 @@ file dev/ic/com.c com & (com | com_cardbus | com_gsc | file dev/ic/com_subr.c com | pccom # PC-like keyboard controller -device pckbc {[slot = -1]} +define pckbcslot {[slot = -1]} +device pckbc: pckbcslot file dev/ic/pckbc.c pckbc needs-flag -# HPPA PS/2 input ports (forward definition) -device gsckbc {[slot = -1]} - # PCF8584 I2C Controllers device pcfiic: i2cbus file dev/ic/pcf8584.c pcfiic diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc index 55bc3b2da51..560b4e2357c 100644 --- a/sys/dev/pckbc/files.pckbc +++ b/sys/dev/pckbc/files.pckbc @@ -1,16 +1,16 @@ -# $OpenBSD: files.pckbc,v 1.7 2007/08/01 12:16:59 kettenis Exp $ +# $OpenBSD: files.pckbc,v 1.8 2007/10/18 17:39:54 miod Exp $ # $NetBSD: files.pckbc,v 1.6 1999/01/23 16:05:56 drochner Exp $ # devices attached at pckbc, for use with wscons device pckbd: wskbddev -attach pckbd at pckbc +attach pckbd at pckbcslot file dev/pckbc/pckbd.c pckbd needs-flag file dev/pckbc/wskbdmap_mfii.c pckbd device pms: wsmousedev -attach pms at pckbc, gsckbc +attach pms at pckbcslot file dev/pckbc/pms.c pms device pmsi: wsmousedev -attach pmsi at pckbc +attach pmsi at pckbcslot file dev/pckbc/pms_intelli.c pmsi |