diff options
Diffstat (limited to 'drivers/media/dvb/ttpci')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.h | 1 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.c | 12 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.h | 5 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_v4l.c | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h index 5070e0523da7..ee6237b926bf 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/dvb/ttpci/av7110.h | |||
@@ -274,7 +274,6 @@ extern void av7110_ir_exit (void); | |||
274 | extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); | 274 | extern int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val); |
275 | extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); | 275 | extern u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg); |
276 | extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); | 276 | extern int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val); |
277 | extern int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val); | ||
278 | 277 | ||
279 | 278 | ||
280 | extern int av7110_init_analog_module(struct av7110 *av7110); | 279 | extern int av7110_init_analog_module(struct av7110 *av7110); |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index bd6e5ea4aefe..7c95d63f7249 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
@@ -104,7 +104,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) | |||
104 | 104 | ||
105 | 105 | ||
106 | /* av7110 ARM core boot stuff */ | 106 | /* av7110 ARM core boot stuff */ |
107 | 107 | #if 0 | |
108 | void av7110_reset_arm(struct av7110 *av7110) | 108 | void av7110_reset_arm(struct av7110 *av7110) |
109 | { | 109 | { |
110 | saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO); | 110 | saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO); |
@@ -124,7 +124,7 @@ void av7110_reset_arm(struct av7110 *av7110) | |||
124 | av7110->arm_ready = 1; | 124 | av7110->arm_ready = 1; |
125 | dprintk(1, "reset ARM\n"); | 125 | dprintk(1, "reset ARM\n"); |
126 | } | 126 | } |
127 | 127 | #endif /* 0 */ | |
128 | 128 | ||
129 | static int waitdebi(struct av7110 *av7110, int adr, int state) | 129 | static int waitdebi(struct av7110 *av7110, int adr, int state) |
130 | { | 130 | { |
@@ -335,7 +335,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags) | |||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) | 338 | static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) |
339 | { | 339 | { |
340 | int i; | 340 | int i; |
341 | unsigned long start; | 341 | unsigned long start; |
@@ -455,7 +455,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) | 458 | static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) |
459 | { | 459 | { |
460 | int ret; | 460 | int ret; |
461 | 461 | ||
@@ -500,6 +500,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) | |||
500 | return ret; | 500 | return ret; |
501 | } | 501 | } |
502 | 502 | ||
503 | #if 0 | ||
503 | int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) | 504 | int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) |
504 | { | 505 | { |
505 | int i, ret; | 506 | int i, ret; |
@@ -521,6 +522,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) | |||
521 | printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret); | 522 | printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret); |
522 | return ret; | 523 | return ret; |
523 | } | 524 | } |
525 | #endif /* 0 */ | ||
524 | 526 | ||
525 | int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, | 527 | int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, |
526 | int request_buf_len, u16 *reply_buf, int reply_buf_len) | 528 | int request_buf_len, u16 *reply_buf, int reply_buf_len) |
@@ -593,7 +595,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, | |||
593 | return 0; | 595 | return 0; |
594 | } | 596 | } |
595 | 597 | ||
596 | int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length) | 598 | static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length) |
597 | { | 599 | { |
598 | int ret; | 600 | int ret; |
599 | ret = av7110_fw_request(av7110, &tag, 0, buf, length); | 601 | ret = av7110_fw_request(av7110, &tag, 0, buf, length); |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h index bf901c624682..52061e17c6dd 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.h +++ b/drivers/media/dvb/ttpci/av7110_hw.h | |||
@@ -364,7 +364,6 @@ enum av7110_command_type { | |||
364 | 364 | ||
365 | 365 | ||
366 | 366 | ||
367 | extern void av7110_reset_arm(struct av7110 *av7110); | ||
368 | extern int av7110_bootarm(struct av7110 *av7110); | 367 | extern int av7110_bootarm(struct av7110 *av7110); |
369 | extern int av7110_firmversion(struct av7110 *av7110); | 368 | extern int av7110_firmversion(struct av7110 *av7110); |
370 | #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000) | 369 | #define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000) |
@@ -373,12 +372,8 @@ extern int av7110_firmversion(struct av7110 *av7110); | |||
373 | 372 | ||
374 | extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags); | 373 | extern int av7110_wait_msgstate(struct av7110 *av7110, u16 flags); |
375 | extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...); | 374 | extern int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...); |
376 | extern int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length); | ||
377 | extern int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length); | ||
378 | extern int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len); | ||
379 | extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, | 375 | extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, |
380 | int request_buf_len, u16 *reply_buf, int reply_buf_len); | 376 | int request_buf_len, u16 *reply_buf, int reply_buf_len); |
381 | extern int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* Buff, s16 length); | ||
382 | 377 | ||
383 | 378 | ||
384 | /* DEBI (saa7146 data extension bus interface) access */ | 379 | /* DEBI (saa7146 data extension bus interface) access */ |
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index 13aa7a427580..62c905a2d17c 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c | |||
@@ -52,7 +52,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) | 55 | static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) |
56 | { | 56 | { |
57 | u8 msg1[3] = { dev, reg >> 8, reg & 0xff }; | 57 | u8 msg1[3] = { dev, reg >> 8, reg & 0xff }; |
58 | u8 msg2[2]; | 58 | u8 msg2[2]; |