? share/man/man4/g760a.4 ? share/man/man4/m41t80rtc.4 ? sys/arch/arm/marvell ? sys/arch/evbarm/orion_nas ? sys/arch/evbarm/conf/DNS323 ? sys/arch/evbarm/conf/KUROBOX_PRO ? sys/arch/evbarm/conf/ORION_NAS ? sys/arch/evbarm/conf/files.orion_nas ? sys/arch/evbarm/conf/mk.orion_nas ? sys/arch/evbarm/conf/std.orion_nas ? sys/dev/i2c/g760a.c ? sys/dev/i2c/g760areg.h ? sys/dev/i2c/m41t80.c ? sys/dev/i2c/m41t80reg.h ? sys/dev/ic/mvsata.c ? sys/dev/ic/mvsatareg.h ? sys/dev/ic/mvsatavar.h ? sys/dev/pci/mvsata_pci.c Index: distrib/sets/lists/man/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v retrieving revision 1.1085 diff -u -r1.1085 mi --- distrib/sets/lists/man/mi 17 Aug 2008 13:26:36 -0000 1.1085 +++ distrib/sets/lists/man/mi 7 Sep 2008 12:43:52 -0000 @@ -902,6 +902,7 @@ ./usr/share/man/cat4/fwiso.0 man-obsolete obsolete ./usr/share/man/cat4/fwohci.0 man-sys-catman .cat ./usr/share/man/cat4/fxp.0 man-sys-catman .cat +./usr/share/man/cat4/g760a.0 man-sys-catman .cat ./usr/share/man/cat4/gem.0 man-sys-catman .cat ./usr/share/man/cat4/genfb.0 man-sys-catman .cat ./usr/share/man/cat4/gentbi.0 man-sys-catman .cat @@ -1116,6 +1117,7 @@ ./usr/share/man/cat4/lsu.0 man-obsolete obsolete ./usr/share/man/cat4/lxtphy.0 man-sys-catman .cat ./usr/share/man/cat4/m25p.0 man-sys-catman .cat +./usr/share/man/cat4/m41t80rtc.0 man-sys-catman .cat ./usr/share/man/cat4/mac68k/adb.0 man-obsolete obsolete ./usr/share/man/cat4/mac68k/ae.0 man-sys-catman .cat ./usr/share/man/cat4/mac68k/autoconf.0 man-sys-catman .cat @@ -3488,6 +3490,7 @@ ./usr/share/man/man4/fwiso.4 man-obsolete obsolete ./usr/share/man/man4/fwohci.4 man-sys-man .man ./usr/share/man/man4/fxp.4 man-sys-man .man +./usr/share/man/man4/g760a.4 man-sys-man .man ./usr/share/man/man4/gem.4 man-sys-man .man ./usr/share/man/man4/genfb.4 man-sys-man .man ./usr/share/man/man4/gentbi.4 man-sys-man .man @@ -3702,6 +3705,7 @@ ./usr/share/man/man4/lsu.4 man-obsolete obsolete ./usr/share/man/man4/lxtphy.4 man-sys-man .man ./usr/share/man/man4/m25p.4 man-sys-man .man +./usr/share/man/man4/m41t80rtc.4 man-sys-man .man ./usr/share/man/man4/mac68k/adb.4 man-obsolete obsolete ./usr/share/man/man4/mac68k/ae.4 man-sys-man .man ./usr/share/man/man4/mac68k/autoconf.4 man-sys-man .man Index: share/man/man4/Makefile =================================================================== RCS file: /cvsroot/src/share/man/man4/Makefile,v retrieving revision 1.469 diff -u -r1.469 Makefile --- share/man/man4/Makefile 31 Jul 2008 08:28:17 -0000 1.469 +++ share/man/man4/Makefile 7 Sep 2008 12:44:29 -0000 @@ -109,7 +109,7 @@ MAN+= fwohci.4 fwip.4 sbp.4 # machine-independent I2C devices -MAN+= lmtemp.4 spdmem.4 +MAN+= g760a.4 lmtemp.4 m41t80rtc.4 spdmem.4 # machine-independent SPI devices MAN += m25p.4 tm121temp.4 Index: sys/arch/arm/conf/files.arm =================================================================== RCS file: /cvsroot/src/sys/arch/arm/conf/files.arm,v retrieving revision 1.91 diff -u -r1.91 files.arm --- sys/arch/arm/conf/files.arm 27 Apr 2008 18:58:44 -0000 1.91 +++ sys/arch/arm/conf/files.arm 7 Sep 2008 12:44:32 -0000 @@ -11,6 +11,7 @@ CPU_XSCALE_80200 CPU_XSCALE_80321 CPU_XSCALE_PXA250 CPU_XSCALE_PXA270 CPU_XSCALE_IXP425 + CPU_FEROCEON_MV88F1181 CPU_FEROCEON_MV88F5181 defflag opt_cputypes.h CPU_ARM1136: CPU_ARM11 defflag opt_cputypes.h CPU_ARM1176: CPU_ARM11 defflag opt_cputypes.h FPU_VFP Index: sys/conf/files =================================================================== RCS file: /cvsroot/src/sys/conf/files,v retrieving revision 1.912 diff -u -r1.912 files --- sys/conf/files 4 Aug 2008 03:55:47 -0000 1.912 +++ sys/conf/files 7 Sep 2008 12:44:43 -0000 @@ -921,6 +921,12 @@ file dev/ic/ahcisata_core.c ahcisata_core device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core +# Mervell Serial-ATA Host Controller +define mvsata +file dev/ic/mvsata.c mvsata +device mvsata: ata, ata_dma, ata_udma, wdc_common, sata, mvsata +defflag opt_mvsata.h MVSATA_WITHOUTDMA + # DECchip 21x4x Ethernet controller family, and assorted clones. # device tlp: arp, ether, ifnet, mii, mii_bitbang Index: sys/dev/DEVNAMES =================================================================== RCS file: /cvsroot/src/sys/dev/DEVNAMES,v retrieving revision 1.240 diff -u -r1.240 DEVNAMES --- sys/dev/DEVNAMES 12 Aug 2008 17:54:47 -0000 1.240 +++ sys/dev/DEVNAMES 7 Sep 2008 12:44:44 -0000 @@ -475,6 +475,7 @@ fwohci MI fxp MI g2bus dreamcast +g740a MI gapspci dreamcast gayle amiga Attribute gayle amigappc Attribute @@ -741,6 +742,7 @@ lsi64854 MI Attribute lxtphy MI m38813c hpcmips +m41t80 MI mace sgimips macepci sgimips macfb mac68k @@ -884,6 +886,7 @@ mtty MI mu vax mulaw MI Attribute +mvsata MI nca MI ncr5380sbc MI Attribute ncr53c9x MI Attribute Index: sys/dev/i2c/files.i2c =================================================================== RCS file: /cvsroot/src/sys/dev/i2c/files.i2c,v retrieving revision 1.16 diff -u -r1.16 files.i2c --- sys/dev/i2c/files.i2c 2 Sep 2007 01:40:46 -0000 1.16 +++ sys/dev/i2c/files.i2c 7 Sep 2008 12:44:44 -0000 @@ -112,3 +112,13 @@ device spdmem attach spdmem at iic file dev/i2c/spdmem.c spdmem + +# M41T80 Real Time Clock +device m41t80rtc +attach m41t80rtc at iic +file dev/i2c/m41t80.c m41t80rtc + +# G760a FAN controller +device g760a: sysmon_envsys +attach g760a at iic +file dev/i2c/g760a.c g760a Index: sys/dev/pci/files.pci =================================================================== RCS file: /cvsroot/src/sys/dev/pci/files.pci,v retrieving revision 1.305 diff -u -r1.305 files.pci --- sys/dev/pci/files.pci 21 Jul 2008 21:36:05 -0000 1.305 +++ sys/dev/pci/files.pci 7 Sep 2008 12:44:45 -0000 @@ -938,3 +942,7 @@ device siisata: ata, ata_dma, ata_udma, sata, siisata attach siisata at pci with siisata_pci file dev/pci/siisata_pci.c siisata_pci + +# Marvell Serial-ATA Host Controller +attach mvsata at pci with mvsata_pci +file dev/pci/mvsata_pci.c mvsata_pci Index: sys/dev/pci/pcidevs =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v retrieving revision 1.947 diff -u -r1.947 pcidevs --- sys/dev/pci/pcidevs 19 Aug 2008 10:02:18 -0000 1.947 +++ sys/dev/pci/pcidevs 7 Sep 2008 12:44:49 -0000 @@ -818,6 +818,8 @@ product ADP2 AIC7899D 0x00c3 AIC-7899D U160 product ADP2 AIC7899F 0x00c5 AIC-7899F RAID product ADP2 AIC7899P 0x00cf AIC-7899P U160 +product ADP2 1420SA 0x0241 RAID 1420SA +product ADP2 1430SA 0x0243 RAID 1430SA product ADP2 AAC2622 0x0282 AAC-2622 product ADP2 ASR2200S 0x0285 ASR-2200S product ADP2 ASR2120S 0x0286 ASR-2120S @@ -1889,6 +1891,8 @@ /* Marvell products */ product MARVELL GT64010A 0x0146 GT-64010A System Controller +product MARVELL 88F1181 0x1181 88F1181 +product MARVELL 88F1281 0x1281 88F1281 SoC Orion2 product MARVELL 88W8300_1 0x1fa6 Libertas 88W8300 product MARVELL 88W8310 0x1fa7 Libertas 88W8310 product MARVELL 88W8335_1 0x1faa Libertas 88W8335 @@ -1923,19 +1927,31 @@ product MARVELL YUKON_C055 0x436a Yukon 88EC055 product MARVELL GT64120 0x4620 GT-64120 System Controller product MARVELL BELKIN 0x5005 Belkin Gigabit Ethernet -product MARVELL 88SX5040 0x5040 88SX5040 SATA -product MARVELL 88SX5041 0x5041 88SX5041 SATA -product MARVELL 88SX5080 0x5080 88SX5080 SATA -product MARVELL 88SX5081 0x5081 88SX5081 SATA -product MARVELL 88SX6041 0x6041 88SX6041 SATA -product MARVELL 88SX6081 0x6081 88SX6041 SATA +product MARVELL 88SX5040 0x5040 88SX5040 SATA I +product MARVELL 88SX5041 0x5041 88SX5041 SATA I +product MARVELL 88SX5080 0x5080 88SX5080 SATA I +product MARVELL 88SX5081 0x5081 88SX5081 SATA I +product MARVELL 88F5082 0x5082 88F5082 SoC Orion1 +product MARVELL 88F5180N 0x5180 88F5180N SoC Orion1 +product MARVELL 88F5181 0x5181 88F5181 SoC Orion1 +product MARVELL 88F5182 0x5182 88F5182 SoC Orion1 +product MARVELL 88F5281 0x5281 88F5281 SoC Orion2 +product MARVELL 88SX6040 0x6040 88SX6040 SATA II +product MARVELL 88SX6041 0x6041 88SX6041 SATA II +product MARVELL 88SX6042 0x6042 88SX6042 SATA IIe +product MARVELL 88SX6080 0x6080 88SX6080 SATA II +product MARVELL 88SX6081 0x6081 88SX6081 SATA II +product MARVELL 88F6082 0x6082 88F6082 SoC Orion1 product MARVELL 88SE6101 0x6101 88SE6101 single-port PATA133 Controller product MARVELL 88SE6121 0x6121 88SE6121 SATA II Controller product MARVELL 88SE614X 0x6141 88SE614X SATA II PCI-E Controller product MARVELL 88SE6145 0x6145 88SE6145 SATA II PCI-E Controller +product MARVELL 88F6183 0x6183 88F6183 SoC Orion1 product MARVELL GT64130 0x6320 GT-64130 System Controller product MARVELL GT64260 0x6430 GT-64260 System Controller product MARVELL GT64360 0x6460 MV6436x System Controller +product MARVELL 88SX7042 0x7042 88SX7042 SATA IIe +product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 /* Global Sun Tech products */ product GLOBALSUN GL24110P 0x1101 GL24110P PCI IEEE 802.11b @@ -3820,6 +3836,7 @@ product TRIONES HPT371 0x0007 HPT371 IDE Controller product TRIONES HPT374 0x0008 HPT374 IDE Controller product TRIONES HPT372N 0x0009 HPT372N IDE Controller +product TRIONES ROCKETRAID_2310 0x2310 RocketRAID 2310 RAID card /* TriTech Microelectronics products*/ product TRITECH TR25202 0xfc02 Pyramid3D TR25202 Index: sys/dev/pci/pcidevs.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs.h,v retrieving revision 1.948 diff -u -r1.948 pcidevs.h --- sys/dev/pci/pcidevs.h 19 Aug 2008 10:02:42 -0000 1.948 +++ sys/dev/pci/pcidevs.h 7 Sep 2008 12:44:54 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs.h,v 1.948 2008/08/19 10:02:42 matthias Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -825,6 +825,8 @@ #define PCI_PRODUCT_ADP2_AIC7899D 0x00c3 /* AIC-7899D U160 */ #define PCI_PRODUCT_ADP2_AIC7899F 0x00c5 /* AIC-7899F RAID */ #define PCI_PRODUCT_ADP2_AIC7899P 0x00cf /* AIC-7899P U160 */ +#define PCI_PRODUCT_ADP2_1420SA 0x0241 /* RAID 1420SA */ +#define PCI_PRODUCT_ADP2_1430SA 0x0243 /* RAID 1430SA */ #define PCI_PRODUCT_ADP2_AAC2622 0x0282 /* AAC-2622 */ #define PCI_PRODUCT_ADP2_ASR2200S 0x0285 /* ASR-2200S */ #define PCI_PRODUCT_ADP2_ASR2120S 0x0286 /* ASR-2120S */ @@ -1896,6 +1898,8 @@ /* Marvell products */ #define PCI_PRODUCT_MARVELL_GT64010A 0x0146 /* GT-64010A System Controller */ +#define PCI_PRODUCT_MARVELL_88F1181 0x1181 /* 88F1181 */ +#define PCI_PRODUCT_MARVELL_88F1281 0x1281 /* 88F1281 SoC Orion2 */ #define PCI_PRODUCT_MARVELL_88W8300_1 0x1fa6 /* Libertas 88W8300 */ #define PCI_PRODUCT_MARVELL_88W8310 0x1fa7 /* Libertas 88W8310 */ #define PCI_PRODUCT_MARVELL_88W8335_1 0x1faa /* Libertas 88W8335 */ @@ -1930,19 +1934,31 @@ #define PCI_PRODUCT_MARVELL_YUKON_C055 0x436a /* Yukon 88EC055 */ #define PCI_PRODUCT_MARVELL_GT64120 0x4620 /* GT-64120 System Controller */ #define PCI_PRODUCT_MARVELL_BELKIN 0x5005 /* Belkin Gigabit Ethernet */ -#define PCI_PRODUCT_MARVELL_88SX5040 0x5040 /* 88SX5040 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5041 0x5041 /* 88SX5041 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5080 0x5080 /* 88SX5080 SATA */ -#define PCI_PRODUCT_MARVELL_88SX5081 0x5081 /* 88SX5081 SATA */ -#define PCI_PRODUCT_MARVELL_88SX6041 0x6041 /* 88SX6041 SATA */ -#define PCI_PRODUCT_MARVELL_88SX6081 0x6081 /* 88SX6041 SATA */ +#define PCI_PRODUCT_MARVELL_88SX5040 0x5040 /* 88SX5040 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5041 0x5041 /* 88SX5041 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5080 0x5080 /* 88SX5080 SATA I */ +#define PCI_PRODUCT_MARVELL_88SX5081 0x5081 /* 88SX5081 SATA I */ +#define PCI_PRODUCT_MARVELL_88F5082 0x5082 /* 88F5082 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5180N 0x5180 /* 88F5180N SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5181 0x5181 /* 88F5181 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5182 0x5182 /* 88F5182 SoC Orion1 */ +#define PCI_PRODUCT_MARVELL_88F5281 0x5281 /* 88F5281 SoC Orion2 */ +#define PCI_PRODUCT_MARVELL_88SX6040 0x6040 /* 88SX6040 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6041 0x6041 /* 88SX6041 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6042 0x6042 /* 88SX6042 SATA IIe */ +#define PCI_PRODUCT_MARVELL_88SX6080 0x6080 /* 88SX6080 SATA II */ +#define PCI_PRODUCT_MARVELL_88SX6081 0x6081 /* 88SX6081 SATA II */ +#define PCI_PRODUCT_MARVELL_88F6082 0x6082 /* 88F6082 SoC Orion1 */ #define PCI_PRODUCT_MARVELL_88SE6101 0x6101 /* 88SE6101 single-port PATA133 Controller */ #define PCI_PRODUCT_MARVELL_88SE6121 0x6121 /* 88SE6121 SATA II Controller */ #define PCI_PRODUCT_MARVELL_88SE614X 0x6141 /* 88SE614X SATA II PCI-E Controller */ #define PCI_PRODUCT_MARVELL_88SE6145 0x6145 /* 88SE6145 SATA II PCI-E Controller */ +#define PCI_PRODUCT_MARVELL_88F6183 0x6183 /* 88F6183 SoC Orion1 */ #define PCI_PRODUCT_MARVELL_GT64130 0x6320 /* GT-64130 System Controller */ #define PCI_PRODUCT_MARVELL_GT64260 0x6430 /* GT-64260 System Controller */ #define PCI_PRODUCT_MARVELL_GT64360 0x6460 /* MV6436x System Controller */ +#define PCI_PRODUCT_MARVELL_88SX7042 0x7042 /* 88SX7042 SATA IIe */ +#define PCI_PRODUCT_MARVELL_88W8660 0x8660 /* 88W8660 SoC Orion1 */ /* Global Sun Tech products */ #define PCI_PRODUCT_GLOBALSUN_GL24110P 0x1101 /* GL24110P PCI IEEE 802.11b */ @@ -3827,6 +3843,7 @@ #define PCI_PRODUCT_TRIONES_HPT371 0x0007 /* HPT371 IDE Controller */ #define PCI_PRODUCT_TRIONES_HPT374 0x0008 /* HPT374 IDE Controller */ #define PCI_PRODUCT_TRIONES_HPT372N 0x0009 /* HPT372N IDE Controller */ +#define PCI_PRODUCT_TRIONES_ROCKETRAID_2310 0x2310 /* RocketRAID 2310 RAID card */ /* TriTech Microelectronics products*/ #define PCI_PRODUCT_TRITECH_TR25202 0xfc02 /* Pyramid3D TR25202 */ Index: sys/dev/pci/pcidevs_data.h =================================================================== RCS file: /cvsroot/src/sys/dev/pci/pcidevs_data.h,v retrieving revision 1.947 diff -u -r1.947 pcidevs_data.h --- sys/dev/pci/pcidevs_data.h 19 Aug 2008 10:02:42 -0000 1.947 +++ sys/dev/pci/pcidevs_data.h 7 Sep 2008 12:44:56 -0000 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs_data.h,v 1.947 2008/08/19 10:02:42 matthias Exp $ */ +/* $NetBSD$ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -3008,6 +3008,14 @@ "AIC-7899P U160", }, { + PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_1420SA, + "RAID 1420SA", + }, + { + PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_1430SA, + "RAID 1430SA", + }, + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AAC2622, "AAC-2622", }, @@ -6560,6 +6568,14 @@ "GT-64010A System Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F1181, + "88F1181", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F1281, + "88F1281 SoC Orion2", + }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8300_1, "Libertas 88W8300", }, @@ -6697,27 +6713,63 @@ }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5040, - "88SX5040 SATA", + "88SX5040 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5041, - "88SX5041 SATA", + "88SX5041 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5080, - "88SX5080 SATA", + "88SX5080 SATA I", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX5081, - "88SX5081 SATA", + "88SX5081 SATA I", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5082, + "88F5082 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5180N, + "88F5180N SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5181, + "88F5181 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5182, + "88F5182 SoC Orion1", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F5281, + "88F5281 SoC Orion2", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6040, + "88SX6040 SATA II", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6041, - "88SX6041 SATA", + "88SX6041 SATA II", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6042, + "88SX6042 SATA IIe", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6080, + "88SX6080 SATA II", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX6081, - "88SX6041 SATA", + "88SX6081 SATA II", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F6082, + "88F6082 SoC Orion1", }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SE6101, @@ -6736,6 +6788,10 @@ "88SE6145 SATA II PCI-E Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88F6183, + "88F6183 SoC Orion1", + }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_GT64130, "GT-64130 System Controller", }, @@ -6748,6 +6804,14 @@ "MV6436x System Controller", }, { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SX7042, + "88SX7042 SATA IIe", + }, + { + PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8660, + "88W8660 SoC Orion1", + }, + { PCI_VENDOR_GLOBALSUN, PCI_PRODUCT_GLOBALSUN_GL24110P, "GL24110P PCI IEEE 802.11b", }, @@ -13256,6 +13320,10 @@ "HPT372N IDE Controller", }, { + PCI_VENDOR_TRIONES, PCI_PRODUCT_TRIONES_ROCKETRAID_2310, + "RocketRAID 2310 RAID card", + }, + { PCI_VENDOR_TRITECH, PCI_PRODUCT_TRITECH_TR25202, "Pyramid3D TR25202", }, @@ -14276,4 +14344,4 @@ "Video Controller", }, }; -const int pci_nproducts = 2969; +const int pci_nproducts = 2986; Index: sys/dev/usb/ehci.c =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehci.c,v retrieving revision 1.143 diff -u -r1.143 ehci.c --- sys/dev/usb/ehci.c 16 Aug 2008 15:41:37 -0000 1.143 +++ sys/dev/usb/ehci.c 7 Sep 2008 12:45:00 -0000 @@ -328,7 +328,7 @@ usbd_status ehci_init(ehci_softc_t *sc) { - u_int32_t vers, sparams, cparams, hcr; + u_int32_t vers, sparams, cparams, hcr, mode; u_int i; usbd_status err; ehci_soft_qh_t *sqh; @@ -398,6 +398,15 @@ aprint_error("%s: reset timeout\n", device_xname(sc->sc_dev)); return (USBD_IOERROR); } + if (sc->sc_flags & EHCIF_HAVE_TT) { + /* put TDI/ARC silicon into EHCI mode */ + mode = EOREAD4(sc, EHCI_USBMODE); + mode &= ~EHCI_MODE_HDMASK; /* Host/Device Mask */ + mode |= EHCI_MODE_HOST; + if (sc->sc_flags & EHCIF_NO_STREAM) + mode |= EHCI_MODE_STRMDIS; + EOWRITE4(sc, EHCI_USBMODE, mode); + } /* XXX need proper intr scheduling */ sc->sc_rand = 96; @@ -517,7 +526,8 @@ /* Turn on controller */ EOWRITE4(sc, EHCI_USBCMD, - EHCI_CMD_ITC_2 | /* 2 microframes interrupt delay */ + /* 2 microframes interrupt delay, if no TT */ + ((sc->sc_flags & EHCIF_HAVE_TT) ? 0 : EHCI_CMD_ITC_2) | (EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_FLS_M) | EHCI_CMD_ASE | EHCI_CMD_PSE | @@ -2270,8 +2280,23 @@ v = EOREAD4(sc, EHCI_PORTSC(index)); DPRINTFN(8,("ehci_root_ctrl_start: port status=0x%04x\n", v)); - i = UPS_HIGH_SPEED; - if (v & EHCI_PS_CS) i |= UPS_CURRENT_CONNECT_STATUS; + i = 0; + if (v & EHCI_PS_CS) { + if (sc->sc_flags & EHCIF_HAVE_TT) + switch ((v >> 26) & 0x3) { + case 0: + break; + case 1: + i |= UPS_LOW_SPEED; + break; + case 2: + default: + i |= UPS_HIGH_SPEED; + } + else + i |= UPS_HIGH_SPEED; + i |= UPS_CURRENT_CONNECT_STATUS; + } if (v & EHCI_PS_PE) i |= UPS_PORT_ENABLED; if (v & EHCI_PS_SUSP) i |= UPS_SUSPEND; if (v & EHCI_PS_OCA) i |= UPS_OVERCURRENT_INDICATOR; @@ -2327,7 +2352,8 @@ goto ret; } /* Terminate reset sequence. */ - EOWRITE4(sc, port, v); + v = EOREAD4(sc, port); + EOWRITE4(sc, port, v & ~EHCI_PS_PR); /* Wait for HC to complete reset. */ usb_delay_ms(&sc->sc_bus, EHCI_PORT_RESET_COMPLETE); if (sc->sc_dying) { @@ -2341,7 +2367,8 @@ device_xname(sc->sc_dev)); return (USBD_TIMEOUT); } - if (!(v & EHCI_PS_PE)) { + if (!(v & EHCI_PS_PE) && + !(sc->sc_flags & EHCIF_HAVE_TT)) { /* Not a high speed device, give up ownership.*/ ehci_disown(sc, index, 0); break; Index: sys/dev/usb/ehcireg.h =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehcireg.h,v retrieving revision 1.28 diff -u -r1.28 ehcireg.h --- sys/dev/usb/ehcireg.h 2 Aug 2008 22:23:18 -0000 1.28 +++ sys/dev/usb/ehcireg.h 7 Sep 2008 12:45:00 -0000 @@ -167,6 +167,12 @@ #define EHCI_PS_CS 0x00000001 /* RO connect status */ #define EHCI_PS_CLEAR (EHCI_PS_OCC|EHCI_PS_PEC|EHCI_PS_CSC) +#define EHCI_USBMODE 0x68 +#define EHCI_MODE_HDMASK 0x00000003 /* RW host/device Mask */ +#define EHCI_MODE_HOST 0x00000003 /* RW mode host */ +#define EHCI_MODE_DEVICE 0x00000002 /* RW mode device */ +#define EHCI_MODE_STRMDIS 0x00000010 /* RW straming disable */ + #define EHCI_PORT_RESET_COMPLETE 2 /* ms */ #define EHCI_FLALIGN_ALIGN 0x1000 Index: sys/dev/usb/ehcivar.h =================================================================== RCS file: /cvsroot/src/sys/dev/usb/ehcivar.h,v retrieving revision 1.32 diff -u -r1.32 ehcivar.h --- sys/dev/usb/ehcivar.h 2 Aug 2008 22:23:18 -0000 1.32 +++ sys/dev/usb/ehcivar.h 7 Sep 2008 12:45:00 -0000 @@ -116,6 +116,8 @@ u_int sc_offs; /* offset to operational regs */ int sc_flags; /* misc flags */ #define EHCIF_DROPPED_INTR_WORKAROUND 0x01 +#define EHCIF_HAVE_TT 0x02 /* Transaction Translator */ +#define EHCIF_NO_STREAM 0x04 char sc_vendor[32]; /* vendor string for root hub */ int sc_id_vendor; /* vendor ID for root hub */ Index: sys/dev/usb/uhub.c =================================================================== RCS file: /cvsroot/src/sys/dev/usb/uhub.c,v retrieving revision 1.103 diff -u -r1.103 uhub.c --- sys/dev/usb/uhub.c 18 Aug 2008 18:03:21 -0000 1.103 +++ sys/dev/usb/uhub.c 7 Sep 2008 12:45:01 -0000 @@ -509,6 +509,14 @@ #endif continue; } + if (!(status & UPS_PORT_ENABLED)) { + /* Not allowed send/receive packet. */ +#ifdef DIAGNOSTIC + printf("%s: port %d, device not enable\n", + USBDEVNAME(sc->sc_dev), port); +#endif + continue; + } /* Figure out device speed */ if (status & UPS_HIGH_SPEED)