aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c28
-rw-r--r--drivers/media/video/em28xx/em28xx-i2c.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-input.c52
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c10
-rw-r--r--drivers/media/video/em28xx/em28xx.h12
6 files changed, 55 insertions, 55 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 59f8fa0bea60..f0860532575a 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2,8 +2,8 @@
2 em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices 2 em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
3 3
4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> 4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
5 Ludovico Cavedon <cavedon@sssup.it> 5 Ludovico Cavedon <cavedon@sssup.it>
6 Mauro Carvalho Chehab <mchehab@brturbo.com.br> 6 Mauro Carvalho Chehab <mchehab@brturbo.com.br>
7 7
8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> 8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
9 9
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index f7b8fb035c9e..227a47d6e4bd 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -2,8 +2,8 @@
2 em2820-core.c - driver for Empia EM2800/EM2820/2840 USB video capture devices 2 em2820-core.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
3 3
4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> 4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
5 Ludovico Cavedon <cavedon@sssup.it> 5 Ludovico Cavedon <cavedon@sssup.it>
6 Mauro Carvalho Chehab <mchehab@brturbo.com.br> 6 Mauro Carvalho Chehab <mchehab@brturbo.com.br>
7 7
8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> 8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
9 9
@@ -33,32 +33,32 @@
33 33
34/* #define ENABLE_DEBUG_ISOC_FRAMES */ 34/* #define ENABLE_DEBUG_ISOC_FRAMES */
35 35
36unsigned int core_debug = 0; 36unsigned int core_debug;
37module_param(core_debug,int,0644); 37module_param(core_debug,int,0644);
38MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 38MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
39 39
40#define em2820_coredbg(fmt, arg...) do {\ 40#define em2820_coredbg(fmt, arg...) do {\
41 if (core_debug) \ 41 if (core_debug) \
42 printk(KERN_INFO "%s %s :"fmt, \ 42 printk(KERN_INFO "%s %s :"fmt, \
43 dev->name, __FUNCTION__ , ##arg); } while (0) 43 dev->name, __FUNCTION__ , ##arg); } while (0)
44 44
45unsigned int reg_debug = 0; 45unsigned int reg_debug;
46module_param(reg_debug,int,0644); 46module_param(reg_debug,int,0644);
47MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); 47MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
48 48
49#define em2820_regdbg(fmt, arg...) do {\ 49#define em2820_regdbg(fmt, arg...) do {\
50 if (reg_debug) \ 50 if (reg_debug) \
51 printk(KERN_INFO "%s %s :"fmt, \ 51 printk(KERN_INFO "%s %s :"fmt, \
52 dev->name, __FUNCTION__ , ##arg); } while (0) 52 dev->name, __FUNCTION__ , ##arg); } while (0)
53 53
54unsigned int isoc_debug = 0; 54unsigned int isoc_debug;
55module_param(isoc_debug,int,0644); 55module_param(isoc_debug,int,0644);
56MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]"); 56MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
57 57
58#define em2820_isocdbg(fmt, arg...) do {\ 58#define em2820_isocdbg(fmt, arg...) do {\
59 if (isoc_debug) \ 59 if (isoc_debug) \
60 printk(KERN_INFO "%s %s :"fmt, \ 60 printk(KERN_INFO "%s %s :"fmt, \
61 dev->name, __FUNCTION__ , ##arg); } while (0) 61 dev->name, __FUNCTION__ , ##arg); } while (0)
62 62
63static int alt = EM2820_PINOUT; 63static int alt = EM2820_PINOUT;
64module_param(alt, int, 0644); 64module_param(alt, int, 0644);
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index f6bfc038777e..bfe0d8795b6d 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -2,8 +2,8 @@
2 em2820-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices 2 em2820-i2c.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
3 3
4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> 4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
5 Ludovico Cavedon <cavedon@sssup.it> 5 Ludovico Cavedon <cavedon@sssup.it>
6 Mauro Carvalho Chehab <mchehab@brturbo.com.br> 6 Mauro Carvalho Chehab <mchehab@brturbo.com.br>
7 7
8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> 8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
9 9
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index ba367a9796e7..8681a793a0bf 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -43,34 +43,34 @@ MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
43/* ---------------------------------------------------------------------- */ 43/* ---------------------------------------------------------------------- */
44 44
45static IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE] = { 45static IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE] = {
46 [ 0x01 ] = KEY_CHANNEL, 46 [ 0x01 ] = KEY_CHANNEL,
47 [ 0x02 ] = KEY_SELECT, 47 [ 0x02 ] = KEY_SELECT,
48 [ 0x03 ] = KEY_MUTE, 48 [ 0x03 ] = KEY_MUTE,
49 [ 0x04 ] = KEY_POWER, 49 [ 0x04 ] = KEY_POWER,
50 [ 0x05 ] = KEY_KP1, 50 [ 0x05 ] = KEY_KP1,
51 [ 0x06 ] = KEY_KP2, 51 [ 0x06 ] = KEY_KP2,
52 [ 0x07 ] = KEY_KP3, 52 [ 0x07 ] = KEY_KP3,
53 [ 0x08 ] = KEY_CHANNELUP, 53 [ 0x08 ] = KEY_CHANNELUP,
54 [ 0x09 ] = KEY_KP4, 54 [ 0x09 ] = KEY_KP4,
55 [ 0x0a ] = KEY_KP5, 55 [ 0x0a ] = KEY_KP5,
56 [ 0x0b ] = KEY_KP6, 56 [ 0x0b ] = KEY_KP6,
57 [ 0x0c ] = KEY_CHANNELDOWN, 57 [ 0x0c ] = KEY_CHANNELDOWN,
58 [ 0x0d ] = KEY_KP7, 58 [ 0x0d ] = KEY_KP7,
59 [ 0x0e ] = KEY_KP8, 59 [ 0x0e ] = KEY_KP8,
60 [ 0x0f ] = KEY_KP9, 60 [ 0x0f ] = KEY_KP9,
61 [ 0x10 ] = KEY_VOLUMEUP, 61 [ 0x10 ] = KEY_VOLUMEUP,
62 [ 0x11 ] = KEY_KP0, 62 [ 0x11 ] = KEY_KP0,
63 [ 0x12 ] = KEY_MENU, 63 [ 0x12 ] = KEY_MENU,
64 [ 0x13 ] = KEY_PRINT, 64 [ 0x13 ] = KEY_PRINT,
65 [ 0x14 ] = KEY_VOLUMEDOWN, 65 [ 0x14 ] = KEY_VOLUMEDOWN,
66 [ 0x16 ] = KEY_PAUSE, 66 [ 0x16 ] = KEY_PAUSE,
67 [ 0x18 ] = KEY_RECORD, 67 [ 0x18 ] = KEY_RECORD,
68 [ 0x19 ] = KEY_REWIND, 68 [ 0x19 ] = KEY_REWIND,
69 [ 0x1a ] = KEY_PLAY, 69 [ 0x1a ] = KEY_PLAY,
70 [ 0x1b ] = KEY_FORWARD, 70 [ 0x1b ] = KEY_FORWARD,
71 [ 0x1c ] = KEY_BACKSPACE, 71 [ 0x1c ] = KEY_BACKSPACE,
72 [ 0x1e ] = KEY_STOP, 72 [ 0x1e ] = KEY_STOP,
73 [ 0x40 ] = KEY_ZOOM, 73 [ 0x40 ] = KEY_ZOOM,
74}; 74};
75 75
76/* ----------------------------------------------------------------------- */ 76/* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 048ad1d77bab..e5066d05697e 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2,8 +2,8 @@
2 em2820-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices 2 em2820-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
3 3
4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> 4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
5 Ludovico Cavedon <cavedon@sssup.it> 5 Ludovico Cavedon <cavedon@sssup.it>
6 Mauro Carvalho Chehab <mchehab@brturbo.com.br> 6 Mauro Carvalho Chehab <mchehab@brturbo.com.br>
7 7
8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> 8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
9 9
@@ -42,9 +42,9 @@
42#define EM2820_VERSION_CODE KERNEL_VERSION(0, 0, 1) 42#define EM2820_VERSION_CODE KERNEL_VERSION(0, 0, 1)
43 43
44#define em2820_videodbg(fmt, arg...) do {\ 44#define em2820_videodbg(fmt, arg...) do {\
45 if (video_debug) \ 45 if (video_debug) \
46 printk(KERN_INFO "%s %s :"fmt, \ 46 printk(KERN_INFO "%s %s :"fmt, \
47 dev->name, __FUNCTION__ , ##arg); } while (0) 47 dev->name, __FUNCTION__ , ##arg); } while (0)
48 48
49MODULE_AUTHOR(DRIVER_AUTHOR); 49MODULE_AUTHOR(DRIVER_AUTHOR);
50MODULE_DESCRIPTION(DRIVER_DESC); 50MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index a11df04a8c3d..c48354062eb6 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -2,8 +2,8 @@
2 em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices 2 em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
3 3
4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com> 4 Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
5 Ludovico Cavedon <cavedon@sssup.it> 5 Ludovico Cavedon <cavedon@sssup.it>
6 Mauro Carvalho Chehab <mchehab@brturbo.com.br> 6 Mauro Carvalho Chehab <mchehab@brturbo.com.br>
7 7
8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de> 8 Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
9 9
@@ -390,17 +390,17 @@ extern const unsigned int em2820_bcount;
390/* printk macros */ 390/* printk macros */
391 391
392#define em2820_err(fmt, arg...) do {\ 392#define em2820_err(fmt, arg...) do {\
393 printk(KERN_ERR fmt , ##arg); } while (0) 393 printk(KERN_ERR fmt , ##arg); } while (0)
394 394
395#define em2820_errdev(fmt, arg...) do {\ 395#define em2820_errdev(fmt, arg...) do {\
396 printk(KERN_ERR "%s: "fmt,\ 396 printk(KERN_ERR "%s: "fmt,\
397 dev->name , ##arg); } while (0) 397 dev->name , ##arg); } while (0)
398 398
399#define em2820_info(fmt, arg...) do {\ 399#define em2820_info(fmt, arg...) do {\
400 printk(KERN_INFO "%s: "fmt,\ 400 printk(KERN_INFO "%s: "fmt,\
401 dev->name , ##arg); } while (0) 401 dev->name , ##arg); } while (0)
402#define em2820_warn(fmt, arg...) do {\ 402#define em2820_warn(fmt, arg...) do {\
403 printk(KERN_WARNING "%s: "fmt,\ 403 printk(KERN_WARNING "%s: "fmt,\
404 dev->name , ##arg); } while (0) 404 dev->name , ##arg); } while (0)
405 405
406inline static int em2820_audio_source(struct em2820 *dev, int input) 406inline static int em2820_audio_source(struct em2820 *dev, int input)