Module Name: src
Committed By: jakllsch
Date: Wed Jul 20 20:29:54 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
Add cxdtv(4) and urndis(4). Also, two slight cosmetic changes.
To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.313 -r1.314 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1039 -r1.1040 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.323 src/sys/arch/amd64/conf/GENERIC:1.324
--- src/sys/arch/amd64/conf/GENERIC:1.323 Wed Jul 13 07:52:49 2011
+++ src/sys/arch/amd64/conf/GENERIC Wed Jul 20 20:29:54 2011
@@ -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
-url* at uhub? port ? # Realtek RTL8150L 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
# 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
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.313 src/sys/arch/i386/conf/ALL:1.314
--- src/sys/arch/i386/conf/ALL:1.313 Tue Jul 19 21:02:23 2011
+++ src/sys/arch/i386/conf/ALL Wed Jul 20 20:29:54 2011
@@ -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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1039 src/sys/arch/i386/conf/GENERIC:1.1040
--- src/sys/arch/i386/conf/GENERIC:1.1039 Tue Jul 19 21:02:25 2011
+++ src/sys/arch/i386/conf/GENERIC Wed Jul 20 20:29:54 2011
@@ -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
