Gentoo Attachment #107744 for bug #157021

View | Details | Raw Unified
Collapse All | Expand All

(-) a/wis-go7007-linux-0.9.8/kernel/go7007-driver.c (+2 lines)

Lines 18-24	Link Here

#include <linux/module.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/init.h>

#include <linux/init.h>

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)

#include <linux/config.h>

#include <linux/config.h>

#endif

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

(-) a/wis-go7007-linux-0.9.8/kernel/go7007-fw.c (+3 lines)

Lines 26-32	Link Here

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/version.h>

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)

#include <linux/config.h>

#include <linux/config.h>

#endif

#include <linux/time.h>

#include <linux/time.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/device.h>

#include <linux/device.h>

(-) a/wis-go7007-linux-0.9.8/kernel/go7007-i2c.c (-1 / +3 lines)

Lines 15-23	Link Here

 * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

*/

*/

#include <linux/version.h>

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)

#include <linux/config.h>

#include <linux/config.h>

#endif

#include <linux/module.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/sched.h>

(-) a/wis-go7007-linux-0.9.8/kernel/go7007-usb.c (-4 / +4 lines)

Lines 27-33	Link Here

#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>

#include <media/audiochip.h>

#include <media/tvaudio.h>

#include "go7007-priv.h"

#include "go7007-priv.h"

#include "wis-i2c.h"

#include "wis-i2c.h"

Lines 225-241	Link Here

		.inputs 	 = {

		.inputs 	 = {

				.video_input	= 1,

				.video_input	= 1,

				.audio_input	= AUDIO_EXTERN,

                .audio_input	= TVAUDIO_INPUT_EXTERN,

				.name		= "Composite",

				.name		= "Composite",

},

},

				.video_input	= 8,

				.video_input	= 8,

				.audio_input	= AUDIO_EXTERN,

				.audio_input	= TVAUDIO_INPUT_EXTERN,

				.name		= "S-Video",

				.name		= "S-Video",

},

},

				.video_input	= 3,

				.video_input	= 3,

				.audio_input	= AUDIO_TUNER,

				.audio_input	= TVAUDIO_INPUT_TUNER,

				.name		= "Tuner",

				.name		= "Tuner",

},

},

},

},

(-) a/wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c (-2 / +4 lines)

Lines 17-24	Link Here

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/config.h>

#include <linux/version.h>

#include <linux/version.h>

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)

#include <linux/config.h>

#endif

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

Lines 939-945	Link Here

		if (go->i2c_adapter_online) {

		if (go->i2c_adapter_online) {

			i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT,

			i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT,

				&go->board_info->inputs[*input].video_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);

				&go->board_info->inputs[*input].audio_input);

		return 0;

		return 0;

(-) a/wis-go7007-linux-0.9.8/kernel/snd-go7007.c (-1 / +3 lines)

Lines 20-26	Link Here

#include <linux/version.h>

#include <linux/version.h>

#include <linux/moduleparam.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/init.h>

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)

#include <linux/config.h>

#include <linux/config.h>

#endif

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

Lines 305-311	Link Here

	struct go7007_snd *gosnd = go->snd_context;

	struct go7007_snd *gosnd = go->snd_context;

	snd_card_disconnect(gosnd->card);

	snd_card_disconnect(gosnd->card);

	snd_card_free_in_thread(gosnd->card);

	snd_card_free_when_closed(gosnd->card);

	return 0;

	return 0;

EXPORT_SYMBOL(go7007_snd_remove);

EXPORT_SYMBOL(go7007_snd_remove);

(-) a/wis-go7007-linux-0.9.8/kernel/wis-saa7113.c (+1 lines)

Lines 21-26	Link Here

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/videodev.h>

#include <linux/video_decoder.h>

#include <linux/video_decoder.h>

#include <linux/ioctl.h>

#include "wis-i2c.h"

#include "wis-i2c.h"

(-) a/wis-go7007-linux-0.9.8/kernel/wis-saa7115.c (+1 lines)

Lines 21-26	Link Here

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/videodev.h>

#include <linux/video_decoder.h>

#include <linux/video_decoder.h>

#include <linux/ioctl.h>

#include "wis-i2c.h"

#include "wis-i2c.h"

(-) a/wis-go7007-linux-0.9.8/kernel/wis-tw2804.c (+1 lines)

Lines 21-26	Link Here

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/videodev.h>

#include <linux/video_decoder.h>

#include <linux/video_decoder.h>

#include <linux/ioctl.h>

#include "wis-i2c.h"

#include "wis-i2c.h"

(-) a/wis-go7007-linux-0.9.8/kernel/wis-tw9903.c (+1 lines)

Lines 21-26	Link Here

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/videodev.h>

#include <linux/video_decoder.h>

#include <linux/video_decoder.h>

#include <linux/ioctl.h>

#include "wis-i2c.h"

#include "wis-i2c.h"

(-) a/wis-go7007-linux-0.9.8/kernel/wis-uda1342.c (-4 / +4 lines)

Lines 20-26	Link Here

#include <linux/version.h>

#include <linux/version.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/videodev.h>

#include <linux/videodev.h>

#include <media/audiochip.h>

#include <media/tvaudio.h>

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)

#include <media/v4l2-common.h>

#include <media/v4l2-common.h>

#endif

#endif

Lines 38-52	Link Here

				unsigned int cmd, void *arg)

				unsigned int cmd, void *arg)

	switch (cmd) {

	switch (cmd) {

	case AUDC_SET_INPUT:

	case VIDIOC_S_AUDIO:

		int *inp = arg;

		int *inp = arg;

		switch (*inp) {

		switch (*inp) {

		case AUDIO_TUNER:

		case TVAUDIO_INPUT_TUNER:

			write_reg(client, 0x00, 0x1441); /* select input 2 */

			write_reg(client, 0x00, 0x1441); /* select input 2 */

			break;

			break;

		case AUDIO_EXTERN:

		case TVAUDIO_INPUT_EXTERN:

			write_reg(client, 0x00, 0x1241); /* select input 1 */

			write_reg(client, 0x00, 0x1241); /* select input 1 */

			break;

			break;

		default:

		default:

Attachment #107744: Updated patch for module to compile in 2.6.19 kernel for bug #157021