summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-02-28 22:39:15 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-02-28 22:39:15 +0000
commita4ea6ccbf1c1131ca9e31b03655f2c53101e0ec8 (patch)
treeac60887d0b360303e92cfb58b190f59ec6883840 /sys/arch
parent4ccce68d77f7cc1e920b529cc6b1904a5fab6297 (diff)
Attach the IR port as a second serial port on Fuloong 2F. Verified to attach
and get interrupts by otto@, no further testing due to lack of IR devices.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/loongson/conf/GENERIC3
-rw-r--r--sys/arch/loongson/loongson/yeeloong_machdep.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 282764d441b..beb0b8ac699 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.17 2010/02/28 22:32:50 miod Exp $
+# $OpenBSD: GENERIC,v 1.18 2010/02/28 22:39:13 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -47,6 +47,7 @@ pmsi* at pckbc? # Yeeloong only
wsmouse* at pmsi? mux 0 # Yeeloong only
ykbec0 at isa? port 0x381 # Yeeloong only
com0 at isa? port 0x2f8 irq 3 # Fuloong 2F only
+com1 at isa? port 0x3f8 irq 4 # Fuloong 2F only (IR port)
pciide* at pci?
wd* at pciide? flags 0x0000
sisfb* at pci? # Fuloong 2F only
diff --git a/sys/arch/loongson/loongson/yeeloong_machdep.c b/sys/arch/loongson/loongson/yeeloong_machdep.c
index d3b6ae5e5f4..e5228b7eca4 100644
--- a/sys/arch/loongson/loongson/yeeloong_machdep.c
+++ b/sys/arch/loongson/loongson/yeeloong_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yeeloong_machdep.c,v 1.8 2010/02/28 22:32:50 miod Exp $ */
+/* $OpenBSD: yeeloong_machdep.c,v 1.9 2010/02/28 22:39:14 miod Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -85,6 +85,7 @@ const struct legacy_io_range fuloong_legacy_ranges[] = {
{ 0x376, 0x376 },
{ 0x3f6, 0x3f6 },
/* com */
+ { IO_COM1, IO_COM1 + 8 },
{ IO_COM2, IO_COM2 + 8 },
{ 0 }