From 854cfcf50a3ad88c09e2e40a3fbbbe22737efbcc Mon Sep 17 00:00:00 2001 From: Martin Mueller Date: Thu, 6 Dec 2007 23:49:13 +0000 Subject: [PATCH] add support for kernel 2.6.18-5-686 --- .../videolizer/wis-go7007-linux/README-paparazzi | 6 ++++++ .../videolizer/wis-go7007-linux/kernel/go7007-usb.c | 8 ++++---- .../videolizer/wis-go7007-linux/kernel/go7007-v4l2.c | 2 +- .../videolizer/wis-go7007-linux/kernel/wis-saa7113.c | 4 +++- .../videolizer/wis-go7007-linux/kernel/wis-saa7115.c | 2 ++ .../videolizer/wis-go7007-linux/kernel/wis-tw2804.c | 2 ++ .../videolizer/wis-go7007-linux/kernel/wis-tw9903.c | 2 ++ .../videolizer/wis-go7007-linux/kernel/wis-uda1342.c | 8 ++++---- 8 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 sw/in_progress/videolizer/wis-go7007-linux/README-paparazzi diff --git a/sw/in_progress/videolizer/wis-go7007-linux/README-paparazzi b/sw/in_progress/videolizer/wis-go7007-linux/README-paparazzi new file mode 100644 index 0000000000..af9f2c55ea --- /dev/null +++ b/sw/in_progress/videolizer/wis-go7007-linux/README-paparazzi @@ -0,0 +1,6 @@ +This is the 0.9.8 driver for the Plextor M402U USB video converter. It contains +patches for the Debian 4.0 linux-2.6.18-5-686 Get the original at +http://oss.wischip.com/ + +Attention: If used with the v4l-dvb-experimental this driver needs to be +recompiled with the correct modsym-versions! \ No newline at end of file diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-usb.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-usb.c index 2496d537cd..e66862ba7d 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-usb.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-usb.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "go7007-priv.h" #include "wis-i2c.h" @@ -225,17 +225,17 @@ static struct go7007_usb_board board_px_tv402u = { .inputs = { { .video_input = 1, - .audio_input = AUDIO_EXTERN, + .audio_input = TVAUDIO_INPUT_EXTERN, .name = "Composite", }, { .video_input = 8, - .audio_input = AUDIO_EXTERN, + .audio_input = TVAUDIO_INPUT_EXTERN, .name = "S-Video", }, { .video_input = 3, - .audio_input = AUDIO_TUNER, + .audio_input = TVAUDIO_INPUT_TUNER, .name = "Tuner", }, }, diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-v4l2.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-v4l2.c index cf8d6a89db..9bcfca5504 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-v4l2.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/go7007-v4l2.c @@ -939,7 +939,7 @@ static int go7007_do_ioctl(struct inode *inode, struct file *file, if (go->i2c_adapter_online) { i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT, &go->board_info->inputs[*input].video_input); - i2c_clients_command(&go->i2c_adapter, AUDC_SET_INPUT, + i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO, &go->board_info->inputs[*input].audio_input); } return 0; diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7113.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7113.c index b24ab5ba01..aa3b4b5af8 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7113.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7113.c @@ -20,7 +20,9 @@ #include #include #include -#include +#include +#include +#include #include "wis-i2c.h" diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7115.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7115.c index 7930c2ce3c..df46e13492 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7115.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-saa7115.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include "wis-i2c.h" diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw2804.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw2804.c index 4ef69c1cb7..49400549d1 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw2804.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw2804.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include "wis-i2c.h" diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw9903.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw9903.c index e4c77e319c..84916ef800 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw9903.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-tw9903.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include "wis-i2c.h" diff --git a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-uda1342.c b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-uda1342.c index efb36f3e7a..fcc2a3effe 100644 --- a/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-uda1342.c +++ b/sw/in_progress/videolizer/wis-go7007-linux/kernel/wis-uda1342.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) #include #endif @@ -38,15 +38,15 @@ static int wis_uda1342_command(struct i2c_client *client, unsigned int cmd, void *arg) { switch (cmd) { - case AUDC_SET_INPUT: + case VIDIOC_S_AUDIO: { int *inp = arg; switch (*inp) { - case AUDIO_TUNER: + case TVAUDIO_INPUT_TUNER: write_reg(client, 0x00, 0x1441); /* select input 2 */ break; - case AUDIO_EXTERN: + case TVAUDIO_INPUT_EXTERN: write_reg(client, 0x00, 0x1241); /* select input 1 */ break; default: