Module Name: src
Committed By: jmcneill
Date: Tue Dec 28 04:02:33 UTC 2010
Modified Files:
src/sys/dev/usb: auvitek.c auvitek_board.c auvitek_video.c auvitekvar.h
Log Message:
Hauppauge HVR-850 analog should be identical to HVR-950Q, so support it too
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/auvitek.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/auvitek_board.c \
src/sys/dev/usb/auvitek_video.c src/sys/dev/usb/auvitekvar.h
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/usb/auvitek.c
diff -u src/sys/dev/usb/auvitek.c:1.2 src/sys/dev/usb/auvitek.c:1.3
--- src/sys/dev/usb/auvitek.c:1.2 Tue Dec 28 00:11:50 2010
+++ src/sys/dev/usb/auvitek.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
+/* $NetBSD: auvitek.c,v 1.3 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.3 2010/12/28 04:02:33 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -67,6 +67,8 @@
} auvitek_devices[] = {
{ 0x2040, 0x7200,
"WinTV HVR-950Q", AUVITEK_BOARD_HVR_950Q },
+ { 0x2040, 0x7240,
+ "WinTV HVR-850", AUVITEK_BOARD_HVR_850 },
};
static int
Index: src/sys/dev/usb/auvitek_board.c
diff -u src/sys/dev/usb/auvitek_board.c:1.1 src/sys/dev/usb/auvitek_board.c:1.2
--- src/sys/dev/usb/auvitek_board.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek_board.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_board.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek_board.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_board.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_board.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,11 @@
uint16_t enable;
uint8_t clkdiv;
} auvitek_board_config[] = {
+ [AUVITEK_BOARD_HVR_850] = {
+ .reset = 0x02b0,
+ .enable = 0x02f0,
+ .clkdiv = AU0828_I2C_CLKDIV_30,
+ },
[AUVITEK_BOARD_HVR_950Q] = {
.reset = 0x02b0,
.enable = 0x02f0,
@@ -97,6 +102,7 @@
uint8_t val;
switch (sc->sc_board) {
+ case AUVITEK_BOARD_HVR_850:
case AUVITEK_BOARD_HVR_950Q:
val = auvitek_read_1(sc, AU0828_REG_GPIO2_OUTEN);
val &= ~2;
Index: src/sys/dev/usb/auvitek_video.c
diff -u src/sys/dev/usb/auvitek_video.c:1.1 src/sys/dev/usb/auvitek_video.c:1.2
--- src/sys/dev/usb/auvitek_video.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek_video.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -470,7 +470,7 @@
au8522_set_input(sc->sc_au8522, vinput, ainput);
- /* XXX HVR-950Q specific */
+ /* XXX HVR-850/950Q specific */
r = auvitek_read_1(sc, AU0828_REG_GPIO1_OUTEN);
if (ainput == AU8522_AINPUT_NONE)
r |= 0x10;
Index: src/sys/dev/usb/auvitekvar.h
diff -u src/sys/dev/usb/auvitekvar.h:1.1 src/sys/dev/usb/auvitekvar.h:1.2
--- src/sys/dev/usb/auvitekvar.h:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitekvar.h Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitekvar.h,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitekvar.h,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -43,6 +43,7 @@
struct auvitek_softc;
enum auvitek_board {
+ AUVITEK_BOARD_HVR_850,
AUVITEK_BOARD_HVR_950Q,
};
