Module Name: src
Committed By: jmcneill
Date: Sun Jan 15 15:05:07 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
add & enable digital tv capture support
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1063 -r1.1064 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.343 src/sys/arch/amd64/conf/GENERIC:1.344
--- src/sys/arch/amd64/conf/GENERIC:1.343 Fri Jan 13 16:05:14 2012
+++ src/sys/arch/amd64/conf/GENERIC Sun Jan 15 15:05:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.343 2012/01/13 16:05:14 cegger Exp $
+# $NetBSD: GENERIC,v 1.344 2012/01/15 15:05:07 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.343 $"
+#ident "GENERIC-$Revision: 1.344 $"
maxusers 64 # estimated number of users
@@ -1048,9 +1048,15 @@ midi* at pcppi? # MIDI interface to the
# Video capture devices
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
-uvideo* at uhub? # USB Video Class capture devices
-video* at videobus?
+auvitek* at uhub? # Auvitek AU0828 USB TV
+coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
+cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
+emdtv* at uhub? # Empia EM28xx USB TV
+pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
+uvideo* at uhub? # USB Video Class capture devices
+
+video* at videobus? # Analog capture interface
+dtv* at dtvbus? # Digital capture interface
# TV cards
@@ -1059,10 +1065,6 @@ video* at videobus?
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/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1063 src/sys/arch/i386/conf/GENERIC:1.1064
--- src/sys/arch/i386/conf/GENERIC:1.1063 Sat Jan 14 12:14:28 2012
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 15 15:05:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1063 2012/01/14 12:14:28 tron Exp $
+# $NetBSD: GENERIC,v 1.1064 2012/01/15 15:05:06 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1063 $"
+#ident "GENERIC-$Revision: 1.1064 $"
maxusers 64 # estimated number of users
@@ -1431,9 +1431,15 @@ midi* at pcppi? # MIDI interface to the
# Video capture devices
-pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
-uvideo* at uhub? # USB Video Class capture devices
-video* at videobus?
+auvitek* at uhub? # Auvitek AU0828 USB TV
+coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
+cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
+emdtv* at uhub? # Empia EM28xx USB TV
+pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
+uvideo* at uhub? # USB Video Class capture devices
+
+video* at videobus? # Analog capture interface
+dtv* at dtvbus? # Digital capture interface
# TV cards
@@ -1442,9 +1448,6 @@ video* at videobus?
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
