diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-11-18 19:03:28 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-11-18 19:03:28 +0000 |
| commit | 539fb2c086bcc8d287cf8f8e6f223e660d5d7a25 (patch) | |
| tree | fc001406d13a56881785d4a41a64c441543167d7 /sys/arch/sgi/pci | |
| parent | 49f6574b58bcf203ba3d6accf6e0f8286f620cc6 (diff) | |
Add glue to attach iockbc(4) to iof(4) as well. Tested by deraadt@
Diffstat (limited to 'sys/arch/sgi/pci')
| -rw-r--r-- | sys/arch/sgi/pci/iocreg.h | 32 | ||||
| -rw-r--r-- | sys/arch/sgi/pci/iofreg.h | 10 |
2 files changed, 10 insertions, 32 deletions
diff --git a/sys/arch/sgi/pci/iocreg.h b/sys/arch/sgi/pci/iocreg.h index ac3a2b0c369..46baabfa738 100644 --- a/sys/arch/sgi/pci/iocreg.h +++ b/sys/arch/sgi/pci/iocreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iocreg.h,v 1.9 2009/11/11 15:54:25 miod Exp $ */ +/* $OpenBSD: iocreg.h,v 1.10 2009/11/18 19:03:27 miod Exp $ */ /* * Copyright (c) 2008 Joel Sing. @@ -108,36 +108,6 @@ /* bits in SSCR */ #define IOC3_SSCR_RESET 0x80000000 -/* bits in KBC_CTRL_STATUS */ -#define IOC3_KBC_STATUS_KBD_WRITE_PENDING 0x00000001 -#define IOC3_KBC_STATUS_AUX_WRITE_PENDING 0x00000002 -#define IOC3_KBC_STATUS_KBD_DATA 0x00000010 -#define IOC3_KBC_STATUS_KBD_CLOCK 0x00000020 -#define IOC3_KBC_CTRL_KBD_PULL_DATA_LOW 0x00000040 -#define IOC3_KBC_CTRL_KBD_PULL_CLOCK_LOW 0x00000080 -#define IOC3_KBC_STATUS_AUX_DATA 0x00000100 -#define IOC3_KBC_STATUS_AUX_CLOCK 0x00000200 -#define IOC3_KBC_CTRL_AUX_PULL_DATA_LOW 0x00000400 -#define IOC3_KBC_CTRL_AUX_PULL_CLOCK_LOW 0x00000800 -#define IOC3_KBC_CTRL_KBD_CLAMP_1 0x00100000 -#define IOC3_KBC_CTRL_AUX_CLAMP_1 0x00200000 -#define IOC3_KBC_CTRL_KBD_CLAMP_3 0x00400000 -#define IOC3_KBC_CTRL_AUX_CLAMP_3 0x00800000 - -/* bits in KBC_*_RX */ -#define IOC3_KBC_DATA_0_VALID 0x80000000 -#define IOC3_KBC_DATA_1_VALID 0x40000000 -#define IOC3_KBC_DATA_2_VALID 0x20000000 -#define IOC3_KBC_DATA_VALID (IOC3_KBC_DATA_0_VALID | \ - IOC3_KBC_DATA_1_VALID | \ - IOC3_KBC_DATA_2_VALID) -#define IOC3_KBC_DATA_0_MASK 0x00ff0000 -#define IOC3_KBC_DATA_0_SHIFT 16 -#define IOC3_KBC_DATA_1_MASK 0x0000ff00 -#define IOC3_KBC_DATA_1_SHIFT 8 -#define IOC3_KBC_DATA_2_MASK 0x000000ff -#define IOC3_KBC_DATA_2_SHIFT 0 - /* bits in ENET_MCR */ #define IOC3_ENET_MCR_DUPLEX 0x00000001 #define IOC3_ENET_MCR_PROMISC 0x00000002 diff --git a/sys/arch/sgi/pci/iofreg.h b/sys/arch/sgi/pci/iofreg.h index ac170d2c6a8..bee1efa755b 100644 --- a/sys/arch/sgi/pci/iofreg.h +++ b/sys/arch/sgi/pci/iofreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iofreg.h,v 1.3 2009/10/13 21:17:13 miod Exp $ */ +/* $OpenBSD: iofreg.h,v 1.4 2009/11/18 19:03:27 miod Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -30,6 +30,7 @@ #define IOC4DEV_ATAPI 6 #define IOC4DEV_RTC 7 +/* Interrupt control registers */ #define IOC4_SIO_IR 0x00000008 #define IOC4_OTHER_IR 0x0000000c #define IOC4_SIO_IES 0x00000010 @@ -39,6 +40,13 @@ #define IOC4_SIO_CR 0x00000020 #define IOC4_MCR 0x00000024 +/* Keyboard controller registers */ +#define IOC4_KBC_CTRL_STATUS 0x00000200 +#define IOC4_KBC_KBD_RX 0x00000204 +#define IOC4_KBC_AUX_RX 0x00000208 +#define IOC4_KBC_KBD_TX 0x0000020c +#define IOC4_KBC_AUX_TX 0x00000210 + /* bits in the SIO interrupt register */ #define IOC4_SIRQ_UARTA 0x00000040 /* UART A passthrough */ #define IOC4_SIRQ_UARTB 0x00004000 /* UART B passthrough */ |