diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-07-31 11:06:37 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-07-31 11:06:37 +0000 |
| commit | a16dbc750c4b285cb2735adb48fe6a70eda9e335 (patch) | |
| tree | 7f6e8403646ec0915bd64005bbf88141086ae9a2 /sys/arch/i386 | |
| parent | ddc115564e2b438356fee3b26bba010e42273466 (diff) | |
puc@cardbus (only added (commented out) to whom has puc@pci enabled)
tested on puc@pci by fkr and meself on the cardbus.
still needs a bit more work but generally works.
deraadt@ ok and some input from miod@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pccom.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pccomvar.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 40a775f676a..eed267481f6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.513 2006/07/27 04:18:44 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.514 2006/07/31 11:06:18 mickey Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -244,6 +244,7 @@ zyd* at uhub? # Zydas ZD1211 #ueagle* at uhub? # Analog Devices Eagle ADSL udcf* at uhub? # Gude Expert mouseCLOCK puc* at pci? # PCI "universal" communication device +#puc* at cardbus? sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c index 86646255ef7..0aa06e3d260 100644 --- a/sys/arch/i386/isa/pccom.c +++ b/sys/arch/i386/isa/pccom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccom.c,v 1.53 2006/06/23 06:27:08 miod Exp $ */ +/* $OpenBSD: pccom.c,v 1.54 2006/07/31 11:06:20 mickey Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -557,6 +557,7 @@ comopen(dev, flag, mode, p) case COM_UART_ST16650: case COM_UART_ST16650V2: case COM_UART_XR16850: + case COM_UART_OX16C950: bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); bus_space_write_1(iot, ioh, com_efr, EFR_ECB); bus_space_write_1(iot, ioh, com_ier, 0); @@ -586,6 +587,7 @@ comopen(dev, flag, mode, p) fifo |= FIFO_RCV_TRIGGER_28|FIFO_XMT_TRIGGER_30; break; case COM_UART_XR16850: + case COM_UART_OX16C950: pccom_xr16850_fifo_init(iot, ioh); if (tp->t_ispeed <= 1200) fifo |= FIFO_RCV3_TRIGGER_8|FIFO_XMT3_TRIGGER_8; /* XXX */ @@ -766,6 +768,7 @@ compwroff(sc) case COM_UART_ST16650: case COM_UART_ST16650V2: case COM_UART_XR16850: + case COM_UART_OX16C950: bus_space_write_1(iot, ioh, com_lcr, LCR_EFR); bus_space_write_1(iot, ioh, com_efr, EFR_ECB); bus_space_write_1(iot, ioh, com_ier, IER_SLEEP); @@ -1051,6 +1054,7 @@ comparam(tp, t) fifo |= FIFO_RCV_TRIGGER_28|FIFO_XMT_TRIGGER_30; break; case COM_UART_XR16850: + case COM_UART_OX16C950: if (t->c_ispeed <= 1200) fifo |= FIFO_RCV3_TRIGGER_8|FIFO_XMT3_TRIGGER_8; /* XXX */ else diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h index 367f0e509a2..64a18db08ba 100644 --- a/sys/arch/i386/isa/pccomvar.h +++ b/sys/arch/i386/isa/pccomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccomvar.h,v 1.17 2006/05/28 16:48:18 fkr Exp $ */ +/* $OpenBSD: pccomvar.h,v 1.18 2006/07/31 11:06:20 mickey Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -71,6 +71,7 @@ struct com_softc { #define COM_UART_ST16650V2 0x06 /* 32 byte fifo */ #define COM_UART_TI16750 0x07 /* 64 byte fifo */ #define COM_UART_XR16850 0x10 /* 128 byte fifo */ +#define COM_UART_OX16C950 0x12 /* 128 byte fifo */ u_char sc_uartrev; u_char sc_hwflags; |