From 620c981ecd502da1dc9a76a7cf86100e6476867d Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 22 Apr 2005 07:49:35 +0000 Subject: [PATCH] Sort Oxford Semi entires. Add entry for OXCB950, a PCI/CardBus 16C950. Adding it here doesn't unlock any of the cool 16C950 features (like the 128 byte fifo, the different prescalor, etc), but it does seem to get it working for me in light testing. Card Provided by: Ihsan Dogan --- sys/dev/puc/pucdata.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c index 7a987d994a5d..678db5ff8677 100644 --- a/sys/dev/puc/pucdata.c +++ b/sys/dev/puc/pucdata.c @@ -846,6 +846,15 @@ const struct puc_device_description puc_devices[] = { * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. */ + /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ + { "Oxford Semiconductor OX12PCI840 Parallel port", + { 0x1415, 0x8403, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* Oxford Semiconductor OX16PCI954 PCI UARTs */ { "Oxford Semiconductor OX16PCI954 UARTs", { 0x1415, 0x9501, 0, 0 }, @@ -870,21 +879,12 @@ const struct puc_device_description puc_devices[] = { }, }, - /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ - { "Oxford Semiconductor OX16PCI954 Parallel port", - { 0x1415, 0x9513, 0, 0 }, + /* Oxford Semiconductor OXCB950 PCI/CardBus UARTs */ + { "Oxford Semiconductor OXCB950 UART", + { 0x1415, 0x950b, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, - }, - }, - - /* Oxford Semiconductor OX12PCI840 PCI Parallel port */ - { "Oxford Semiconductor OX12PCI840 Parallel port", - { 0x1415, 0x8403, 0, 0 }, - { 0xffff, 0xffff, 0, 0 }, - { - { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, }, }, @@ -903,6 +903,15 @@ const struct puc_device_description puc_devices[] = { }, }, + /* Oxford Semiconductor OX16PCI954 PCI Parallel port */ + { "Oxford Semiconductor OX16PCI954 Parallel port", + { 0x1415, 0x9513, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 }, + }, + }, + /* NetMos 2S1P PCI 16C650 : 2S, 1P */ { "NetMos NM9835 Dual UART and 1284 Printer port", { 0x9710, 0x9835, 0, 0 },