Module Name: src Committed By: manu Date: Mon May 2 14:00:09 UTC 2011
Modified Files: src/sys/dev/pci: pcidevs pucdata.c Log Message: Add new PCI vendor Id for Sunix, and the corresponding device Id. To generate a diff of this commit: cvs rdiff -u -r1.1071 -r1.1072 src/sys/dev/pci/pcidevs cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/pucdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1071 src/sys/dev/pci/pcidevs:1.1072 --- src/sys/dev/pci/pcidevs:1.1071 Wed Apr 13 22:24:12 2011 +++ src/sys/dev/pci/pcidevs Mon May 2 14:00:09 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1071 2011/04/13 22:24:12 wiz Exp $ +$NetBSD: pcidevs,v 1.1072 2011/05/02 14:00:09 manu Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -626,6 +626,7 @@ vendor QUMRANET 0x1af4 Qumranet vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) +vendor SUNIX 0x1fd4 SUNIX Co vendor HINT 0x3388 HiNT vendor 3DLABS 0x3d3d 3D Labs vendor AVANCE2 0x4005 Avance Logic (2nd PCI Vendor ID) @@ -4239,6 +4240,10 @@ product SUNDANCETI ST1023 0x1023 ST1023 Gigabit Ethernet product SUNDANCETI ST2021 0x2021 ST2021 Gigabit Ethernet +/* SUNIX products */ +product SUNIX 0001 0x0001 Matrix serial adapter +product SUNIX 1999 0x1999 1999 multiport adapter + /* Surecom Technology products */ product SURECOM NE34 0x0e34 NE-34 Ethernet Index: src/sys/dev/pci/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.71 src/sys/dev/pci/pucdata.c:1.72 --- src/sys/dev/pci/pucdata.c:1.71 Fri Mar 11 20:22:53 2011 +++ src/sys/dev/pci/pucdata.c Mon May 2 14:00:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.71 2011/03/11 20:22:53 he Exp $ */ +/* $NetBSD: pucdata.c,v 1.72 2011/05/02 14:00:09 manu Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.71 2011/03/11 20:22:53 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.72 2011/05/02 14:00:09 manu Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1144,6 +1144,116 @@ }, }, + { "SUNIX 5008 1P", + { 0x1fd4, 0x1999, 0x1fd4, 0x0100 }, + { 0xffff, 0xffff, 0xffff, 0xeff0 }, + { + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + + { "SUNIX 5016 8S", + { 0x1fd4, 0x1999, 0x1fd4, 0x0010 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8}, +/* + * PUC_MAX_PORTS needs to be raised in order to reach these ports + */ +#if PUC_MAX_PORTS >= 16 + { PUC_PORT_TYPE_COM, 0x14, 0x20, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x28, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x30, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x38, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x40, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x48, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x50, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x58, COM_FREQ * 8}, +#endif /* PUC_MAX_PORTS >= 16 */ + }, + }, + + { "SUNIX 5027 1S", + { 0x1fd4, 0x1999, 0x1fd4, 0x0001 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + }, + }, + + { "SUNIX 5037 2S", + { 0x1fd4, 0x1999, 0x1fd4, 0x0002 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + }, + }, + + { "SUNIX 5056 4S", + { 0x1fd4, 0x1999, 0x1fd4, 0x0004 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8}, + }, + }, + + { "SUNIX 5066 8S", + { 0x1fd4, 0x1999, 0x1fd4, 0x0008 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8}, + }, + }, + + { "SUNIX 5069 1S / 1P", + { 0x1fd4, 0x1999, 0x1fd4, 0x0101 }, + { 0xffff, 0xffff, 0xffff, 0xeff0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + + { "SUNIX 5079 2S / 1P", + { 0x1fd4, 0x1999, 0x1fd4, 0x0102 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + + { "SUNIX 5099 4S / 1P", + { 0x1fd4, 0x1999, 0x1fd4, 0x0104 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8}, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8}, + { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 }, + }, + }, + /* * XXX no entry because I have no data: * XXX Dolphin Peripherals 4006 (single parallel)