[src/trunk]: src/sys/arch Add cxdtv(4) and urndis(4). Also, two slight cosme...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce7e45475f3a
branches:  trunk
changeset: 767518:ce7e45475f3a
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Jul 20 20:29:54 2011 +0000

description:
Add cxdtv(4) and urndis(4).  Also, two slight cosmetic changes.

diffstat:

 sys/arch/amd64/conf/GENERIC |  11 ++++++++---
 sys/arch/i386/conf/ALL      |   9 +++++++--
 sys/arch/i386/conf/GENERIC  |  10 +++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diffs (122 lines):

diff -r 25080e7383aa -r ce7e45475f3a sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Wed Jul 20 20:27:41 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Wed Jul 20 20:29:54 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.323 2011/07/13 07:52:49 jruoho Exp $
+# $NetBSD: GENERIC,v 1.324 2011/07/20 20:29:54 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.323 $"
+#ident                 "GENERIC-$Revision: 1.324 $"
 
 maxusers       64              # estimated number of users
 
@@ -869,8 +869,9 @@
 cdce*  at uhub? port ?         # CDC, Ethernet Networking Control Model
 cue*   at uhub? port ?         # CATC USB-EL1201A based adapters
 kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
+udav*  at uhub? port ?         # Davicom DM9601 based adapters
 url*   at uhub? port ?         # Realtek RTL8150L based adapters
-udav*  at uhub? port ?         # Davicom DM9601 based adapters
+urndis*        at uhub? port ?         # Microsoft RNDIS specification
 
 # Prolific PL2301/PL2302 host-to-host adapter
 upl*   at uhub? port ?
@@ -1036,6 +1037,10 @@
 bktr* at pci? dev ? function ?
 radio* at bktr?
 
+# Conexant CX2388[0-3]-based DTV cards
+cxdtv* at pci? dev ? function ?
+#iic* at cxdtv?
+
 
 # Bluetooth Controller and Device support
 
diff -r 25080e7383aa -r ce7e45475f3a sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Wed Jul 20 20:27:41 2011 +0000
+++ b/sys/arch/i386/conf/ALL    Wed Jul 20 20:29:54 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.313 2011/07/19 21:02:23 jmcneill Exp $
+# $NetBSD: ALL,v 1.314 2011/07/20 20:29:54 jakllsch Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.313 $"
+#ident                 "ALL-$Revision: 1.314 $"
 
 maxusers       64              # estimated number of users
 
@@ -1266,6 +1266,7 @@
 kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 udav*  at uhub? port ?         # Davicom DM9601 based adapters
 url*   at uhub? port ?         # Realtek RTL8150L based adapters
+urndis* at uhub? port ?                # Microsoft RNDIS specification
 
 # USB 802.11 adapters
 atu*   at uhub? port ?         # Atmel AT76C50XX based adapters
@@ -1504,6 +1505,10 @@
 bktr*  at pci? dev ? function ?
 radio* at bktr?
 
+# Conexant CX2388[0-3]-based DTV cards
+cxdtv* at pci? dev ? function ?
+iic*   at cxdtv?
+
 isv*   at isa? port 0x3e0              # IDEC Supervision/16 image capture
 
 # Bluetooth Controller and Device support
diff -r 25080e7383aa -r ce7e45475f3a sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Jul 20 20:27:41 2011 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Jul 20 20:29:54 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1039 2011/07/19 21:02:25 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1040 2011/07/20 20:29:54 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1039 $"
+#ident                 "GENERIC-$Revision: 1.1040 $"
 
 maxusers       64              # estimated number of users
 
@@ -1202,7 +1202,7 @@
 ustir* at uhub? port ?
 irframe* at ustir?
 
-# Windows Media Center IR tranceiver
+# Windows Media Center IR transceiver
 irmce* at uhub? port ?
 cir*   at irmce?
 
@@ -1214,6 +1214,7 @@
 kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 udav*  at uhub? port ?         # Davicom DM9601 based adapters
 url*   at uhub? port ?         # Realtek RTL8150L based adapters
+urndis*        at uhub? port ?         # Microsoft RNDIS specification
 
 # USB 802.11 adapters
 atu*   at uhub? port ?         # Atmel AT76C50XX based adapters
@@ -1439,6 +1440,9 @@
 bktr*  at pci? dev ? function ?
 radio* at bktr?
 
+# Conexant CX2388[0-3]-based DTV cards
+cxdtv* at pci? dev ? function ?
+#iic*  at cxdtv?
 
 # Bluetooth Controller and Device support