diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 4115938a1731..31b23f0db051 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include <linux/videodev.h> | 28 | #include <linux/videodev.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <media/ir-kbd-i2c.h> | ||
30 | 31 | ||
31 | /* Boards supported by driver */ | 32 | /* Boards supported by driver */ |
32 | 33 | ||
@@ -53,19 +54,12 @@ | |||
53 | /* number of buffers for isoc transfers */ | 54 | /* number of buffers for isoc transfers */ |
54 | #define EM2820_NUM_BUFS 5 | 55 | #define EM2820_NUM_BUFS 5 |
55 | 56 | ||
56 | /* number of packets for each buffer */ | 57 | /* number of packets for each buffer |
57 | // windows requests only 40 packets .. so we better do the same | 58 | windows requests only 40 packets .. so we better do the same |
58 | // this is what I found out for all alternate numbers there! | 59 | this is what I found out for all alternate numbers there! |
59 | 60 | */ | |
60 | #define EM2820_NUM_PACKETS 40 | 61 | #define EM2820_NUM_PACKETS 40 |
61 | 62 | ||
62 | /* packet size for each packet */ | ||
63 | /* no longer needed: read from endpoint descriptor */ | ||
64 | //#define EM2820_MAX_PACKET_SIZE 3072 //7 | ||
65 | //#define EM2820_MAX_PACKET_SIZE 2892 //6 | ||
66 | //#define EM2820_MAX_PACKET_SIZE 2580 //5 | ||
67 | //#define EM2820_MAX_PACKET_SIZE 1448 //2 | ||
68 | |||
69 | /* default alternate; 0 means choose the best */ | 63 | /* default alternate; 0 means choose the best */ |
70 | #define EM2820_PINOUT 0 | 64 | #define EM2820_PINOUT 0 |
71 | #define EM2820_MAX_ALT 7 | 65 | #define EM2820_MAX_ALT 7 |
@@ -292,6 +286,10 @@ void em2820_i2c_call_clients(struct em2820 *dev, unsigned int cmd, void *arg); | |||
292 | int em2820_i2c_register(struct em2820 *dev); | 286 | int em2820_i2c_register(struct em2820 *dev); |
293 | int em2820_i2c_unregister(struct em2820 *dev); | 287 | int em2820_i2c_unregister(struct em2820 *dev); |
294 | 288 | ||
289 | /* Provided by em2820-input.c */ | ||
290 | |||
291 | void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir); | ||
292 | |||
295 | /* Provided by em2820-core.c */ | 293 | /* Provided by em2820-core.c */ |
296 | 294 | ||
297 | void em2820_print_ioctl(char *name, unsigned int cmd); | 295 | void em2820_print_ioctl(char *name, unsigned int cmd); |