summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-11-25 03:05:46 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2014-02-11 02:07:50 (GMT)
commit214f18df9941d93b8b4b3c9292d91cc016f6a8f1 (patch)
treec328e25aa38fe010ee84b7c7c23d737abff3fd0d
parenta3a30f6056ba77ede96ea98eae8b31ff816ec2bb (diff)
downloadabc8000-214f18df9941d93b8b4b3c9292d91cc016f6a8f1.zip
abc8000-214f18df9941d93b8b4b3c9292d91cc016f6a8f1.tar.gz
abc8000-214f18df9941d93b8b4b3c9292d91cc016f6a8f1.tar.bz2
abc8000-214f18df9941d93b8b4b3c9292d91cc016f6a8f1.tar.xz
sysrom: definitions for the keyboard controller
-rw-r--r--data/sysrom/include/ioreg.h6
-rw-r--r--data/sysrom/sysstart.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/data/sysrom/include/ioreg.h b/data/sysrom/include/ioreg.h
index 16c73ed..ba9c7b7 100644
--- a/data/sysrom/include/ioreg.h
+++ b/data/sysrom/include/ioreg.h
@@ -122,6 +122,12 @@ static __inline__ void writel(uint32_t __val, volatile uint32_t *__ptr)
#define SDC_START 0x80
/*
+ * Keyboard controller
+ */
+#define IO_KBD_DATA IO_BYTE(0xfff50000)
+#define IO_KBD_STATUS IO_BYTE(0xfff50002)
+
+/*
* 68901 Multi-Function Peripheral
*/
#define IO_MFP_GPDR IO_BYTE(0xfffe0001)
diff --git a/data/sysrom/sysstart.c b/data/sysrom/sysstart.c
index 9151360..b6190c0 100644
--- a/data/sysrom/sysstart.c
+++ b/data/sysrom/sysstart.c
@@ -170,9 +170,9 @@ static void irq_init(void)
/* Vector register: base 0x40 */
writeb(0x40, IO_MFP_VR);
- /* Enable hsync and vsync as external interrupts */
+ /* GPIOs configured as inputs, trigger on the negative edge */
writeb(0x00, IO_MFP_AER);
- writeb(0xc0, IO_MFP_DDR);
+ writeb(0x00, IO_MFP_DDR);
/*
* Use Timer A to generate a 64 Hz timer interrupt;