aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/bt8xx/dst.c8
-rw-r--r--drivers/media/dvb/frontends/cx24110.c1
-rw-r--r--drivers/media/dvb/frontends/dvb_dummy_fe.c4
-rw-r--r--drivers/media/dvb/frontends/l64781.c3
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c3
-rw-r--r--drivers/media/dvb/frontends/mt312.c3
-rw-r--r--drivers/media/dvb/frontends/or51132.c3
-rw-r--r--drivers/media/video/arv.c12
-rw-r--r--drivers/media/video/bttv-driver.c6
-rw-r--r--drivers/media/video/indycam.c262
-rw-r--r--drivers/media/video/indycam.h88
-rw-r--r--drivers/media/video/msp3400.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-tvaudio.c4
-rw-r--r--drivers/media/video/saa7191.c533
-rw-r--r--drivers/media/video/saa7191.h172
-rw-r--r--drivers/media/video/v4l1-compat.c6
-rw-r--r--drivers/media/video/videocodec.c6
-rw-r--r--drivers/media/video/videodev.c3
-rw-r--r--drivers/media/video/vino.c1170
-rw-r--r--drivers/media/video/zoran_card.c14
-rw-r--r--drivers/media/video/zoran_driver.c4
21 files changed, 1578 insertions, 731 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 34a837a1abf4..b3c9d7327ac1 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1331,9 +1331,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
1331{ 1331{
1332 /* check if the ASIC is there */ 1332 /* check if the ASIC is there */
1333 if (dst_probe(state) < 0) { 1333 if (dst_probe(state) < 0) {
1334 if (state) 1334 kfree(state);
1335 kfree(state);
1336
1337 return NULL; 1335 return NULL;
1338 } 1336 }
1339 /* determine settings based on type */ 1337 /* determine settings based on type */
@@ -1349,9 +1347,7 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
1349 break; 1347 break;
1350 default: 1348 default:
1351 dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist."); 1349 dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
1352 if (state) 1350 kfree(state);
1353 kfree(state);
1354
1355 return NULL; 1351 return NULL;
1356 } 1352 }
1357 1353
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index d4b97989e3ed..654d7dc879d9 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -27,6 +27,7 @@
27#include <linux/module.h> 27#include <linux/module.h>
28#include <linux/moduleparam.h> 28#include <linux/moduleparam.h>
29#include <linux/init.h> 29#include <linux/init.h>
30#include <linux/jiffies.h>
30 31
31#include "dvb_frontend.h" 32#include "dvb_frontend.h"
32#include "cx24110.h" 33#include "cx24110.h"
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index 794be520d590..645946a992d9 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -148,7 +148,7 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()
148 return &state->frontend; 148 return &state->frontend;
149 149
150error: 150error:
151 if (state) kfree(state); 151 kfree(state);
152 return NULL; 152 return NULL;
153} 153}
154 154
@@ -171,7 +171,7 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()
171 return &state->frontend; 171 return &state->frontend;
172 172
173error: 173error:
174 if (state) kfree(state); 174 kfree(state);
175 return NULL; 175 return NULL;
176} 176}
177 177
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index faaad1ae8559..19b4bf7c21a7 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -559,7 +559,8 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,
559 return &state->frontend; 559 return &state->frontend;
560 560
561error: 561error:
562 if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */ 562 if (reg0x3e >= 0)
563 l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */
563 kfree(state); 564 kfree(state);
564 return NULL; 565 return NULL;
565} 566}
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 8dde72bd1046..7852b83b82d4 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -731,8 +731,7 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
731 return &state->frontend; 731 return &state->frontend;
732 732
733error: 733error:
734 if (state) 734 kfree(state);
735 kfree(state);
736 dprintk("%s: ERROR\n",__FUNCTION__); 735 dprintk("%s: ERROR\n",__FUNCTION__);
737 return NULL; 736 return NULL;
738} 737}
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index e38454901dd1..9c67f406d581 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -677,8 +677,7 @@ struct dvb_frontend* mt312_attach(const struct mt312_config* config,
677 return &state->frontend; 677 return &state->frontend;
678 678
679error: 679error:
680 if (state) 680 kfree(state);
681 kfree(state);
682 return NULL; 681 return NULL;
683} 682}
684 683
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 817b044c7fd1..fc74c40d6477 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -577,8 +577,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
577 return &state->frontend; 577 return &state->frontend;
578 578
579error: 579error:
580 if (state) 580 kfree(state);
581 kfree(state);
582 return NULL; 581 return NULL;
583} 582}
584 583
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 87fd3a7bb392..0823ddaf7004 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -865,10 +865,8 @@ out_dev:
865 865
866out_irq: 866out_irq:
867#endif 867#endif
868 for (i = 0; i < MAX_AR_HEIGHT; i++) { 868 for (i = 0; i < MAX_AR_HEIGHT; i++)
869 if (ar->frame[i]) 869 kfree(ar->frame[i]);
870 kfree(ar->frame[i]);
871 }
872 870
873out_line_buff: 871out_line_buff:
874#if USE_INT 872#if USE_INT
@@ -899,10 +897,8 @@ static void __exit ar_cleanup_module(void)
899#if USE_INT 897#if USE_INT
900 free_irq(M32R_IRQ_INT3, ar); 898 free_irq(M32R_IRQ_INT3, ar);
901#endif 899#endif
902 for (i = 0; i < MAX_AR_HEIGHT; i++) { 900 for (i = 0; i < MAX_AR_HEIGHT; i++)
903 if (ar->frame[i]) 901 kfree(ar->frame[i]);
904 kfree(ar->frame[i]);
905 }
906#if USE_INT 902#if USE_INT
907 kfree(ar->line_buff); 903 kfree(ar->line_buff);
908#endif 904#endif
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index c062a017491e..d538a994ff04 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -1951,8 +1951,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
1951 } 1951 }
1952 1952
1953 down(&fh->cap.lock); 1953 down(&fh->cap.lock);
1954 if (fh->ov.clips) 1954 kfree(fh->ov.clips);
1955 kfree(fh->ov.clips);
1956 fh->ov.clips = clips; 1955 fh->ov.clips = clips;
1957 fh->ov.nclips = n; 1956 fh->ov.nclips = n;
1958 1957
@@ -2723,8 +2722,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
2723 fh->ov.w.height = fb->fmt.height; 2722 fh->ov.w.height = fb->fmt.height;
2724 btv->init.ov.w.width = fb->fmt.width; 2723 btv->init.ov.w.width = fb->fmt.width;
2725 btv->init.ov.w.height = fb->fmt.height; 2724 btv->init.ov.w.height = fb->fmt.height;
2726 if (fh->ov.clips) 2725 kfree(fh->ov.clips);
2727 kfree(fh->ov.clips);
2728 fh->ov.clips = NULL; 2726 fh->ov.clips = NULL;
2729 fh->ov.nclips = 0; 2727 fh->ov.nclips = 0;
2730 2728
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index 26dd06ec89a2..deeef125eb92 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -27,15 +27,15 @@
27 27
28#include "indycam.h" 28#include "indycam.h"
29 29
30//#define INDYCAM_DEBUG 30#define INDYCAM_MODULE_VERSION "0.0.5"
31
32#define INDYCAM_MODULE_VERSION "0.0.3"
33 31
34MODULE_DESCRIPTION("SGI IndyCam driver"); 32MODULE_DESCRIPTION("SGI IndyCam driver");
35MODULE_VERSION(INDYCAM_MODULE_VERSION); 33MODULE_VERSION(INDYCAM_MODULE_VERSION);
36MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); 34MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
37MODULE_LICENSE("GPL"); 35MODULE_LICENSE("GPL");
38 36
37// #define INDYCAM_DEBUG
38
39#ifdef INDYCAM_DEBUG 39#ifdef INDYCAM_DEBUG
40#define dprintk(x...) printk("IndyCam: " x); 40#define dprintk(x...) printk("IndyCam: " x);
41#define indycam_regdump(client) indycam_regdump_debug(client) 41#define indycam_regdump(client) indycam_regdump_debug(client)
@@ -46,14 +46,14 @@ MODULE_LICENSE("GPL");
46 46
47struct indycam { 47struct indycam {
48 struct i2c_client *client; 48 struct i2c_client *client;
49 int version; 49 u8 version;
50}; 50};
51 51
52static struct i2c_driver i2c_driver_indycam; 52static struct i2c_driver i2c_driver_indycam;
53 53
54static const unsigned char initseq[] = { 54static const u8 initseq[] = {
55 INDYCAM_CONTROL_AGCENA, /* INDYCAM_CONTROL */ 55 INDYCAM_CONTROL_AGCENA, /* INDYCAM_CONTROL */
56 INDYCAM_SHUTTER_DEFAULT, /* INDYCAM_SHUTTER */ 56 INDYCAM_SHUTTER_60, /* INDYCAM_SHUTTER */
57 INDYCAM_GAIN_DEFAULT, /* INDYCAM_GAIN */ 57 INDYCAM_GAIN_DEFAULT, /* INDYCAM_GAIN */
58 0x00, /* INDYCAM_BRIGHTNESS (read-only) */ 58 0x00, /* INDYCAM_BRIGHTNESS (read-only) */
59 INDYCAM_RED_BALANCE_DEFAULT, /* INDYCAM_RED_BALANCE */ 59 INDYCAM_RED_BALANCE_DEFAULT, /* INDYCAM_RED_BALANCE */
@@ -64,12 +64,11 @@ static const unsigned char initseq[] = {
64 64
65/* IndyCam register handling */ 65/* IndyCam register handling */
66 66
67static int indycam_read_reg(struct i2c_client *client, unsigned char reg, 67static int indycam_read_reg(struct i2c_client *client, u8 reg, u8 *value)
68 unsigned char *value)
69{ 68{
70 int ret; 69 int ret;
71 70
72 if (reg == INDYCAM_RESET) { 71 if (reg == INDYCAM_REG_RESET) {
73 dprintk("indycam_read_reg(): " 72 dprintk("indycam_read_reg(): "
74 "skipping write-only register %d\n", reg); 73 "skipping write-only register %d\n", reg);
75 *value = 0; 74 *value = 0;
@@ -77,24 +76,24 @@ static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
77 } 76 }
78 77
79 ret = i2c_smbus_read_byte_data(client, reg); 78 ret = i2c_smbus_read_byte_data(client, reg);
79
80 if (ret < 0) { 80 if (ret < 0) {
81 printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, " 81 printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, "
82 "register = 0x%02x\n", reg); 82 "register = 0x%02x\n", reg);
83 return ret; 83 return ret;
84 } 84 }
85 85
86 *value = (unsigned char)ret; 86 *value = (u8)ret;
87 87
88 return 0; 88 return 0;
89} 89}
90 90
91static int indycam_write_reg(struct i2c_client *client, unsigned char reg, 91static int indycam_write_reg(struct i2c_client *client, u8 reg, u8 value)
92 unsigned char value)
93{ 92{
94 int err; 93 int err;
95 94
96 if ((reg == INDYCAM_BRIGHTNESS) 95 if ((reg == INDYCAM_REG_BRIGHTNESS)
97 || (reg == INDYCAM_VERSION)) { 96 || (reg == INDYCAM_REG_VERSION)) {
98 dprintk("indycam_write_reg(): " 97 dprintk("indycam_write_reg(): "
99 "skipping read-only register %d\n", reg); 98 "skipping read-only register %d\n", reg);
100 return 0; 99 return 0;
@@ -102,6 +101,7 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
102 101
103 dprintk("Writing Reg %d = 0x%02x\n", reg, value); 102 dprintk("Writing Reg %d = 0x%02x\n", reg, value);
104 err = i2c_smbus_write_byte_data(client, reg, value); 103 err = i2c_smbus_write_byte_data(client, reg, value);
104
105 if (err) { 105 if (err) {
106 printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, " 106 printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, "
107 "register = 0x%02x, value = 0x%02x\n", reg, value); 107 "register = 0x%02x, value = 0x%02x\n", reg, value);
@@ -109,13 +109,12 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
109 return err; 109 return err;
110} 110}
111 111
112static int indycam_write_block(struct i2c_client *client, unsigned char reg, 112static int indycam_write_block(struct i2c_client *client, u8 reg,
113 unsigned char length, unsigned char *data) 113 u8 length, u8 *data)
114{ 114{
115 unsigned char i; 115 int i, err;
116 int err;
117 116
118 for (i = reg; i < length; i++) { 117 for (i = 0; i < length; i++) {
119 err = indycam_write_reg(client, reg + i, data[i]); 118 err = indycam_write_reg(client, reg + i, data[i]);
120 if (err) 119 if (err)
121 return err; 120 return err;
@@ -130,7 +129,7 @@ static int indycam_write_block(struct i2c_client *client, unsigned char reg,
130static void indycam_regdump_debug(struct i2c_client *client) 129static void indycam_regdump_debug(struct i2c_client *client)
131{ 130{
132 int i; 131 int i;
133 unsigned char val; 132 u8 val;
134 133
135 for (i = 0; i < 9; i++) { 134 for (i = 0; i < 9; i++) {
136 indycam_read_reg(client, i, &val); 135 indycam_read_reg(client, i, &val);
@@ -139,76 +138,144 @@ static void indycam_regdump_debug(struct i2c_client *client)
139} 138}
140#endif 139#endif
141 140
142static int indycam_get_controls(struct i2c_client *client, 141static int indycam_get_control(struct i2c_client *client,
143 struct indycam_control *ctrl) 142 struct indycam_control *ctrl)
144{ 143{
145 unsigned char ctrl_reg; 144 struct indycam *camera = i2c_get_clientdata(client);
146 145 u8 reg;
147 indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg); 146 int ret = 0;
148 ctrl->agc = (ctrl_reg & INDYCAM_CONTROL_AGCENA) 147
149 ? INDYCAM_VALUE_ENABLED 148 switch (ctrl->type) {
150 : INDYCAM_VALUE_DISABLED; 149 case INDYCAM_CONTROL_AGC:
151 ctrl->awb = (ctrl_reg & INDYCAM_CONTROL_AWBCTL) 150 case INDYCAM_CONTROL_AWB:
152 ? INDYCAM_VALUE_ENABLED 151 ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
153 : INDYCAM_VALUE_DISABLED; 152 if (ret)
154 indycam_read_reg(client, INDYCAM_SHUTTER, 153 return -EIO;
155 (unsigned char *)&ctrl->shutter); 154 if (ctrl->type == INDYCAM_CONTROL_AGC)
156 indycam_read_reg(client, INDYCAM_GAIN, 155 ctrl->value = (reg & INDYCAM_CONTROL_AGCENA)
157 (unsigned char *)&ctrl->gain); 156 ? 1 : 0;
158 indycam_read_reg(client, INDYCAM_RED_BALANCE, 157 else
159 (unsigned char *)&ctrl->red_balance); 158 ctrl->value = (reg & INDYCAM_CONTROL_AWBCTL)
160 indycam_read_reg(client, INDYCAM_BLUE_BALANCE, 159 ? 1 : 0;
161 (unsigned char *)&ctrl->blue_balance); 160 break;
162 indycam_read_reg(client, INDYCAM_RED_SATURATION, 161 case INDYCAM_CONTROL_SHUTTER:
163 (unsigned char *)&ctrl->red_saturation); 162 ret = indycam_read_reg(client, INDYCAM_REG_SHUTTER, &reg);
164 indycam_read_reg(client, INDYCAM_BLUE_SATURATION, 163 if (ret)
165 (unsigned char *)&ctrl->blue_saturation); 164 return -EIO;
166 indycam_read_reg(client, INDYCAM_GAMMA, 165 ctrl->value = ((s32)reg == 0x00) ? 0xff : ((s32)reg - 1);
167 (unsigned char *)&ctrl->gamma); 166 break;
167 case INDYCAM_CONTROL_GAIN:
168 ret = indycam_read_reg(client, INDYCAM_REG_GAIN, &reg);
169 if (ret)
170 return -EIO;
171 ctrl->value = (s32)reg;
172 break;
173 case INDYCAM_CONTROL_RED_BALANCE:
174 ret = indycam_read_reg(client, INDYCAM_REG_RED_BALANCE, &reg);
175 if (ret)
176 return -EIO;
177 ctrl->value = (s32)reg;
178 break;
179 case INDYCAM_CONTROL_BLUE_BALANCE:
180 ret = indycam_read_reg(client, INDYCAM_REG_BLUE_BALANCE, &reg);
181 if (ret)
182 return -EIO;
183 ctrl->value = (s32)reg;
184 break;
185 case INDYCAM_CONTROL_RED_SATURATION:
186 ret = indycam_read_reg(client,
187 INDYCAM_REG_RED_SATURATION, &reg);
188 if (ret)
189 return -EIO;
190 ctrl->value = (s32)reg;
191 break;
192 case INDYCAM_CONTROL_BLUE_SATURATION:
193 ret = indycam_read_reg(client,
194 INDYCAM_REG_BLUE_SATURATION, &reg);
195 if (ret)
196 return -EIO;
197 ctrl->value = (s32)reg;
198 break;
199 case INDYCAM_CONTROL_GAMMA:
200 if (camera->version == CAMERA_VERSION_MOOSE) {
201 ret = indycam_read_reg(client,
202 INDYCAM_REG_GAMMA, &reg);
203 if (ret)
204 return -EIO;
205 ctrl->value = (s32)reg;
206 } else {
207 ctrl->value = INDYCAM_GAMMA_DEFAULT;
208 }
209 break;
210 default:
211 ret = -EINVAL;
212 }
168 213
169 return 0; 214 return ret;
170} 215}
171 216
172static int indycam_set_controls(struct i2c_client *client, 217static int indycam_set_control(struct i2c_client *client,
173 struct indycam_control *ctrl) 218 struct indycam_control *ctrl)
174{ 219{
175 unsigned char ctrl_reg; 220 struct indycam *camera = i2c_get_clientdata(client);
221 u8 reg;
222 int ret = 0;
223
224 switch (ctrl->type) {
225 case INDYCAM_CONTROL_AGC:
226 case INDYCAM_CONTROL_AWB:
227 ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
228 if (ret)
229 break;
176 230
177 indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg); 231 if (ctrl->type == INDYCAM_CONTROL_AGC) {
178 if (ctrl->agc != INDYCAM_VALUE_UNCHANGED) { 232 if (ctrl->value)
179 if (ctrl->agc) 233 reg |= INDYCAM_CONTROL_AGCENA;
180 ctrl_reg |= INDYCAM_CONTROL_AGCENA; 234 else
181 else 235 reg &= ~INDYCAM_CONTROL_AGCENA;
182 ctrl_reg &= ~INDYCAM_CONTROL_AGCENA; 236 } else {
183 } 237 if (ctrl->value)
184 if (ctrl->awb != INDYCAM_VALUE_UNCHANGED) { 238 reg |= INDYCAM_CONTROL_AWBCTL;
185 if (ctrl->awb) 239 else
186 ctrl_reg |= INDYCAM_CONTROL_AWBCTL; 240 reg &= ~INDYCAM_CONTROL_AWBCTL;
187 else 241 }
188 ctrl_reg &= ~INDYCAM_CONTROL_AWBCTL; 242
243 ret = indycam_write_reg(client, INDYCAM_REG_CONTROL, reg);
244 break;
245 case INDYCAM_CONTROL_SHUTTER:
246 reg = (ctrl->value == 0xff) ? 0x00 : (ctrl->value + 1);
247 ret = indycam_write_reg(client, INDYCAM_REG_SHUTTER, reg);
248 break;
249 case INDYCAM_CONTROL_GAIN:
250 ret = indycam_write_reg(client, INDYCAM_REG_GAIN, ctrl->value);
251 break;
252 case INDYCAM_CONTROL_RED_BALANCE:
253 ret = indycam_write_reg(client, INDYCAM_REG_RED_BALANCE,
254 ctrl->value);
255 break;
256 case INDYCAM_CONTROL_BLUE_BALANCE:
257 ret = indycam_write_reg(client, INDYCAM_REG_BLUE_BALANCE,
258 ctrl->value);
259 break;
260 case INDYCAM_CONTROL_RED_SATURATION:
261 ret = indycam_write_reg(client, INDYCAM_REG_RED_SATURATION,
262 ctrl->value);
263 break;
264 case INDYCAM_CONTROL_BLUE_SATURATION:
265 ret = indycam_write_reg(client, INDYCAM_REG_BLUE_SATURATION,
266 ctrl->value);
267 break;
268 case INDYCAM_CONTROL_GAMMA:
269 if (camera->version == CAMERA_VERSION_MOOSE) {
270 ret = indycam_write_reg(client, INDYCAM_REG_GAMMA,
271 ctrl->value);
272 }
273 break;
274 default:
275 ret = -EINVAL;
189 } 276 }
190 indycam_write_reg(client, INDYCAM_CONTROL, ctrl_reg);
191
192 if (ctrl->shutter >= 0)
193 indycam_write_reg(client, INDYCAM_SHUTTER, ctrl->shutter);
194 if (ctrl->gain >= 0)
195 indycam_write_reg(client, INDYCAM_GAIN, ctrl->gain);
196 if (ctrl->red_balance >= 0)
197 indycam_write_reg(client, INDYCAM_RED_BALANCE,
198 ctrl->red_balance);
199 if (ctrl->blue_balance >= 0)
200 indycam_write_reg(client, INDYCAM_BLUE_BALANCE,
201 ctrl->blue_balance);
202 if (ctrl->red_saturation >= 0)
203 indycam_write_reg(client, INDYCAM_RED_SATURATION,
204 ctrl->red_saturation);
205 if (ctrl->blue_saturation >= 0)
206 indycam_write_reg(client, INDYCAM_BLUE_SATURATION,
207 ctrl->blue_saturation);
208 if (ctrl->gamma >= 0)
209 indycam_write_reg(client, INDYCAM_GAMMA, ctrl->gamma);
210 277
211 return 0; 278 return ret;
212} 279}
213 280
214/* I2C-interface */ 281/* I2C-interface */
@@ -247,7 +314,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
247 if (err) 314 if (err)
248 goto out_free_camera; 315 goto out_free_camera;
249 316
250 camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION); 317 camera->version = i2c_smbus_read_byte_data(client,
318 INDYCAM_REG_VERSION);
251 if (camera->version != CAMERA_VERSION_INDY && 319 if (camera->version != CAMERA_VERSION_INDY &&
252 camera->version != CAMERA_VERSION_MOOSE) { 320 camera->version != CAMERA_VERSION_MOOSE) {
253 err = -ENODEV; 321 err = -ENODEV;
@@ -260,8 +328,7 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
260 indycam_regdump(client); 328 indycam_regdump(client);
261 329
262 // initialize 330 // initialize
263 err = indycam_write_block(client, 0, sizeof(initseq), 331 err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq);
264 (unsigned char *)&initseq);
265 if (err) { 332 if (err) {
266 printk(KERN_ERR "IndyCam initalization failed\n"); 333 printk(KERN_ERR "IndyCam initalization failed\n");
267 err = -EIO; 334 err = -EIO;
@@ -271,11 +338,10 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
271 indycam_regdump(client); 338 indycam_regdump(client);
272 339
273 // white balance 340 // white balance
274 err = indycam_write_reg(client, INDYCAM_CONTROL, 341 err = indycam_write_reg(client, INDYCAM_REG_CONTROL,
275 INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL); 342 INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
276 if (err) { 343 if (err) {
277 printk(KERN_ERR "IndyCam white balance " 344 printk(KERN_ERR "IndyCam: White balancing camera failed\n");
278 "initialization failed\n");
279 err = -EIO; 345 err = -EIO;
280 goto out_detach_client; 346 goto out_detach_client;
281 } 347 }
@@ -371,13 +437,11 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
371 /* TODO: convert values for indycam_set_controls() */ 437 /* TODO: convert values for indycam_set_controls() */
372 break; 438 break;
373 } 439 }
374 case DECODER_INDYCAM_GET_CONTROLS: { 440 case DECODER_INDYCAM_GET_CONTROL: {
375 struct indycam_control *ctrl = arg; 441 return indycam_get_control(client, arg);
376 indycam_get_controls(client, ctrl);
377 } 442 }
378 case DECODER_INDYCAM_SET_CONTROLS: { 443 case DECODER_INDYCAM_SET_CONTROL: {
379 struct indycam_control *ctrl = arg; 444 return indycam_set_control(client, arg);
380 indycam_set_controls(client, ctrl);
381 } 445 }
382 default: 446 default:
383 return -EINVAL; 447 return -EINVAL;
@@ -388,12 +452,12 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
388 452
389static struct i2c_driver i2c_driver_indycam = { 453static struct i2c_driver i2c_driver_indycam = {
390 .owner = THIS_MODULE, 454 .owner = THIS_MODULE,
391 .name = "indycam", 455 .name = "indycam",
392 .id = I2C_DRIVERID_INDYCAM, 456 .id = I2C_DRIVERID_INDYCAM,
393 .flags = I2C_DF_NOTIFY, 457 .flags = I2C_DF_NOTIFY,
394 .attach_adapter = indycam_probe, 458 .attach_adapter = indycam_probe,
395 .detach_client = indycam_detach, 459 .detach_client = indycam_detach,
396 .command = indycam_command, 460 .command = indycam_command,
397}; 461};
398 462
399static int __init indycam_init(void) 463static int __init indycam_init(void)
diff --git a/drivers/media/video/indycam.h b/drivers/media/video/indycam.h
index d9ddb6b79a03..e6ee82063ed8 100644
--- a/drivers/media/video/indycam.h
+++ b/drivers/media/video/indycam.h
@@ -22,21 +22,21 @@
22#define INDYCAM_VERSION_MINOR(x) ((x) & 0x0f) 22#define INDYCAM_VERSION_MINOR(x) ((x) & 0x0f)
23 23
24/* Register bus addresses */ 24/* Register bus addresses */
25#define INDYCAM_CONTROL 0x00 25#define INDYCAM_REG_CONTROL 0x00
26#define INDYCAM_SHUTTER 0x01 26#define INDYCAM_REG_SHUTTER 0x01
27#define INDYCAM_GAIN 0x02 27#define INDYCAM_REG_GAIN 0x02
28#define INDYCAM_BRIGHTNESS 0x03 /* read-only */ 28#define INDYCAM_REG_BRIGHTNESS 0x03 /* read-only */
29#define INDYCAM_RED_BALANCE 0x04 29#define INDYCAM_REG_RED_BALANCE 0x04
30#define INDYCAM_BLUE_BALANCE 0x05 30#define INDYCAM_REG_BLUE_BALANCE 0x05
31#define INDYCAM_RED_SATURATION 0x06 31#define INDYCAM_REG_RED_SATURATION 0x06
32#define INDYCAM_BLUE_SATURATION 0x07 32#define INDYCAM_REG_BLUE_SATURATION 0x07
33#define INDYCAM_GAMMA 0x08 33#define INDYCAM_REG_GAMMA 0x08
34#define INDYCAM_VERSION 0x0e /* read-only */ 34#define INDYCAM_REG_VERSION 0x0e /* read-only */
35#define INDYCAM_RESET 0x0f /* write-only */ 35#define INDYCAM_REG_RESET 0x0f /* write-only */
36 36
37#define INDYCAM_LED 0x46 37#define INDYCAM_REG_LED 0x46
38#define INDYCAM_ORIENTATION 0x47 38#define INDYCAM_REG_ORIENTATION 0x47
39#define INDYCAM_BUTTON 0x48 39#define INDYCAM_REG_BUTTON 0x48
40 40
41/* Field definitions of registers */ 41/* Field definitions of registers */
42#define INDYCAM_CONTROL_AGCENA (1<<0) /* automatic gain control */ 42#define INDYCAM_CONTROL_AGCENA (1<<0) /* automatic gain control */
@@ -59,13 +59,14 @@
59#define INDYCAM_ORIENTATION_BOTTOM_TO_TOP 0x40 59#define INDYCAM_ORIENTATION_BOTTOM_TO_TOP 0x40
60#define INDYCAM_BUTTON_RELEASED 0x10 60#define INDYCAM_BUTTON_RELEASED 0x10
61 61
62/* Values for controls */
62#define INDYCAM_SHUTTER_MIN 0x00 63#define INDYCAM_SHUTTER_MIN 0x00
63#define INDYCAM_SHUTTER_MAX 0xff 64#define INDYCAM_SHUTTER_MAX 0xff
64#define INDYCAM_GAIN_MIN 0x00 65#define INDYCAM_GAIN_MIN 0x00
65#define INDYCAM_GAIN_MAX 0xff 66#define INDYCAM_GAIN_MAX 0xff
66#define INDYCAM_RED_BALANCE_MIN 0x00 /* the effect is the opposite? */ 67#define INDYCAM_RED_BALANCE_MIN 0x00
67#define INDYCAM_RED_BALANCE_MAX 0xff 68#define INDYCAM_RED_BALANCE_MAX 0xff
68#define INDYCAM_BLUE_BALANCE_MIN 0x00 /* the effect is the opposite? */ 69#define INDYCAM_BLUE_BALANCE_MIN 0x00
69#define INDYCAM_BLUE_BALANCE_MAX 0xff 70#define INDYCAM_BLUE_BALANCE_MAX 0xff
70#define INDYCAM_RED_SATURATION_MIN 0x00 71#define INDYCAM_RED_SATURATION_MIN 0x00
71#define INDYCAM_RED_SATURATION_MAX 0xff 72#define INDYCAM_RED_SATURATION_MAX 0xff
@@ -74,34 +75,9 @@
74#define INDYCAM_GAMMA_MIN 0x00 75#define INDYCAM_GAMMA_MIN 0x00
75#define INDYCAM_GAMMA_MAX 0xff 76#define INDYCAM_GAMMA_MAX 0xff
76 77
77/* Driver interface definitions */ 78#define INDYCAM_AGC_DEFAULT 1
78 79#define INDYCAM_AWB_DEFAULT 0
79#define INDYCAM_VALUE_ENABLED 1 80#define INDYCAM_SHUTTER_DEFAULT 0xff
80#define INDYCAM_VALUE_DISABLED 0
81#define INDYCAM_VALUE_UNCHANGED -1
82
83/* When setting controls, a value of -1 leaves the control unchanged. */
84struct indycam_control {
85 int agc; /* boolean */
86 int awb; /* boolean */
87 int shutter;
88 int gain;
89 int red_balance;
90 int blue_balance;
91 int red_saturation;
92 int blue_saturation;
93 int gamma;
94};
95
96#define DECODER_INDYCAM_GET_CONTROLS _IOR('d', 193, struct indycam_control)
97#define DECODER_INDYCAM_SET_CONTROLS _IOW('d', 194, struct indycam_control)
98
99/* Default values for controls */
100
101#define INDYCAM_AGC_DEFAULT INDYCAM_VALUE_ENABLED
102#define INDYCAM_AWB_DEFAULT INDYCAM_VALUE_ENABLED
103
104#define INDYCAM_SHUTTER_DEFAULT INDYCAM_SHUTTER_60
105#define INDYCAM_GAIN_DEFAULT 0x80 81#define INDYCAM_GAIN_DEFAULT 0x80
106#define INDYCAM_RED_BALANCE_DEFAULT 0x18 82#define INDYCAM_RED_BALANCE_DEFAULT 0x18
107#define INDYCAM_BLUE_BALANCE_DEFAULT 0xa4 83#define INDYCAM_BLUE_BALANCE_DEFAULT 0xa4
@@ -109,4 +85,24 @@ struct indycam_control {
109#define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0 85#define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0
110#define INDYCAM_GAMMA_DEFAULT 0x80 86#define INDYCAM_GAMMA_DEFAULT 0x80
111 87
88/* Driver interface definitions */
89
90#define INDYCAM_CONTROL_AGC 0 /* boolean */
91#define INDYCAM_CONTROL_AWB 1 /* boolean */
92#define INDYCAM_CONTROL_SHUTTER 2
93#define INDYCAM_CONTROL_GAIN 3
94#define INDYCAM_CONTROL_RED_BALANCE 4
95#define INDYCAM_CONTROL_BLUE_BALANCE 5
96#define INDYCAM_CONTROL_RED_SATURATION 6
97#define INDYCAM_CONTROL_BLUE_SATURATION 7
98#define INDYCAM_CONTROL_GAMMA 8
99
100struct indycam_control {
101 u8 type;
102 s32 value;
103};
104
105#define DECODER_INDYCAM_GET_CONTROL _IOR('d', 193, struct indycam_control)
106#define DECODER_INDYCAM_SET_CONTROL _IOW('d', 194, struct indycam_control)
107
112#endif 108#endif
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 262890cb20a7..e75e7948fd9d 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -741,8 +741,8 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
741 set_current_state(TASK_INTERRUPTIBLE); 741 set_current_state(TASK_INTERRUPTIBLE);
742 schedule(); 742 schedule();
743 } else { 743 } else {
744 set_current_state(TASK_INTERRUPTIBLE); 744 schedule_timeout_interruptible
745 schedule_timeout(msecs_to_jiffies(timeout)); 745 (msecs_to_jiffies(timeout));
746 } 746 }
747 } 747 }
748 748
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index badf2f9e3072..61a2d6b50eef 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -342,8 +342,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
342 set_current_state(TASK_INTERRUPTIBLE); 342 set_current_state(TASK_INTERRUPTIBLE);
343 schedule(); 343 schedule();
344 } else { 344 } else {
345 set_current_state(TASK_INTERRUPTIBLE); 345 schedule_timeout_interruptible
346 schedule_timeout(msecs_to_jiffies(timeout)); 346 (msecs_to_jiffies(timeout));
347 } 347 }
348 } 348 }
349 remove_wait_queue(&dev->thread.wq, &wait); 349 remove_wait_queue(&dev->thread.wq, &wait);
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 3ddbb62312be..cbca896e8cfa 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -26,71 +26,95 @@
26 26
27#include "saa7191.h" 27#include "saa7191.h"
28 28
29#define SAA7191_MODULE_VERSION "0.0.3" 29#define SAA7191_MODULE_VERSION "0.0.5"
30 30
31MODULE_DESCRIPTION("Philips SAA7191 video decoder driver"); 31MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
32MODULE_VERSION(SAA7191_MODULE_VERSION); 32MODULE_VERSION(SAA7191_MODULE_VERSION);
33MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); 33MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
34MODULE_LICENSE("GPL"); 34MODULE_LICENSE("GPL");
35 35
36// #define SAA7191_DEBUG
37
38#ifdef SAA7191_DEBUG
39#define dprintk(x...) printk("SAA7191: " x);
40#else
41#define dprintk(x...)
42#endif
43
44#define SAA7191_SYNC_COUNT 30
45#define SAA7191_SYNC_DELAY 100 /* milliseconds */
46
36struct saa7191 { 47struct saa7191 {
37 struct i2c_client *client; 48 struct i2c_client *client;
38 49
39 /* the register values are stored here as the actual 50 /* the register values are stored here as the actual
40 * I2C-registers are write-only */ 51 * I2C-registers are write-only */
41 unsigned char reg[25]; 52 u8 reg[25];
42 53
43 unsigned char norm; 54 int input;
44 unsigned char input; 55 int norm;
45}; 56};
46 57
47static struct i2c_driver i2c_driver_saa7191; 58static struct i2c_driver i2c_driver_saa7191;
48 59
49static const unsigned char initseq[] = { 60static const u8 initseq[] = {
50 0, /* Subaddress */ 61 0, /* Subaddress */
51 0x50, /* SAA7191_REG_IDEL */ 62
52 0x30, /* SAA7191_REG_HSYB */ 63 0x50, /* (0x50) SAA7191_REG_IDEL */
53 0x00, /* SAA7191_REG_HSYS */ 64
54 0xe8, /* SAA7191_REG_HCLB */ 65 /* 50 Hz signal timing */
55 0xb6, /* SAA7191_REG_HCLS */ 66 0x30, /* (0x30) SAA7191_REG_HSYB */
56 0xf4, /* SAA7191_REG_HPHI */ 67 0x00, /* (0x00) SAA7191_REG_HSYS */
57 0x01, /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */ 68 0xe8, /* (0xe8) SAA7191_REG_HCLB */
58 0x00, /* SAA7191_REG_HUEC */ 69 0xb6, /* (0xb6) SAA7191_REG_HCLS */
59 0xf8, /* SAA7191_REG_CKTQ */ 70 0xf4, /* (0xf4) SAA7191_REG_HPHI */
60 0xf8, /* SAA7191_REG_CKTS */ 71
61 0x90, /* SAA7191_REG_PLSE */ 72 /* control */
62 0x90, /* SAA7191_REG_SESE */ 73 SAA7191_LUMA_APER_1, /* (0x01) SAA7191_REG_LUMA - CVBS mode */
63 0x00, /* SAA7191_REG_GAIN */ 74 0x00, /* (0x00) SAA7191_REG_HUEC */
64 0x0c, /* SAA7191_REG_STDC - not SECAM, slow time constant */ 75 0xf8, /* (0xf8) SAA7191_REG_CKTQ */
65 0x78, /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */ 76 0xf8, /* (0xf8) SAA7191_REG_CKTS */
66 0x99, /* SAA7191_REG_CTL3 - automatic field detection */ 77 0x90, /* (0x90) SAA7191_REG_PLSE */
67 0x00, /* SAA7191_REG_CTL4 */ 78 0x90, /* (0x90) SAA7191_REG_SESE */
68 0x2c, /* SAA7191_REG_CHCV */ 79 0x00, /* (0x00) SAA7191_REG_GAIN */
80 SAA7191_STDC_NFEN | SAA7191_STDC_HRMV, /* (0x0c) SAA7191_REG_STDC
81 * - not SECAM,
82 * slow time constant */
83 SAA7191_IOCK_OEDC | SAA7191_IOCK_OEHS | SAA7191_IOCK_OEVS
84 | SAA7191_IOCK_OEDY, /* (0x78) SAA7191_REG_IOCK
85 * - chroma from CVBS, GPSW1 & 2 off */
86 SAA7191_CTL3_AUFD | SAA7191_CTL3_SCEN | SAA7191_CTL3_OFTS
87 | SAA7191_CTL3_YDEL0, /* (0x99) SAA7191_REG_CTL3
88 * - automatic field detection */
89 0x00, /* (0x00) SAA7191_REG_CTL4 */
90 0x2c, /* (0x2c) SAA7191_REG_CHCV - PAL nominal value */
69 0x00, /* unused */ 91 0x00, /* unused */
70 0x00, /* unused */ 92 0x00, /* unused */
71 0x34, /* SAA7191_REG_HS6B */ 93
72 0x0a, /* SAA7191_REG_HS6S */ 94 /* 60 Hz signal timing */
73 0xf4, /* SAA7191_REG_HC6B */ 95 0x34, /* (0x34) SAA7191_REG_HS6B */
74 0xce, /* SAA7191_REG_HC6S */ 96 0x0a, /* (0x0a) SAA7191_REG_HS6S */
75 0xf4, /* SAA7191_REG_HP6I */ 97 0xf4, /* (0xf4) SAA7191_REG_HC6B */
98 0xce, /* (0xce) SAA7191_REG_HC6S */
99 0xf4, /* (0xf4) SAA7191_REG_HP6I */
76}; 100};
77 101
78/* SAA7191 register handling */ 102/* SAA7191 register handling */
79 103
80static unsigned char saa7191_read_reg(struct i2c_client *client, 104static u8 saa7191_read_reg(struct i2c_client *client,
81 unsigned char reg) 105 u8 reg)
82{ 106{
83 return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg]; 107 return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
84} 108}
85 109
86static int saa7191_read_status(struct i2c_client *client, 110static int saa7191_read_status(struct i2c_client *client,
87 unsigned char *value) 111 u8 *value)
88{ 112{
89 int ret; 113 int ret;
90 114
91 ret = i2c_master_recv(client, value, 1); 115 ret = i2c_master_recv(client, value, 1);
92 if (ret < 0) { 116 if (ret < 0) {
93 printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed"); 117 printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed\n");
94 return ret; 118 return ret;
95 } 119 }
96 120
@@ -98,17 +122,16 @@ static int saa7191_read_status(struct i2c_client *client,
98} 122}
99 123
100 124
101static int saa7191_write_reg(struct i2c_client *client, unsigned char reg, 125static int saa7191_write_reg(struct i2c_client *client, u8 reg,
102 unsigned char value) 126 u8 value)
103{ 127{
104
105 ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value; 128 ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
106 return i2c_smbus_write_byte_data(client, reg, value); 129 return i2c_smbus_write_byte_data(client, reg, value);
107} 130}
108 131
109/* the first byte of data must be the first subaddress number (register) */ 132/* the first byte of data must be the first subaddress number (register) */
110static int saa7191_write_block(struct i2c_client *client, 133static int saa7191_write_block(struct i2c_client *client,
111 unsigned char length, unsigned char *data) 134 u8 length, u8 *data)
112{ 135{
113 int i; 136 int i;
114 int ret; 137 int ret;
@@ -121,7 +144,7 @@ static int saa7191_write_block(struct i2c_client *client,
121 ret = i2c_master_send(client, data, length); 144 ret = i2c_master_send(client, data, length);
122 if (ret < 0) { 145 if (ret < 0) {
123 printk(KERN_ERR "SAA7191: saa7191_write_block(): " 146 printk(KERN_ERR "SAA7191: saa7191_write_block(): "
124 "write failed"); 147 "write failed\n");
125 return ret; 148 return ret;
126 } 149 }
127 150
@@ -132,8 +155,9 @@ static int saa7191_write_block(struct i2c_client *client,
132 155
133static int saa7191_set_input(struct i2c_client *client, int input) 156static int saa7191_set_input(struct i2c_client *client, int input)
134{ 157{
135 unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA); 158 struct saa7191 *decoder = i2c_get_clientdata(client);
136 unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK); 159 u8 luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
160 u8 iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
137 int err; 161 int err;
138 162
139 switch (input) { 163 switch (input) {
@@ -159,32 +183,20 @@ static int saa7191_set_input(struct i2c_client *client, int input)
159 if (err) 183 if (err)
160 return -EIO; 184 return -EIO;
161 185
186 decoder->input = input;
187
162 return 0; 188 return 0;
163} 189}
164 190
165static int saa7191_set_norm(struct i2c_client *client, int norm) 191static int saa7191_set_norm(struct i2c_client *client, int norm)
166{ 192{
167 struct saa7191 *decoder = i2c_get_clientdata(client); 193 struct saa7191 *decoder = i2c_get_clientdata(client);
168 unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC); 194 u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
169 unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3); 195 u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
170 unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV); 196 u8 chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
171 int err; 197 int err;
172 198
173 switch(norm) { 199 switch(norm) {
174 case SAA7191_NORM_AUTO: {
175 unsigned char status;
176
177 // does status depend on current norm ?
178 if (saa7191_read_status(client, &status))
179 return -EIO;
180
181 stdc &= ~SAA7191_STDC_SECS;
182 ctl3 &= ~SAA7191_CTL3_FSEL;
183 ctl3 |= SAA7191_CTL3_AUFD;
184 chcv = (status & SAA7191_STATUS_FIDT)
185 ? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
186 break;
187 }
188 case SAA7191_NORM_PAL: 200 case SAA7191_NORM_PAL:
189 stdc &= ~SAA7191_STDC_SECS; 201 stdc &= ~SAA7191_STDC_SECS;
190 ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL); 202 ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
@@ -217,60 +229,335 @@ static int saa7191_set_norm(struct i2c_client *client, int norm)
217 229
218 decoder->norm = norm; 230 decoder->norm = norm;
219 231
232 dprintk("ctl3: %02x stdc: %02x chcv: %02x\n", ctl3,
233 stdc, chcv);
234 dprintk("norm: %d\n", norm);
235
220 return 0; 236 return 0;
221} 237}
222 238
223static int saa7191_get_controls(struct i2c_client *client, 239static int saa7191_wait_for_signal(struct i2c_client *client, u8 *status)
224 struct saa7191_control *ctrl)
225{ 240{
226 unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC); 241 int i = 0;
227 unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
228 242
229 if (hue < 0x80) { 243 dprintk("Checking for signal...\n");
230 hue += 0x80; 244
231 } else { 245 for (i = 0; i < SAA7191_SYNC_COUNT; i++) {
232 hue -= 0x80; 246 if (saa7191_read_status(client, status))
247 return -EIO;
248
249 if (((*status) & SAA7191_STATUS_HLCK) == 0) {
250 dprintk("Signal found\n");
251 return 0;
252 }
253
254 msleep(SAA7191_SYNC_DELAY);
233 } 255 }
234 ctrl->hue = hue;
235 256
236 ctrl->vtrc = (stdc & SAA7191_STDC_VTRC) 257 dprintk("No signal\n");
237 ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
238 258
239 return 0; 259 return -EBUSY;
240} 260}
241 261
242static int saa7191_set_controls(struct i2c_client *client, 262static int saa7191_autodetect_norm_extended(struct i2c_client *client)
243 struct saa7191_control *ctrl)
244{ 263{
245 int err; 264 u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
265 u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
266 u8 status;
267 int err = 0;
246 268
247 if (ctrl->hue >= 0) { 269 dprintk("SAA7191 extended signal auto-detection...\n");
248 unsigned char hue = ctrl->hue & 0xff; 270
249 if (hue < 0x80) { 271 stdc &= ~SAA7191_STDC_SECS;
250 hue += 0x80; 272 ctl3 &= ~(SAA7191_CTL3_FSEL);
251 } else { 273
252 hue -= 0x80; 274 err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
275 if (err) {
276 err = -EIO;
277 goto out;
278 }
279 err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
280 if (err) {
281 err = -EIO;
282 goto out;
283 }
284
285 ctl3 |= SAA7191_CTL3_AUFD;
286 err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
287 if (err) {
288 err = -EIO;
289 goto out;
290 }
291
292 msleep(SAA7191_SYNC_DELAY);
293
294 err = saa7191_wait_for_signal(client, &status);
295 if (err)
296 goto out;
297
298 if (status & SAA7191_STATUS_FIDT) {
299 /* 60Hz signal -> NTSC */
300 dprintk("60Hz signal: NTSC\n");
301 return saa7191_set_norm(client, SAA7191_NORM_NTSC);
302 }
303
304 /* 50Hz signal */
305 dprintk("50Hz signal: Trying PAL...\n");
306
307 /* try PAL first */
308 err = saa7191_set_norm(client, SAA7191_NORM_PAL);
309 if (err)
310 goto out;
311
312 msleep(SAA7191_SYNC_DELAY);
313
314 err = saa7191_wait_for_signal(client, &status);
315 if (err)
316 goto out;
317
318 /* not 50Hz ? */
319 if (status & SAA7191_STATUS_FIDT) {
320 dprintk("No 50Hz signal\n");
321 err = -EAGAIN;
322 goto out;
323 }
324
325 if (status & SAA7191_STATUS_CODE) {
326 dprintk("PAL\n");
327 return 0;
328 }
329
330 dprintk("No color detected with PAL - Trying SECAM...\n");
331
332 /* no color detected ? -> try SECAM */
333 err = saa7191_set_norm(client,
334 SAA7191_NORM_SECAM);
335 if (err)
336 goto out;
337
338 msleep(SAA7191_SYNC_DELAY);
339
340 err = saa7191_wait_for_signal(client, &status);
341 if (err)
342 goto out;
343
344 /* not 50Hz ? */
345 if (status & SAA7191_STATUS_FIDT) {
346 dprintk("No 50Hz signal\n");
347 err = -EAGAIN;
348 goto out;
349 }
350
351 if (status & SAA7191_STATUS_CODE) {
352 /* Color detected -> SECAM */
353 dprintk("SECAM\n");
354 return 0;
355 }
356
357 dprintk("No color detected with SECAM - Going back to PAL.\n");
358
359 /* still no color detected ?
360 * -> set norm back to PAL */
361 err = saa7191_set_norm(client,
362 SAA7191_NORM_PAL);
363 if (err)
364 goto out;
365
366out:
367 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
368 if (ctl3 & SAA7191_CTL3_AUFD) {
369 ctl3 &= ~(SAA7191_CTL3_AUFD);
370 err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
371 if (err) {
372 err = -EIO;
253 } 373 }
254 err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
255 if (err)
256 return -EIO;
257 } 374 }
258 if (ctrl->vtrc >= 0) {
259 unsigned char stdc =
260 saa7191_read_reg(client, SAA7191_REG_STDC);
261 375
262 if (ctrl->vtrc) { 376 return err;
263 stdc |= SAA7191_STDC_VTRC; 377}
264 } else { 378
265 stdc &= ~SAA7191_STDC_VTRC; 379static int saa7191_autodetect_norm(struct i2c_client *client)
380{
381 u8 status;
382
383 dprintk("SAA7191 signal auto-detection...\n");
384
385 dprintk("Reading status...\n");
386
387 if (saa7191_read_status(client, &status))
388 return -EIO;
389
390 dprintk("Checking for signal...\n");
391
392 /* no signal ? */
393 if (status & SAA7191_STATUS_HLCK) {
394 dprintk("No signal\n");
395 return -EBUSY;
396 }
397
398 dprintk("Signal found\n");
399
400 if (status & SAA7191_STATUS_FIDT) {
401 /* 60hz signal -> NTSC */
402 dprintk("NTSC\n");
403 return saa7191_set_norm(client, SAA7191_NORM_NTSC);
404 } else {
405 /* 50hz signal -> PAL */
406 dprintk("PAL\n");
407 return saa7191_set_norm(client, SAA7191_NORM_PAL);
408 }
409}
410
411static int saa7191_get_control(struct i2c_client *client,
412 struct saa7191_control *ctrl)
413{
414 u8 reg;
415 int ret = 0;
416
417 switch (ctrl->type) {
418 case SAA7191_CONTROL_BANDPASS:
419 case SAA7191_CONTROL_BANDPASS_WEIGHT:
420 case SAA7191_CONTROL_CORING:
421 reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
422 switch (ctrl->type) {
423 case SAA7191_CONTROL_BANDPASS:
424 ctrl->value = ((s32)reg & SAA7191_LUMA_BPSS_MASK)
425 >> SAA7191_LUMA_BPSS_SHIFT;
426 break;
427 case SAA7191_CONTROL_BANDPASS_WEIGHT:
428 ctrl->value = ((s32)reg & SAA7191_LUMA_APER_MASK)
429 >> SAA7191_LUMA_APER_SHIFT;
430 break;
431 case SAA7191_CONTROL_CORING:
432 ctrl->value = ((s32)reg & SAA7191_LUMA_CORI_MASK)
433 >> SAA7191_LUMA_CORI_SHIFT;
434 break;
266 } 435 }
436 break;
437 case SAA7191_CONTROL_FORCE_COLOUR:
438 case SAA7191_CONTROL_CHROMA_GAIN:
439 reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
440 if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR)
441 ctrl->value = ((s32)reg & SAA7191_GAIN_COLO) ? 1 : 0;
442 else
443 ctrl->value = ((s32)reg & SAA7191_GAIN_LFIS_MASK)
444 >> SAA7191_GAIN_LFIS_SHIFT;
445 break;
446 case SAA7191_CONTROL_HUE:
447 reg = saa7191_read_reg(client, SAA7191_REG_HUEC);
448 if (reg < 0x80)
449 reg += 0x80;
450 else
451 reg -= 0x80;
452 ctrl->value = (s32)reg;
453 break;
454 case SAA7191_CONTROL_VTRC:
455 reg = saa7191_read_reg(client, SAA7191_REG_STDC);
456 ctrl->value = ((s32)reg & SAA7191_STDC_VTRC) ? 1 : 0;
457 break;
458 case SAA7191_CONTROL_LUMA_DELAY:
459 reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
460 ctrl->value = ((s32)reg & SAA7191_CTL3_YDEL_MASK)
461 >> SAA7191_CTL3_YDEL_SHIFT;
462 if (ctrl->value >= 4)
463 ctrl->value -= 8;
464 break;
465 case SAA7191_CONTROL_VNR:
466 reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
467 ctrl->value = ((s32)reg & SAA7191_CTL4_VNOI_MASK)
468 >> SAA7191_CTL4_VNOI_SHIFT;
469 break;
470 default:
471 ret = -EINVAL;
472 }
267 473
268 err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc); 474 return ret;
269 if (err) 475}
270 return -EIO; 476
477static int saa7191_set_control(struct i2c_client *client,
478 struct saa7191_control *ctrl)
479{
480 u8 reg;
481 int ret = 0;
482
483 switch (ctrl->type) {
484 case SAA7191_CONTROL_BANDPASS:
485 case SAA7191_CONTROL_BANDPASS_WEIGHT:
486 case SAA7191_CONTROL_CORING:
487 reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
488 switch (ctrl->type) {
489 case SAA7191_CONTROL_BANDPASS:
490 reg &= ~SAA7191_LUMA_BPSS_MASK;
491 reg |= (ctrl->value << SAA7191_LUMA_BPSS_SHIFT)
492 & SAA7191_LUMA_BPSS_MASK;
493 break;
494 case SAA7191_CONTROL_BANDPASS_WEIGHT:
495 reg &= ~SAA7191_LUMA_APER_MASK;
496 reg |= (ctrl->value << SAA7191_LUMA_APER_SHIFT)
497 & SAA7191_LUMA_APER_MASK;
498 break;
499 case SAA7191_CONTROL_CORING:
500 reg &= ~SAA7191_LUMA_CORI_MASK;
501 reg |= (ctrl->value << SAA7191_LUMA_CORI_SHIFT)
502 & SAA7191_LUMA_CORI_MASK;
503 break;
504 }
505 ret = saa7191_write_reg(client, SAA7191_REG_LUMA, reg);
506 break;
507 case SAA7191_CONTROL_FORCE_COLOUR:
508 case SAA7191_CONTROL_CHROMA_GAIN:
509 reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
510 if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR) {
511 if (ctrl->value)
512 reg |= SAA7191_GAIN_COLO;
513 else
514 reg &= ~SAA7191_GAIN_COLO;
515 } else {
516 reg &= ~SAA7191_GAIN_LFIS_MASK;
517 reg |= (ctrl->value << SAA7191_GAIN_LFIS_SHIFT)
518 & SAA7191_GAIN_LFIS_MASK;
519 }
520 ret = saa7191_write_reg(client, SAA7191_REG_GAIN, reg);
521 break;
522 case SAA7191_CONTROL_HUE:
523 reg = ctrl->value & 0xff;
524 if (reg < 0x80)
525 reg += 0x80;
526 else
527 reg -= 0x80;
528 ret = saa7191_write_reg(client, SAA7191_REG_HUEC, reg);
529 break;
530 case SAA7191_CONTROL_VTRC:
531 reg = saa7191_read_reg(client, SAA7191_REG_STDC);
532 if (ctrl->value)
533 reg |= SAA7191_STDC_VTRC;
534 else
535 reg &= ~SAA7191_STDC_VTRC;
536 ret = saa7191_write_reg(client, SAA7191_REG_STDC, reg);
537 break;
538 case SAA7191_CONTROL_LUMA_DELAY: {
539 s32 value = ctrl->value;
540 if (value < 0)
541 value += 8;
542 reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
543 reg &= ~SAA7191_CTL3_YDEL_MASK;
544 reg |= (value << SAA7191_CTL3_YDEL_SHIFT)
545 & SAA7191_CTL3_YDEL_MASK;
546 ret = saa7191_write_reg(client, SAA7191_REG_CTL3, reg);
547 break;
548 }
549 case SAA7191_CONTROL_VNR:
550 reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
551 reg &= ~SAA7191_CTL4_VNOI_MASK;
552 reg |= (ctrl->value << SAA7191_CTL4_VNOI_SHIFT)
553 & SAA7191_CTL4_VNOI_MASK;
554 ret = saa7191_write_reg(client, SAA7191_REG_CTL4, reg);
555 break;
556 default:
557 ret = -EINVAL;
271 } 558 }
272 559
273 return 0; 560 return ret;
274} 561}
275 562
276/* I2C-interface */ 563/* I2C-interface */
@@ -309,11 +596,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
309 if (err) 596 if (err)
310 goto out_free_decoder; 597 goto out_free_decoder;
311 598
312 decoder->input = SAA7191_INPUT_COMPOSITE; 599 err = saa7191_write_block(client, sizeof(initseq), (u8 *)initseq);
313 decoder->norm = SAA7191_NORM_AUTO;
314
315 err = saa7191_write_block(client, sizeof(initseq),
316 (unsigned char *)initseq);
317 if (err) { 600 if (err) {
318 printk(KERN_ERR "SAA7191 initialization failed\n"); 601 printk(KERN_ERR "SAA7191 initialization failed\n");
319 goto out_detach_client; 602 goto out_detach_client;
@@ -321,6 +604,14 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
321 604
322 printk(KERN_INFO "SAA7191 initialized\n"); 605 printk(KERN_INFO "SAA7191 initialized\n");
323 606
607 decoder->input = SAA7191_INPUT_COMPOSITE;
608 decoder->norm = SAA7191_NORM_PAL;
609
610 err = saa7191_autodetect_norm(client);
611 if (err && (err != -EBUSY)) {
612 printk(KERN_ERR "SAA7191: Signal auto-detection failed\n");
613 }
614
324 return 0; 615 return 0;
325 616
326out_detach_client: 617out_detach_client:
@@ -368,7 +659,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
368 } 659 }
369 case DECODER_GET_STATUS: { 660 case DECODER_GET_STATUS: {
370 int *iarg = arg; 661 int *iarg = arg;
371 unsigned char status; 662 u8 status;
372 int res = 0; 663 int res = 0;
373 664
374 if (saa7191_read_status(client, &status)) { 665 if (saa7191_read_status(client, &status)) {
@@ -404,7 +695,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
404 695
405 switch (*iarg) { 696 switch (*iarg) {
406 case VIDEO_MODE_AUTO: 697 case VIDEO_MODE_AUTO:
407 return saa7191_set_norm(client, SAA7191_NORM_AUTO); 698 return saa7191_autodetect_norm(client);
408 case VIDEO_MODE_PAL: 699 case VIDEO_MODE_PAL:
409 return saa7191_set_norm(client, SAA7191_NORM_PAL); 700 return saa7191_set_norm(client, SAA7191_NORM_PAL);
410 case VIDEO_MODE_NTSC: 701 case VIDEO_MODE_NTSC:
@@ -446,38 +737,48 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
446 int err; 737 int err;
447 738
448 val = (pic->hue >> 8) - 0x80; 739 val = (pic->hue >> 8) - 0x80;
740
449 err = saa7191_write_reg(client, SAA7191_REG_HUEC, val); 741 err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
450 if (err) 742 if (err)
451 return -EIO; 743 return -EIO;
744
452 break; 745 break;
453 } 746 }
454 case DECODER_SAA7191_GET_STATUS: { 747 case DECODER_SAA7191_GET_STATUS: {
455 struct saa7191_status *status = arg; 748 struct saa7191_status *status = arg;
456 unsigned char status_reg; 749 u8 status_reg;
457 750
458 if (saa7191_read_status(client, &status_reg)) 751 if (saa7191_read_status(client, &status_reg))
459 return -EIO; 752 return -EIO;
753
460 status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0) 754 status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
461 ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED; 755 ? 1 : 0;
462 status->ntsc = (status_reg & SAA7191_STATUS_FIDT) 756 status->signal_60hz = (status_reg & SAA7191_STATUS_FIDT)
463 ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED; 757 ? 1 : 0;
464 status->color = (status_reg & SAA7191_STATUS_CODE) 758 status->color = (status_reg & SAA7191_STATUS_CODE) ? 1 : 0;
465 ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
466 759
467 status->input = decoder->input; 760 status->input = decoder->input;
468 status->norm = decoder->norm; 761 status->norm = decoder->norm;
762
763 break;
469 } 764 }
470 case DECODER_SAA7191_SET_NORM: { 765 case DECODER_SAA7191_SET_NORM: {
471 int *norm = arg; 766 int *norm = arg;
472 return saa7191_set_norm(client, *norm); 767
768 switch (*norm) {
769 case SAA7191_NORM_AUTO:
770 return saa7191_autodetect_norm(client);
771 case SAA7191_NORM_AUTO_EXT:
772 return saa7191_autodetect_norm_extended(client);
773 default:
774 return saa7191_set_norm(client, *norm);
775 }
473 } 776 }
474 case DECODER_SAA7191_GET_CONTROLS: { 777 case DECODER_SAA7191_GET_CONTROL: {
475 struct saa7191_control *ctrl = arg; 778 return saa7191_get_control(client, arg);
476 return saa7191_get_controls(client, ctrl);
477 } 779 }
478 case DECODER_SAA7191_SET_CONTROLS: { 780 case DECODER_SAA7191_SET_CONTROL: {
479 struct saa7191_control *ctrl = arg; 781 return saa7191_set_control(client, arg);
480 return saa7191_set_controls(client, ctrl);
481 } 782 }
482 default: 783 default:
483 return -EINVAL; 784 return -EINVAL;
@@ -488,12 +789,12 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
488 789
489static struct i2c_driver i2c_driver_saa7191 = { 790static struct i2c_driver i2c_driver_saa7191 = {
490 .owner = THIS_MODULE, 791 .owner = THIS_MODULE,
491 .name = "saa7191", 792 .name = "saa7191",
492 .id = I2C_DRIVERID_SAA7191, 793 .id = I2C_DRIVERID_SAA7191,
493 .flags = I2C_DF_NOTIFY, 794 .flags = I2C_DF_NOTIFY,
494 .attach_adapter = saa7191_probe, 795 .attach_adapter = saa7191_probe,
495 .detach_client = saa7191_detach, 796 .detach_client = saa7191_detach,
496 .command = saa7191_command 797 .command = saa7191_command
497}; 798};
498 799
499static int saa7191_init(void) 800static int saa7191_init(void)
diff --git a/drivers/media/video/saa7191.h b/drivers/media/video/saa7191.h
index 272045031435..a2310da1940d 100644
--- a/drivers/media/video/saa7191.h
+++ b/drivers/media/video/saa7191.h
@@ -24,8 +24,8 @@
24#define SAA7191_REG_HPHI 0x05 24#define SAA7191_REG_HPHI 0x05
25#define SAA7191_REG_LUMA 0x06 25#define SAA7191_REG_LUMA 0x06
26#define SAA7191_REG_HUEC 0x07 26#define SAA7191_REG_HUEC 0x07
27#define SAA7191_REG_CKTQ 0x08 27#define SAA7191_REG_CKTQ 0x08 /* bits 3-7 */
28#define SAA7191_REG_CKTS 0x09 28#define SAA7191_REG_CKTS 0x09 /* bits 3-7 */
29#define SAA7191_REG_PLSE 0x0a 29#define SAA7191_REG_PLSE 0x0a
30#define SAA7191_REG_SESE 0x0b 30#define SAA7191_REG_SESE 0x0b
31#define SAA7191_REG_GAIN 0x0c 31#define SAA7191_REG_GAIN 0x0c
@@ -43,30 +43,82 @@
43 43
44/* Status Register definitions */ 44/* Status Register definitions */
45#define SAA7191_STATUS_CODE 0x01 /* color detected flag */ 45#define SAA7191_STATUS_CODE 0x01 /* color detected flag */
46#define SAA7191_STATUS_FIDT 0x20 /* format type NTSC/PAL */ 46#define SAA7191_STATUS_FIDT 0x20 /* signal type 50/60 Hz */
47#define SAA7191_STATUS_HLCK 0x40 /* PLL unlocked/locked */ 47#define SAA7191_STATUS_HLCK 0x40 /* PLL unlocked(1)/locked(0) */
48#define SAA7191_STATUS_STTC 0x80 /* tv/vtr time constant */ 48#define SAA7191_STATUS_STTC 0x80 /* tv/vtr time constant */
49 49
50/* Luminance Control Register definitions */ 50/* Luminance Control Register definitions */
51/* input mode select bit:
52 * 0=CVBS (chrominance trap active), 1=S-Video (trap bypassed) */
51#define SAA7191_LUMA_BYPS 0x80 53#define SAA7191_LUMA_BYPS 0x80
52 54/* pre-filter (only when chrominance trap is active) */
53/* Chroma Gain Control Settings Register definitions */ 55#define SAA7191_LUMA_PREF 0x40
54/* 0=automatic colour-killer enabled, 1=forced colour on */ 56/* aperture bandpass to select different characteristics with maximums
57 * (bits 4-5) */
58#define SAA7191_LUMA_BPSS_MASK 0x30
59#define SAA7191_LUMA_BPSS_SHIFT 4
60#define SAA7191_LUMA_BPSS_3 0x30
61#define SAA7191_LUMA_BPSS_2 0x20
62#define SAA7191_LUMA_BPSS_1 0x10
63#define SAA7191_LUMA_BPSS_0 0x00
64/* coring range for high frequency components according to 8-bit luminance
65 * (bits 2-3)
66 * 0=coring off, n= (+-)n LSB */
67#define SAA7191_LUMA_CORI_MASK 0x0c
68#define SAA7191_LUMA_CORI_SHIFT 2
69#define SAA7191_LUMA_CORI_3 0x0c
70#define SAA7191_LUMA_CORI_2 0x08
71#define SAA7191_LUMA_CORI_1 0x04
72#define SAA7191_LUMA_CORI_0 0x00
73/* aperture bandpass filter weights high frequency components of luminance
74 * signal (bits 0-1)
75 * 0=factor 0, 1=0.25, 2=0.5, 3=1 */
76#define SAA7191_LUMA_APER_MASK 0x03
77#define SAA7191_LUMA_APER_SHIFT 0
78#define SAA7191_LUMA_APER_3 0x03
79#define SAA7191_LUMA_APER_2 0x02
80#define SAA7191_LUMA_APER_1 0x01
81#define SAA7191_LUMA_APER_0 0x00
82
83/* Chrominance Gain Control Settings Register definitions */
84/* colour on: 0=automatic colour-killer enabled, 1=forced colour on */
55#define SAA7191_GAIN_COLO 0x80 85#define SAA7191_GAIN_COLO 0x80
86/* chrominance gain control (AGC filter)
87 * 0=loop filter time constant slow, 1=medium, 2=fast, 3=actual gain */
88#define SAA7191_GAIN_LFIS_MASK 0x60
89#define SAA7191_GAIN_LFIS_SHIFT 5
90#define SAA7191_GAIN_LFIS_3 0x60
91#define SAA7191_GAIN_LFIS_2 0x40
92#define SAA7191_GAIN_LFIS_1 0x20
93#define SAA7191_GAIN_LFIS_0 0x00
56 94
57/* Standard/Mode Control Register definitions */ 95/* Standard/Mode Control Register definitions */
58/* tv/vtr mode bit: 0=TV mode (slow time constant), 96/* tv/vtr mode bit: 0=TV mode (slow time constant),
59 * 1=VTR mode (fast time constant) */ 97 * 1=VTR mode (fast time constant) */
60#define SAA7191_STDC_VTRC 0x80 98#define SAA7191_STDC_VTRC 0x80
99/* SAA7191B-specific functions enable (RTCO, ODD and GPSW0 outputs)
100 * 0=outputs set to high-impedance (circuit equals SAA7191), 1=enabled */
101#define SAA7191_STDC_NFEN 0x08
102/* HREF generation: 0=like SAA7191, 1=HREF is 8xLLC2 clocks earlier */
103#define SAA7191_STDC_HRMV 0x04
104/* general purpose switch 0
105 * (not used with VINO afaik) */
106#define SAA7191_STDC_GPSW0 0x02
61/* SECAM mode bit: 0=other standards, 1=SECAM */ 107/* SECAM mode bit: 0=other standards, 1=SECAM */
62#define SAA7191_STDC_SECS 0x01 108#define SAA7191_STDC_SECS 0x01
63/* the bit fields above must be or'd with this value */
64#define SAA7191_STDC_VALUE 0x0c
65 109
66/* I/O and Clock Control Register definitions */ 110/* I/O and Clock Control Register definitions */
67/* horizontal clock PLL: 0=PLL closed, 111/* horizontal clock PLL: 0=PLL closed,
68 * 1=PLL circuit open and horizontal freq fixed */ 112 * 1=PLL circuit open and horizontal freq fixed */
69#define SAA7191_IOCK_HPLL 0x80 113#define SAA7191_IOCK_HPLL 0x80
114/* colour-difference output enable (outputs UV0-UV7) */
115#define SAA7191_IOCK_OEDC 0x40
116/* H-sync output enable */
117#define SAA7191_IOCK_OEHS 0x20
118/* V-sync output enable */
119#define SAA7191_IOCK_OEVS 0x10
120/* luminance output enable (outputs Y0-Y7) */
121#define SAA7191_IOCK_OEDY 0x08
70/* S-VHS bit (chrominance from CVBS or from chrominance input): 122/* S-VHS bit (chrominance from CVBS or from chrominance input):
71 * 0=controlled by BYPS-bit, 1=from chrominance input */ 123 * 0=controlled by BYPS-bit, 1=from chrominance input */
72#define SAA7191_IOCK_CHRS 0x04 124#define SAA7191_IOCK_CHRS 0x04
@@ -83,11 +135,40 @@
83/* field select: (if AUFD=0) 135/* field select: (if AUFD=0)
84 * 0=50Hz (625 lines), 1=60Hz (525 lines) */ 136 * 0=50Hz (625 lines), 1=60Hz (525 lines) */
85#define SAA7191_CTL3_FSEL 0x40 137#define SAA7191_CTL3_FSEL 0x40
86/* the bit fields above must be or'd with this value */ 138/* SECAM cross-colour reduction enable */
87#define SAA7191_CTL3_VALUE 0x19 139#define SAA7191_CTL3_SXCR 0x20
140/* sync and clamping pulse enable (HCL and HSY outputs) */
141#define SAA7191_CTL3_SCEN 0x10
142/* output format: 0=4:1:1, 1=4:2:2 (4:2:2 for VINO) */
143#define SAA7191_CTL3_OFTS 0x08
144/* luminance delay compensation
145 * 0=0*2/LLC, 1=+1*2/LLC, 2=+2*2/LLC, 3=+3*2/LLC,
146 * 4=-4*2/LLC, 5=-3*2/LLC, 6=-2*2/LLC, 7=-1*2/LLC
147 * step size = 2/LLC = 67.8ns for 50Hz, 81.5ns for 60Hz */
148#define SAA7191_CTL3_YDEL_MASK 0x07
149#define SAA7191_CTL3_YDEL_SHIFT 0
150#define SAA7191_CTL3_YDEL2 0x04
151#define SAA7191_CTL3_YDEL1 0x02
152#define SAA7191_CTL3_YDEL0 0x01
153
154/* Miscellaneous Control #2 Register definitions */
155/* select HREF position
156 * 0=normal, HREF is matched to YUV output port,
157 * 1=HREF is matched to CVBS input port */
158#define SAA7191_CTL4_HRFS 0x04
159/* vertical noise reduction
160 * 0=normal, 1=searching window, 2=auto-deflection, 3=reduction bypassed */
161#define SAA7191_CTL4_VNOI_MASK 0x03
162#define SAA7191_CTL4_VNOI_SHIFT 0
163#define SAA7191_CTL4_VNOI_3 0x03
164#define SAA7191_CTL4_VNOI_2 0x02
165#define SAA7191_CTL4_VNOI_1 0x01
166#define SAA7191_CTL4_VNOI_0 0x00
88 167
89/* Chrominance Gain Control Register definitions 168/* Chrominance Gain Control Register definitions
90 * (nominal value for UV CCIR level) */ 169 * - for QAM-modulated input signals, effects output amplitude
170 * (SECAM gain fixed)
171 * (nominal values for UV CCIR level) */
91#define SAA7191_CHCV_NTSC 0x2c 172#define SAA7191_CHCV_NTSC 0x2c
92#define SAA7191_CHCV_PAL 0x59 173#define SAA7191_CHCV_PAL 0x59
93 174
@@ -99,16 +180,13 @@
99#define SAA7191_NORM_PAL 1 180#define SAA7191_NORM_PAL 1
100#define SAA7191_NORM_NTSC 2 181#define SAA7191_NORM_NTSC 2
101#define SAA7191_NORM_SECAM 3 182#define SAA7191_NORM_SECAM 3
102 183#define SAA7191_NORM_AUTO_EXT 4 /* extended auto-detection */
103#define SAA7191_VALUE_ENABLED 1
104#define SAA7191_VALUE_DISABLED 0
105#define SAA7191_VALUE_UNCHANGED -1
106 184
107struct saa7191_status { 185struct saa7191_status {
108 /* 0=no signal, 1=signal active*/ 186 /* 0=no signal, 1=signal detected */
109 int signal; 187 int signal;
110 /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */ 188 /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */
111 int ntsc; 189 int signal_60hz;
112 /* 0=no color detected, 1=color detected */ 190 /* 0=no color detected, 1=color detected */
113 int color; 191 int color;
114 192
@@ -118,22 +196,60 @@ struct saa7191_status {
118 int norm; 196 int norm;
119}; 197};
120 198
121#define SAA7191_HUE_MIN 0x00 199#define SAA7191_BANDPASS_MIN 0x00
122#define SAA7191_HUE_MAX 0xff 200#define SAA7191_BANDPASS_MAX 0x03
123#define SAA7191_HUE_DEFAULT 0x80 201#define SAA7191_BANDPASS_DEFAULT 0x00
202
203#define SAA7191_BANDPASS_WEIGHT_MIN 0x00
204#define SAA7191_BANDPASS_WEIGHT_MAX 0x03
205#define SAA7191_BANDPASS_WEIGHT_DEFAULT 0x01
206
207#define SAA7191_CORING_MIN 0x00
208#define SAA7191_CORING_MAX 0x03
209#define SAA7191_CORING_DEFAULT 0x00
210
211#define SAA7191_HUE_MIN 0x00
212#define SAA7191_HUE_MAX 0xff
213#define SAA7191_HUE_DEFAULT 0x80
214
215#define SAA7191_VTRC_MIN 0x00
216#define SAA7191_VTRC_MAX 0x01
217#define SAA7191_VTRC_DEFAULT 0x00
218
219#define SAA7191_FORCE_COLOUR_MIN 0x00
220#define SAA7191_FORCE_COLOUR_MAX 0x01
221#define SAA7191_FORCE_COLOUR_DEFAULT 0x00
222
223#define SAA7191_CHROMA_GAIN_MIN 0x00
224#define SAA7191_CHROMA_GAIN_MAX 0x03
225#define SAA7191_CHROMA_GAIN_DEFAULT 0x00
226
227#define SAA7191_LUMA_DELAY_MIN -0x04
228#define SAA7191_LUMA_DELAY_MAX 0x03
229#define SAA7191_LUMA_DELAY_DEFAULT 0x01
230
231#define SAA7191_VNR_MIN 0x00
232#define SAA7191_VNR_MAX 0x03
233#define SAA7191_VNR_DEFAULT 0x00
124 234
125#define SAA7191_VTRC_MIN 0x00 235#define SAA7191_CONTROL_BANDPASS 0
126#define SAA7191_VTRC_MAX 0x01 236#define SAA7191_CONTROL_BANDPASS_WEIGHT 1
127#define SAA7191_VTRC_DEFAULT 0x00 237#define SAA7191_CONTROL_CORING 2
238#define SAA7191_CONTROL_FORCE_COLOUR 3 /* boolean */
239#define SAA7191_CONTROL_CHROMA_GAIN 4
240#define SAA7191_CONTROL_HUE 5
241#define SAA7191_CONTROL_VTRC 6 /* boolean */
242#define SAA7191_CONTROL_LUMA_DELAY 7
243#define SAA7191_CONTROL_VNR 8
128 244
129struct saa7191_control { 245struct saa7191_control {
130 int hue; 246 u8 type;
131 int vtrc; 247 s32 value;
132}; 248};
133 249
134#define DECODER_SAA7191_GET_STATUS _IOR('d', 195, struct saa7191_status) 250#define DECODER_SAA7191_GET_STATUS _IOR('d', 195, struct saa7191_status)
135#define DECODER_SAA7191_SET_NORM _IOW('d', 196, int) 251#define DECODER_SAA7191_SET_NORM _IOW('d', 196, int)
136#define DECODER_SAA7191_GET_CONTROLS _IOR('d', 197, struct saa7191_control) 252#define DECODER_SAA7191_GET_CONTROL _IOR('d', 197, struct saa7191_control)
137#define DECODER_SAA7191_SET_CONTROLS _IOW('d', 198, struct saa7191_control) 253#define DECODER_SAA7191_SET_CONTROL _IOW('d', 198, struct saa7191_control)
138 254
139#endif 255#endif
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 59bb71381a1b..d679ca23ded7 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -1006,10 +1006,8 @@ v4l_compat_translate_ioctl(struct inode *inode,
1006 break; 1006 break;
1007 } 1007 }
1008 1008
1009 if (cap2) 1009 kfree(cap2);
1010 kfree(cap2); 1010 kfree(fmt2);
1011 if (fmt2)
1012 kfree(fmt2);
1013 return err; 1011 return err;
1014} 1012}
1015 1013
diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c
index c9d5f1a873cc..839db622040d 100644
--- a/drivers/media/video/videocodec.c
+++ b/drivers/media/video/videocodec.c
@@ -353,8 +353,7 @@ videocodec_build_table (void)
353 dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i, 353 dprintk(3, "videocodec_build table: %d entries, %d bytes\n", i,
354 size); 354 size);
355 355
356 if (videocodec_buf) 356 kfree(videocodec_buf);
357 kfree(videocodec_buf);
358 videocodec_buf = (char *) kmalloc(size, GFP_KERNEL); 357 videocodec_buf = (char *) kmalloc(size, GFP_KERNEL);
359 358
360 i = 0; 359 i = 0;
@@ -471,8 +470,7 @@ videocodec_exit (void)
471{ 470{
472#ifdef CONFIG_PROC_FS 471#ifdef CONFIG_PROC_FS
473 remove_proc_entry("videocodecs", NULL); 472 remove_proc_entry("videocodecs", NULL);
474 if (videocodec_buf) 473 kfree(videocodec_buf);
475 kfree(videocodec_buf);
476#endif 474#endif
477} 475}
478 476
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 06df15f75de9..83c49f9610d0 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -215,8 +215,7 @@ video_usercopy(struct inode *inode, struct file *file,
215 } 215 }
216 216
217out: 217out:
218 if (mbuf) 218 kfree(mbuf);
219 kfree(mbuf);
220 return err; 219 return err;
221} 220}
222 221
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index ed4394e854ab..71b28e9e0850 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -12,15 +12,11 @@
12 12
13/* 13/*
14 * TODO: 14 * TODO:
15 * - remove "hacks" from memory allocation code and implement nopage() 15 * - remove "mark pages reserved-hacks" from memory allocation code
16 * and implement nopage()
16 * - check decimation, calculating and reporting image size when 17 * - check decimation, calculating and reporting image size when
17 * using decimation 18 * using decimation
18 * - check vino_acquire_input(), vino_set_input() and channel 19 * - implement read(), user mode buffers and overlay (?)
19 * ownership handling
20 * - report VINO error-interrupts via ioctls ?
21 * - implement picture controls (all implemented?)
22 * - use macros for boolean values (?)
23 * - implement user mode buffers and overlay (?)
24 */ 20 */
25 21
26#include <linux/init.h> 22#include <linux/init.h>
@@ -60,18 +56,16 @@
60 * debug info. 56 * debug info.
61 * Note that the debug output also slows down the driver significantly */ 57 * Note that the debug output also slows down the driver significantly */
62// #define VINO_DEBUG 58// #define VINO_DEBUG
59// #define VINO_DEBUG_INT
63 60
64#define VINO_MODULE_VERSION "0.0.3" 61#define VINO_MODULE_VERSION "0.0.5"
65#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 3) 62#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
66 63
67MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver"); 64MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
68MODULE_VERSION(VINO_MODULE_VERSION); 65MODULE_VERSION(VINO_MODULE_VERSION);
69MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); 66MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
70MODULE_LICENSE("GPL"); 67MODULE_LICENSE("GPL");
71 68
72#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
73#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
74
75#ifdef VINO_DEBUG 69#ifdef VINO_DEBUG
76#define dprintk(x...) printk("VINO: " x); 70#define dprintk(x...) printk("VINO: " x);
77#else 71#else
@@ -91,15 +85,16 @@ MODULE_LICENSE("GPL");
91#define VINO_MIN_HEIGHT 32 85#define VINO_MIN_HEIGHT 32
92 86
93#define VINO_CLIPPING_START_ODD_D1 1 87#define VINO_CLIPPING_START_ODD_D1 1
94#define VINO_CLIPPING_START_ODD_PAL 1 88#define VINO_CLIPPING_START_ODD_PAL 15
95#define VINO_CLIPPING_START_ODD_NTSC 1 89#define VINO_CLIPPING_START_ODD_NTSC 12
96 90
97#define VINO_CLIPPING_START_EVEN_D1 2 91#define VINO_CLIPPING_START_EVEN_D1 2
98#define VINO_CLIPPING_START_EVEN_PAL 2 92#define VINO_CLIPPING_START_EVEN_PAL 15
99#define VINO_CLIPPING_START_EVEN_NTSC 2 93#define VINO_CLIPPING_START_EVEN_NTSC 12
100 94
101#define VINO_INPUT_CHANNEL_COUNT 3 95#define VINO_INPUT_CHANNEL_COUNT 3
102 96
97/* the number is the index for vino_inputs */
103#define VINO_INPUT_NONE -1 98#define VINO_INPUT_NONE -1
104#define VINO_INPUT_COMPOSITE 0 99#define VINO_INPUT_COMPOSITE 0
105#define VINO_INPUT_SVIDEO 1 100#define VINO_INPUT_SVIDEO 1
@@ -107,15 +102,13 @@ MODULE_LICENSE("GPL");
107 102
108#define VINO_PAGE_RATIO (PAGE_SIZE / VINO_PAGE_SIZE) 103#define VINO_PAGE_RATIO (PAGE_SIZE / VINO_PAGE_SIZE)
109 104
110#define VINO_FIFO_THRESHOLD_DEFAULT 512 105#define VINO_FIFO_THRESHOLD_DEFAULT 16
111 106
112/*#define VINO_FRAMEBUFFER_SIZE (VINO_PAL_WIDTH * VINO_PAL_HEIGHT * 4 \
113 + 2 * PAGE_SIZE)*/
114#define VINO_FRAMEBUFFER_SIZE ((VINO_PAL_WIDTH \ 107#define VINO_FRAMEBUFFER_SIZE ((VINO_PAL_WIDTH \
115 * VINO_PAL_HEIGHT * 4 \ 108 * VINO_PAL_HEIGHT * 4 \
116 + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1)) 109 + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1))
117 110
118#define VINO_FRAMEBUFFER_MAX_COUNT 8 111#define VINO_FRAMEBUFFER_COUNT_MAX 8
119 112
120#define VINO_FRAMEBUFFER_UNUSED 0 113#define VINO_FRAMEBUFFER_UNUSED 0
121#define VINO_FRAMEBUFFER_IN_USE 1 114#define VINO_FRAMEBUFFER_IN_USE 1
@@ -131,24 +124,27 @@ MODULE_LICENSE("GPL");
131#define VINO_DUMMY_DESC_COUNT 4 124#define VINO_DUMMY_DESC_COUNT 4
132#define VINO_DESC_FETCH_DELAY 5 /* microseconds */ 125#define VINO_DESC_FETCH_DELAY 5 /* microseconds */
133 126
127#define VINO_MAX_FRAME_SKIP_COUNT 128
128
134/* the number is the index for vino_data_formats */ 129/* the number is the index for vino_data_formats */
135#define VINO_DATA_FMT_NONE -1 130#define VINO_DATA_FMT_NONE -1
136#define VINO_DATA_FMT_GREY 0 131#define VINO_DATA_FMT_GREY 0
137#define VINO_DATA_FMT_RGB332 1 132#define VINO_DATA_FMT_RGB332 1
138#define VINO_DATA_FMT_RGB32 2 133#define VINO_DATA_FMT_RGB32 2
139#define VINO_DATA_FMT_YUV 3 134#define VINO_DATA_FMT_YUV 3
140//#define VINO_DATA_FMT_RGB24 4
141 135
142#define VINO_DATA_FMT_COUNT 4 136#define VINO_DATA_FMT_COUNT 4
143 137
138/* the number is the index for vino_data_norms */
144#define VINO_DATA_NORM_NONE -1 139#define VINO_DATA_NORM_NONE -1
145#define VINO_DATA_NORM_NTSC 0 140#define VINO_DATA_NORM_NTSC 0
146#define VINO_DATA_NORM_PAL 1 141#define VINO_DATA_NORM_PAL 1
147#define VINO_DATA_NORM_SECAM 2 142#define VINO_DATA_NORM_SECAM 2
148#define VINO_DATA_NORM_D1 3 143#define VINO_DATA_NORM_D1 3
149/* The following is a special entry that can be used to 144/* The following are special entries that can be used to
150 * autodetect the norm. */ 145 * autodetect the norm. */
151#define VINO_DATA_NORM_AUTO 0xff 146#define VINO_DATA_NORM_AUTO 0xfe
147#define VINO_DATA_NORM_AUTO_EXT 0xff
152 148
153#define VINO_DATA_NORM_COUNT 4 149#define VINO_DATA_NORM_COUNT 4
154 150
@@ -232,7 +228,7 @@ struct vino_framebuffer_fifo {
232 unsigned int head; 228 unsigned int head;
233 unsigned int tail; 229 unsigned int tail;
234 230
235 unsigned int data[VINO_FRAMEBUFFER_MAX_COUNT]; 231 unsigned int data[VINO_FRAMEBUFFER_COUNT_MAX];
236}; 232};
237 233
238struct vino_framebuffer_queue { 234struct vino_framebuffer_queue {
@@ -246,13 +242,20 @@ struct vino_framebuffer_queue {
246 struct vino_framebuffer_fifo in; 242 struct vino_framebuffer_fifo in;
247 struct vino_framebuffer_fifo out; 243 struct vino_framebuffer_fifo out;
248 244
249 struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_MAX_COUNT]; 245 struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_COUNT_MAX];
250 246
251 spinlock_t queue_lock; 247 spinlock_t queue_lock;
252 struct semaphore queue_sem; 248 struct semaphore queue_sem;
253 wait_queue_head_t frame_wait_queue; 249 wait_queue_head_t frame_wait_queue;
254}; 250};
255 251
252struct vino_interrupt_data {
253 struct timeval timestamp;
254 unsigned int frame_counter;
255 unsigned int skip_count;
256 unsigned int skip;
257};
258
256struct vino_channel_settings { 259struct vino_channel_settings {
257 unsigned int channel; 260 unsigned int channel;
258 261
@@ -285,6 +288,8 @@ struct vino_channel_settings {
285 288
286 unsigned int users; 289 unsigned int users;
287 290
291 struct vino_interrupt_data int_data;
292
288 /* V4L support */ 293 /* V4L support */
289 struct video_device *v4l_device; 294 struct video_device *v4l_device;
290}; 295};
@@ -315,7 +320,7 @@ struct vino_settings {
315/* Module parameters */ 320/* Module parameters */
316 321
317/* 322/*
318 * Using vino_pixel_conversion the ARGB32-format pixels supplied 323 * Using vino_pixel_conversion the ABGR32-format pixels supplied
319 * by the VINO chip can be converted to more common formats 324 * by the VINO chip can be converted to more common formats
320 * like RGBA32 (or probably RGB24 in the future). This way we 325 * like RGBA32 (or probably RGB24 in the future). This way we
321 * can give out data that can be specified correctly with 326 * can give out data that can be specified correctly with
@@ -329,7 +334,9 @@ struct vino_settings {
329 * Use non-zero value to enable conversion. 334 * Use non-zero value to enable conversion.
330 */ 335 */
331static int vino_pixel_conversion = 0; 336static int vino_pixel_conversion = 0;
337
332module_param_named(pixelconv, vino_pixel_conversion, int, 0); 338module_param_named(pixelconv, vino_pixel_conversion, int, 0);
339
333MODULE_PARM_DESC(pixelconv, 340MODULE_PARM_DESC(pixelconv,
334 "enable pixel conversion (non-zero value enables)"); 341 "enable pixel conversion (non-zero value enables)");
335 342
@@ -345,15 +352,22 @@ static const char *vino_bus_name = "GIO64 bus";
345static const char *vino_v4l_device_name_a = "SGI VINO Channel A"; 352static const char *vino_v4l_device_name_a = "SGI VINO Channel A";
346static const char *vino_v4l_device_name_b = "SGI VINO Channel B"; 353static const char *vino_v4l_device_name_b = "SGI VINO Channel B";
347 354
355static void vino_capture_tasklet(unsigned long channel);
356
357DECLARE_TASKLET(vino_tasklet_a, vino_capture_tasklet, VINO_CHANNEL_A);
358DECLARE_TASKLET(vino_tasklet_b, vino_capture_tasklet, VINO_CHANNEL_B);
359
348static const struct vino_input vino_inputs[] = { 360static const struct vino_input vino_inputs[] = {
349 { 361 {
350 .name = "Composite", 362 .name = "Composite",
351 .std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM, 363 .std = V4L2_STD_NTSC | V4L2_STD_PAL
364 | V4L2_STD_SECAM,
352 },{ 365 },{
353 .name = "S-Video", 366 .name = "S-Video",
354 .std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM, 367 .std = V4L2_STD_NTSC | V4L2_STD_PAL
368 | V4L2_STD_SECAM,
355 },{ 369 },{
356 .name = "D1 (IndyCam)", 370 .name = "D1/IndyCam",
357 .std = V4L2_STD_NTSC, 371 .std = V4L2_STD_NTSC,
358 } 372 }
359}; 373};
@@ -376,15 +390,10 @@ static const struct vino_data_format vino_data_formats[] = {
376 .colorspace = V4L2_COLORSPACE_SRGB, 390 .colorspace = V4L2_COLORSPACE_SRGB,
377 },{ 391 },{
378 .description = "YUV 4:2:2", 392 .description = "YUV 4:2:2",
379 .bpp = 4, 393 .bpp = 2,
380 .pixelformat = V4L2_PIX_FMT_YUYV, // XXX: swapped? 394 .pixelformat = V4L2_PIX_FMT_YUYV, // XXX: swapped?
381 .colorspace = V4L2_COLORSPACE_SMPTE170M, 395 .colorspace = V4L2_COLORSPACE_SMPTE170M,
382 }/*,{ 396 }
383 .description = "24-bit RGB",
384 .bpp = 3,
385 .pixelformat = V4L2_PIX_FMT_RGB24,
386 .colorspace = V4L2_COLORSPACE_SRGB,
387 }*/
388}; 397};
389 398
390static const struct vino_data_norm vino_data_norms[] = { 399static const struct vino_data_norm vino_data_norms[] = {
@@ -397,18 +406,18 @@ static const struct vino_data_norm vino_data_norms[] = {
397 .width = VINO_NTSC_WIDTH, 406 .width = VINO_NTSC_WIDTH,
398 .height = VINO_NTSC_HEIGHT, 407 .height = VINO_NTSC_HEIGHT,
399 .odd = { 408 .odd = {
400 .top = VINO_CLIPPING_START_ODD_NTSC, 409 .top = VINO_CLIPPING_START_ODD_NTSC,
401 .left = 0, 410 .left = 0,
402 .bottom = VINO_CLIPPING_START_ODD_NTSC 411 .bottom = VINO_CLIPPING_START_ODD_NTSC
403 + VINO_NTSC_HEIGHT / 2 - 1, 412 + VINO_NTSC_HEIGHT / 2 - 1,
404 .right = VINO_NTSC_WIDTH, 413 .right = VINO_NTSC_WIDTH,
405 }, 414 },
406 .even = { 415 .even = {
407 .top = VINO_CLIPPING_START_EVEN_NTSC, 416 .top = VINO_CLIPPING_START_EVEN_NTSC,
408 .left = 0, 417 .left = 0,
409 .bottom = VINO_CLIPPING_START_EVEN_NTSC 418 .bottom = VINO_CLIPPING_START_EVEN_NTSC
410 + VINO_NTSC_HEIGHT / 2 - 1, 419 + VINO_NTSC_HEIGHT / 2 - 1,
411 .right = VINO_NTSC_WIDTH, 420 .right = VINO_NTSC_WIDTH,
412 }, 421 },
413 },{ 422 },{
414 .description = "PAL", 423 .description = "PAL",
@@ -419,18 +428,18 @@ static const struct vino_data_norm vino_data_norms[] = {
419 .width = VINO_PAL_WIDTH, 428 .width = VINO_PAL_WIDTH,
420 .height = VINO_PAL_HEIGHT, 429 .height = VINO_PAL_HEIGHT,
421 .odd = { 430 .odd = {
422 .top = VINO_CLIPPING_START_ODD_PAL, 431 .top = VINO_CLIPPING_START_ODD_PAL,
423 .left = 0, 432 .left = 0,
424 .bottom = VINO_CLIPPING_START_ODD_PAL 433 .bottom = VINO_CLIPPING_START_ODD_PAL
425 + VINO_PAL_HEIGHT / 2 - 1, 434 + VINO_PAL_HEIGHT / 2 - 1,
426 .right = VINO_PAL_WIDTH, 435 .right = VINO_PAL_WIDTH,
427 }, 436 },
428 .even = { 437 .even = {
429 .top = VINO_CLIPPING_START_EVEN_PAL, 438 .top = VINO_CLIPPING_START_EVEN_PAL,
430 .left = 0, 439 .left = 0,
431 .bottom = VINO_CLIPPING_START_EVEN_PAL 440 .bottom = VINO_CLIPPING_START_EVEN_PAL
432 + VINO_PAL_HEIGHT / 2 - 1, 441 + VINO_PAL_HEIGHT / 2 - 1,
433 .right = VINO_PAL_WIDTH, 442 .right = VINO_PAL_WIDTH,
434 }, 443 },
435 },{ 444 },{
436 .description = "SECAM", 445 .description = "SECAM",
@@ -441,21 +450,21 @@ static const struct vino_data_norm vino_data_norms[] = {
441 .width = VINO_PAL_WIDTH, 450 .width = VINO_PAL_WIDTH,
442 .height = VINO_PAL_HEIGHT, 451 .height = VINO_PAL_HEIGHT,
443 .odd = { 452 .odd = {
444 .top = VINO_CLIPPING_START_ODD_PAL, 453 .top = VINO_CLIPPING_START_ODD_PAL,
445 .left = 0, 454 .left = 0,
446 .bottom = VINO_CLIPPING_START_ODD_PAL 455 .bottom = VINO_CLIPPING_START_ODD_PAL
447 + VINO_PAL_HEIGHT / 2 - 1, 456 + VINO_PAL_HEIGHT / 2 - 1,
448 .right = VINO_PAL_WIDTH, 457 .right = VINO_PAL_WIDTH,
449 }, 458 },
450 .even = { 459 .even = {
451 .top = VINO_CLIPPING_START_EVEN_PAL, 460 .top = VINO_CLIPPING_START_EVEN_PAL,
452 .left = 0, 461 .left = 0,
453 .bottom = VINO_CLIPPING_START_EVEN_PAL 462 .bottom = VINO_CLIPPING_START_EVEN_PAL
454 + VINO_PAL_HEIGHT / 2 - 1, 463 + VINO_PAL_HEIGHT / 2 - 1,
455 .right = VINO_PAL_WIDTH, 464 .right = VINO_PAL_WIDTH,
456 }, 465 },
457 },{ 466 },{
458 .description = "NTSC (D1 input)", 467 .description = "NTSC/D1",
459 .std = V4L2_STD_NTSC, 468 .std = V4L2_STD_NTSC,
460 .fps_min = 6, 469 .fps_min = 6,
461 .fps_max = 30, 470 .fps_max = 30,
@@ -463,18 +472,18 @@ static const struct vino_data_norm vino_data_norms[] = {
463 .width = VINO_NTSC_WIDTH, 472 .width = VINO_NTSC_WIDTH,
464 .height = VINO_NTSC_HEIGHT, 473 .height = VINO_NTSC_HEIGHT,
465 .odd = { 474 .odd = {
466 .top = VINO_CLIPPING_START_ODD_D1, 475 .top = VINO_CLIPPING_START_ODD_D1,
467 .left = 0, 476 .left = 0,
468 .bottom = VINO_CLIPPING_START_ODD_D1 477 .bottom = VINO_CLIPPING_START_ODD_D1
469 + VINO_NTSC_HEIGHT / 2 - 1, 478 + VINO_NTSC_HEIGHT / 2 - 1,
470 .right = VINO_NTSC_WIDTH, 479 .right = VINO_NTSC_WIDTH,
471 }, 480 },
472 .even = { 481 .even = {
473 .top = VINO_CLIPPING_START_EVEN_D1, 482 .top = VINO_CLIPPING_START_EVEN_D1,
474 .left = 0, 483 .left = 0,
475 .bottom = VINO_CLIPPING_START_EVEN_D1 484 .bottom = VINO_CLIPPING_START_EVEN_D1
476 + VINO_NTSC_HEIGHT / 2 - 1, 485 + VINO_NTSC_HEIGHT / 2 - 1,
477 .right = VINO_NTSC_WIDTH, 486 .right = VINO_NTSC_WIDTH,
478 }, 487 },
479 } 488 }
480}; 489};
@@ -491,7 +500,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
491 .step = 1, 500 .step = 1,
492 .default_value = INDYCAM_AGC_DEFAULT, 501 .default_value = INDYCAM_AGC_DEFAULT,
493 .flags = 0, 502 .flags = 0,
494 .reserved = { 0, 0 }, 503 .reserved = { INDYCAM_CONTROL_AGC, 0 },
495 },{ 504 },{
496 .id = V4L2_CID_AUTO_WHITE_BALANCE, 505 .id = V4L2_CID_AUTO_WHITE_BALANCE,
497 .type = V4L2_CTRL_TYPE_BOOLEAN, 506 .type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -501,7 +510,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
501 .step = 1, 510 .step = 1,
502 .default_value = INDYCAM_AWB_DEFAULT, 511 .default_value = INDYCAM_AWB_DEFAULT,
503 .flags = 0, 512 .flags = 0,
504 .reserved = { 0, 0 }, 513 .reserved = { INDYCAM_CONTROL_AWB, 0 },
505 },{ 514 },{
506 .id = V4L2_CID_GAIN, 515 .id = V4L2_CID_GAIN,
507 .type = V4L2_CTRL_TYPE_INTEGER, 516 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -511,7 +520,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
511 .step = 1, 520 .step = 1,
512 .default_value = INDYCAM_GAIN_DEFAULT, 521 .default_value = INDYCAM_GAIN_DEFAULT,
513 .flags = 0, 522 .flags = 0,
514 .reserved = { 0, 0 }, 523 .reserved = { INDYCAM_CONTROL_GAIN, 0 },
515 },{ 524 },{
516 .id = V4L2_CID_PRIVATE_BASE, 525 .id = V4L2_CID_PRIVATE_BASE,
517 .type = V4L2_CTRL_TYPE_INTEGER, 526 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -521,7 +530,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
521 .step = 1, 530 .step = 1,
522 .default_value = INDYCAM_RED_SATURATION_DEFAULT, 531 .default_value = INDYCAM_RED_SATURATION_DEFAULT,
523 .flags = 0, 532 .flags = 0,
524 .reserved = { 0, 0 }, 533 .reserved = { INDYCAM_CONTROL_RED_SATURATION, 0 },
525 },{ 534 },{
526 .id = V4L2_CID_PRIVATE_BASE + 1, 535 .id = V4L2_CID_PRIVATE_BASE + 1,
527 .type = V4L2_CTRL_TYPE_INTEGER, 536 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -531,7 +540,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
531 .step = 1, 540 .step = 1,
532 .default_value = INDYCAM_BLUE_SATURATION_DEFAULT, 541 .default_value = INDYCAM_BLUE_SATURATION_DEFAULT,
533 .flags = 0, 542 .flags = 0,
534 .reserved = { 0, 0 }, 543 .reserved = { INDYCAM_CONTROL_BLUE_SATURATION, 0 },
535 },{ 544 },{
536 .id = V4L2_CID_RED_BALANCE, 545 .id = V4L2_CID_RED_BALANCE,
537 .type = V4L2_CTRL_TYPE_INTEGER, 546 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -541,7 +550,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
541 .step = 1, 550 .step = 1,
542 .default_value = INDYCAM_RED_BALANCE_DEFAULT, 551 .default_value = INDYCAM_RED_BALANCE_DEFAULT,
543 .flags = 0, 552 .flags = 0,
544 .reserved = { 0, 0 }, 553 .reserved = { INDYCAM_CONTROL_RED_BALANCE, 0 },
545 },{ 554 },{
546 .id = V4L2_CID_BLUE_BALANCE, 555 .id = V4L2_CID_BLUE_BALANCE,
547 .type = V4L2_CTRL_TYPE_INTEGER, 556 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -551,7 +560,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
551 .step = 1, 560 .step = 1,
552 .default_value = INDYCAM_BLUE_BALANCE_DEFAULT, 561 .default_value = INDYCAM_BLUE_BALANCE_DEFAULT,
553 .flags = 0, 562 .flags = 0,
554 .reserved = { 0, 0 }, 563 .reserved = { INDYCAM_CONTROL_BLUE_BALANCE, 0 },
555 },{ 564 },{
556 .id = V4L2_CID_EXPOSURE, 565 .id = V4L2_CID_EXPOSURE,
557 .type = V4L2_CTRL_TYPE_INTEGER, 566 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -561,7 +570,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
561 .step = 1, 570 .step = 1,
562 .default_value = INDYCAM_SHUTTER_DEFAULT, 571 .default_value = INDYCAM_SHUTTER_DEFAULT,
563 .flags = 0, 572 .flags = 0,
564 .reserved = { 0, 0 }, 573 .reserved = { INDYCAM_CONTROL_SHUTTER, 0 },
565 },{ 574 },{
566 .id = V4L2_CID_GAMMA, 575 .id = V4L2_CID_GAMMA,
567 .type = V4L2_CTRL_TYPE_INTEGER, 576 .type = V4L2_CTRL_TYPE_INTEGER,
@@ -571,11 +580,11 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
571 .step = 1, 580 .step = 1,
572 .default_value = INDYCAM_GAMMA_DEFAULT, 581 .default_value = INDYCAM_GAMMA_DEFAULT,
573 .flags = 0, 582 .flags = 0,
574 .reserved = { 0, 0 }, 583 .reserved = { INDYCAM_CONTROL_GAMMA, 0 },
575 } 584 }
576}; 585};
577 586
578#define VINO_SAA7191_V4L2_CONTROL_COUNT 2 587#define VINO_SAA7191_V4L2_CONTROL_COUNT 9
579 588
580struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = { 589struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
581 { 590 {
@@ -587,9 +596,59 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
587 .step = 1, 596 .step = 1,
588 .default_value = SAA7191_HUE_DEFAULT, 597 .default_value = SAA7191_HUE_DEFAULT,
589 .flags = 0, 598 .flags = 0,
590 .reserved = { 0, 0 }, 599 .reserved = { SAA7191_CONTROL_HUE, 0 },
591 },{ 600 },{
592 .id = V4L2_CID_PRIVATE_BASE, 601 .id = V4L2_CID_PRIVATE_BASE,
602 .type = V4L2_CTRL_TYPE_INTEGER,
603 .name = "Luminance Bandpass",
604 .minimum = SAA7191_BANDPASS_MIN,
605 .maximum = SAA7191_BANDPASS_MAX,
606 .step = 1,
607 .default_value = SAA7191_BANDPASS_DEFAULT,
608 .flags = 0,
609 .reserved = { SAA7191_CONTROL_BANDPASS, 0 },
610 },{
611 .id = V4L2_CID_PRIVATE_BASE + 1,
612 .type = V4L2_CTRL_TYPE_INTEGER,
613 .name = "Luminance Bandpass Weight",
614 .minimum = SAA7191_BANDPASS_WEIGHT_MIN,
615 .maximum = SAA7191_BANDPASS_WEIGHT_MAX,
616 .step = 1,
617 .default_value = SAA7191_BANDPASS_WEIGHT_DEFAULT,
618 .flags = 0,
619 .reserved = { SAA7191_CONTROL_BANDPASS_WEIGHT, 0 },
620 },{
621 .id = V4L2_CID_PRIVATE_BASE + 2,
622 .type = V4L2_CTRL_TYPE_INTEGER,
623 .name = "HF Luminance Coring",
624 .minimum = SAA7191_CORING_MIN,
625 .maximum = SAA7191_CORING_MAX,
626 .step = 1,
627 .default_value = SAA7191_CORING_DEFAULT,
628 .flags = 0,
629 .reserved = { SAA7191_CONTROL_CORING, 0 },
630 },{
631 .id = V4L2_CID_PRIVATE_BASE + 3,
632 .type = V4L2_CTRL_TYPE_BOOLEAN,
633 .name = "Force Colour",
634 .minimum = SAA7191_FORCE_COLOUR_MIN,
635 .maximum = SAA7191_FORCE_COLOUR_MAX,
636 .step = 1,
637 .default_value = SAA7191_FORCE_COLOUR_DEFAULT,
638 .flags = 0,
639 .reserved = { SAA7191_CONTROL_FORCE_COLOUR, 0 },
640 },{
641 .id = V4L2_CID_PRIVATE_BASE + 4,
642 .type = V4L2_CTRL_TYPE_INTEGER,
643 .name = "Chrominance Gain Control",
644 .minimum = SAA7191_CHROMA_GAIN_MIN,
645 .maximum = SAA7191_CHROMA_GAIN_MAX,
646 .step = 1,
647 .default_value = SAA7191_CHROMA_GAIN_DEFAULT,
648 .flags = 0,
649 .reserved = { SAA7191_CONTROL_CHROMA_GAIN, 0 },
650 },{
651 .id = V4L2_CID_PRIVATE_BASE + 5,
593 .type = V4L2_CTRL_TYPE_BOOLEAN, 652 .type = V4L2_CTRL_TYPE_BOOLEAN,
594 .name = "VTR Time Constant", 653 .name = "VTR Time Constant",
595 .minimum = SAA7191_VTRC_MIN, 654 .minimum = SAA7191_VTRC_MIN,
@@ -597,7 +656,27 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
597 .step = 1, 656 .step = 1,
598 .default_value = SAA7191_VTRC_DEFAULT, 657 .default_value = SAA7191_VTRC_DEFAULT,
599 .flags = 0, 658 .flags = 0,
600 .reserved = { 0, 0 }, 659 .reserved = { SAA7191_CONTROL_VTRC, 0 },
660 },{
661 .id = V4L2_CID_PRIVATE_BASE + 6,
662 .type = V4L2_CTRL_TYPE_INTEGER,
663 .name = "Luminance Delay Compensation",
664 .minimum = SAA7191_LUMA_DELAY_MIN,
665 .maximum = SAA7191_LUMA_DELAY_MAX,
666 .step = 1,
667 .default_value = SAA7191_LUMA_DELAY_DEFAULT,
668 .flags = 0,
669 .reserved = { SAA7191_CONTROL_LUMA_DELAY, 0 },
670 },{
671 .id = V4L2_CID_PRIVATE_BASE + 7,
672 .type = V4L2_CTRL_TYPE_INTEGER,
673 .name = "Vertical Noise Reduction",
674 .minimum = SAA7191_VNR_MIN,
675 .maximum = SAA7191_VNR_MAX,
676 .step = 1,
677 .default_value = SAA7191_VNR_DEFAULT,
678 .flags = 0,
679 .reserved = { SAA7191_CONTROL_VNR, 0 },
601 } 680 }
602}; 681};
603 682
@@ -639,9 +718,10 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data =
639 */ 718 */
640static int i2c_vino_client_reg(struct i2c_client *client) 719static int i2c_vino_client_reg(struct i2c_client *client)
641{ 720{
721 unsigned long flags;
642 int ret = 0; 722 int ret = 0;
643 723
644 spin_lock(&vino_drvdata->input_lock); 724 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
645 switch (client->driver->id) { 725 switch (client->driver->id) {
646 case I2C_DRIVERID_SAA7191: 726 case I2C_DRIVERID_SAA7191:
647 if (vino_drvdata->decoder.driver) 727 if (vino_drvdata->decoder.driver)
@@ -658,16 +738,17 @@ static int i2c_vino_client_reg(struct i2c_client *client)
658 default: 738 default:
659 ret = -ENODEV; 739 ret = -ENODEV;
660 } 740 }
661 spin_unlock(&vino_drvdata->input_lock); 741 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
662 742
663 return ret; 743 return ret;
664} 744}
665 745
666static int i2c_vino_client_unreg(struct i2c_client *client) 746static int i2c_vino_client_unreg(struct i2c_client *client)
667{ 747{
748 unsigned long flags;
668 int ret = 0; 749 int ret = 0;
669 750
670 spin_lock(&vino_drvdata->input_lock); 751 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
671 if (client == vino_drvdata->decoder.driver) { 752 if (client == vino_drvdata->decoder.driver) {
672 if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL) 753 if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL)
673 ret = -EBUSY; 754 ret = -EBUSY;
@@ -679,7 +760,7 @@ static int i2c_vino_client_unreg(struct i2c_client *client)
679 else 760 else
680 vino_drvdata->camera.driver = NULL; 761 vino_drvdata->camera.driver = NULL;
681 } 762 }
682 spin_unlock(&vino_drvdata->input_lock); 763 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
683 764
684 return ret; 765 return ret;
685} 766}
@@ -727,7 +808,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
727 dprintk("vino_free_buffer_with_count(): count = %d\n", count); 808 dprintk("vino_free_buffer_with_count(): count = %d\n", count);
728 809
729 for (i = 0; i < count; i++) { 810 for (i = 0; i < count; i++) {
730 mem_map_unreserve(virt_to_page(fb->desc_table.virtual[i])); 811 ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
731 dma_unmap_single(NULL, 812 dma_unmap_single(NULL,
732 fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i], 813 fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
733 PAGE_SIZE, DMA_FROM_DEVICE); 814 PAGE_SIZE, DMA_FROM_DEVICE);
@@ -805,7 +886,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
805 dma_data_addr + VINO_PAGE_SIZE * j; 886 dma_data_addr + VINO_PAGE_SIZE * j;
806 } 887 }
807 888
808 mem_map_reserve(virt_to_page(fb->desc_table.virtual[i])); 889 SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
809 } 890 }
810 891
811 /* page_count needs to be set anyway, because the descriptor table has 892 /* page_count needs to be set anyway, because the descriptor table has
@@ -892,7 +973,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
892 dma_data_addr + VINO_PAGE_SIZE * j; 973 dma_data_addr + VINO_PAGE_SIZE * j;
893 } 974 }
894 975
895 mem_map_reserve(virt_to_page(fb->desc_table.virtual[i])); 976 SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
896 } 977 }
897 978
898 /* page_count needs to be set anyway, because the descriptor table has 979 /* page_count needs to be set anyway, because the descriptor table has
@@ -933,7 +1014,7 @@ static void vino_sync_buffer(struct vino_framebuffer *fb)
933 1014
934/* Framebuffer fifo functions (need to be locked externally) */ 1015/* Framebuffer fifo functions (need to be locked externally) */
935 1016
936static void vino_fifo_init(struct vino_framebuffer_fifo *f, 1017static inline void vino_fifo_init(struct vino_framebuffer_fifo *f,
937 unsigned int length) 1018 unsigned int length)
938{ 1019{
939 f->length = 0; 1020 f->length = 0;
@@ -941,16 +1022,18 @@ static void vino_fifo_init(struct vino_framebuffer_fifo *f,
941 f->head = 0; 1022 f->head = 0;
942 f->tail = 0; 1023 f->tail = 0;
943 1024
944 if (length > VINO_FRAMEBUFFER_MAX_COUNT) 1025 if (length > VINO_FRAMEBUFFER_COUNT_MAX)
945 length = VINO_FRAMEBUFFER_MAX_COUNT; 1026 length = VINO_FRAMEBUFFER_COUNT_MAX;
946 1027
947 f->length = length; 1028 f->length = length;
948} 1029}
949 1030
950/* returns true/false */ 1031/* returns true/false */
951static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id) 1032static inline int vino_fifo_has_id(struct vino_framebuffer_fifo *f,
1033 unsigned int id)
952{ 1034{
953 unsigned int i; 1035 unsigned int i;
1036
954 for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) { 1037 for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) {
955 if (f->data[i] == id) 1038 if (f->data[i] == id)
956 return 1; 1039 return 1;
@@ -959,13 +1042,15 @@ static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
959 return 0; 1042 return 0;
960} 1043}
961 1044
1045#if 0
962/* returns true/false */ 1046/* returns true/false */
963static int vino_fifo_full(struct vino_framebuffer_fifo *f) 1047static inline int vino_fifo_full(struct vino_framebuffer_fifo *f)
964{ 1048{
965 return (f->used == f->length); 1049 return (f->used == f->length);
966} 1050}
1051#endif
967 1052
968static unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f) 1053static inline unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
969{ 1054{
970 return f->used; 1055 return f->used;
971} 1056}
@@ -1076,8 +1161,8 @@ static int vino_queue_init(struct vino_framebuffer_queue *q,
1076 1161
1077 down(&q->queue_sem); 1162 down(&q->queue_sem);
1078 1163
1079 if (*length > VINO_FRAMEBUFFER_MAX_COUNT) 1164 if (*length > VINO_FRAMEBUFFER_COUNT_MAX)
1080 *length = VINO_FRAMEBUFFER_MAX_COUNT; 1165 *length = VINO_FRAMEBUFFER_COUNT_MAX;
1081 1166
1082 q->length = 0; 1167 q->length = 0;
1083 1168
@@ -1313,6 +1398,7 @@ out:
1313 return ret; 1398 return ret;
1314} 1399}
1315 1400
1401#if 0
1316static int vino_queue_get_total(struct vino_framebuffer_queue *q, 1402static int vino_queue_get_total(struct vino_framebuffer_queue *q,
1317 unsigned int *total) 1403 unsigned int *total)
1318{ 1404{
@@ -1338,6 +1424,7 @@ out:
1338 1424
1339 return ret; 1425 return ret;
1340} 1426}
1427#endif
1341 1428
1342static struct vino_framebuffer *vino_queue_peek(struct 1429static struct vino_framebuffer *vino_queue_peek(struct
1343 vino_framebuffer_queue *q, 1430 vino_framebuffer_queue *q,
@@ -1471,12 +1558,14 @@ static void vino_update_line_size(struct vino_channel_settings *vcs)
1471 1558
1472 dprintk("update_line_size(): before: w = %d, d = %d, " 1559 dprintk("update_line_size(): before: w = %d, d = %d, "
1473 "line_size = %d\n", w, d, vcs->line_size); 1560 "line_size = %d\n", w, d, vcs->line_size);
1561
1474 /* line size must be multiple of 8 bytes */ 1562 /* line size must be multiple of 8 bytes */
1475 lsize = (bpp * (w / d)) & ~7; 1563 lsize = (bpp * (w / d)) & ~7;
1476 w = (lsize / bpp) * d; 1564 w = (lsize / bpp) * d;
1477 1565
1478 vcs->clipping.right = vcs->clipping.left + w; 1566 vcs->clipping.right = vcs->clipping.left + w;
1479 vcs->line_size = lsize; 1567 vcs->line_size = lsize;
1568
1480 dprintk("update_line_size(): after: w = %d, d = %d, " 1569 dprintk("update_line_size(): after: w = %d, d = %d, "
1481 "line_size = %d\n", w, d, vcs->line_size); 1570 "line_size = %d\n", w, d, vcs->line_size);
1482} 1571}
@@ -1532,7 +1621,7 @@ static void vino_set_clipping(struct vino_channel_settings *vcs,
1532} 1621}
1533 1622
1534/* execute with input_lock locked */ 1623/* execute with input_lock locked */
1535static void vino_set_default_clipping(struct vino_channel_settings *vcs) 1624static inline void vino_set_default_clipping(struct vino_channel_settings *vcs)
1536{ 1625{
1537 vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width, 1626 vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width,
1538 vino_data_norms[vcs->data_norm].height); 1627 vino_data_norms[vcs->data_norm].height);
@@ -1556,8 +1645,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
1556 1645
1557 if (d < 1) { 1646 if (d < 1) {
1558 d = 1; 1647 d = 1;
1559 } 1648 } else if (d > 8) {
1560 if (d > 8) {
1561 d = 8; 1649 d = 8;
1562 } 1650 }
1563 1651
@@ -1570,7 +1658,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
1570} 1658}
1571 1659
1572/* execute with input_lock locked */ 1660/* execute with input_lock locked */
1573static void vino_reset_scaling(struct vino_channel_settings *vcs) 1661static inline void vino_set_default_scaling(struct vino_channel_settings *vcs)
1574{ 1662{
1575 vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left, 1663 vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left,
1576 vcs->clipping.bottom - vcs->clipping.top); 1664 vcs->clipping.bottom - vcs->clipping.top);
@@ -1649,7 +1737,8 @@ static void vino_set_framerate(struct vino_channel_settings *vcs,
1649} 1737}
1650 1738
1651/* execute with input_lock locked */ 1739/* execute with input_lock locked */
1652static void vino_set_default_framerate(struct vino_channel_settings *vcs) 1740static inline void vino_set_default_framerate(struct
1741 vino_channel_settings *vcs)
1653{ 1742{
1654 vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max); 1743 vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max);
1655} 1744}
@@ -1687,6 +1776,9 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
1687 * should be more than enough time */ 1776 * should be more than enough time */
1688 udelay(VINO_DESC_FETCH_DELAY); 1777 udelay(VINO_DESC_FETCH_DELAY);
1689 1778
1779 dprintk("vino_dma_setup(): start desc = %08x, next 4 desc = %08x\n",
1780 ch->start_desc_tbl, ch->next_4_desc);
1781
1690 /* set the alpha register */ 1782 /* set the alpha register */
1691 ch->alpha = vcs->alpha; 1783 ch->alpha = vcs->alpha;
1692 1784
@@ -1700,9 +1792,6 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
1700 VINO_CLIP_EVEN(norm->even.top + 1792 VINO_CLIP_EVEN(norm->even.top +
1701 vcs->clipping.bottom / 2 - 1) | 1793 vcs->clipping.bottom / 2 - 1) |
1702 VINO_CLIP_X(vcs->clipping.right); 1794 VINO_CLIP_X(vcs->clipping.right);
1703 /* FIXME: end-of-field bug workaround
1704 VINO_CLIP_X(VINO_PAL_WIDTH);
1705 */
1706 1795
1707 /* set the size of actual content in the buffer (DECIMATION !) */ 1796 /* set the size of actual content in the buffer (DECIMATION !) */
1708 fb->data_size = ((vcs->clipping.right - vcs->clipping.left) / 1797 fb->data_size = ((vcs->clipping.right - vcs->clipping.left) /
@@ -1802,7 +1891,7 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
1802} 1891}
1803 1892
1804/* (execute only with vino_lock locked) */ 1893/* (execute only with vino_lock locked) */
1805static void vino_dma_start(struct vino_channel_settings *vcs) 1894static inline void vino_dma_start(struct vino_channel_settings *vcs)
1806{ 1895{
1807 u32 ctrl = vino->control; 1896 u32 ctrl = vino->control;
1808 1897
@@ -1813,12 +1902,14 @@ static void vino_dma_start(struct vino_channel_settings *vcs)
1813} 1902}
1814 1903
1815/* (execute only with vino_lock locked) */ 1904/* (execute only with vino_lock locked) */
1816static void vino_dma_stop(struct vino_channel_settings *vcs) 1905static inline void vino_dma_stop(struct vino_channel_settings *vcs)
1817{ 1906{
1818 u32 ctrl = vino->control; 1907 u32 ctrl = vino->control;
1819 1908
1820 ctrl &= (vcs->channel == VINO_CHANNEL_A) ? 1909 ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
1821 ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL; 1910 ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL;
1911 ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
1912 ~VINO_CTRL_A_INT : ~VINO_CTRL_B_INT;
1822 vino->control = ctrl; 1913 vino->control = ctrl;
1823 dprintk("vino_dma_stop():\n"); 1914 dprintk("vino_dma_stop():\n");
1824} 1915}
@@ -1902,7 +1993,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
1902 struct vino_framebuffer *fb; 1993 struct vino_framebuffer *fb;
1903 unsigned int incoming, id; 1994 unsigned int incoming, id;
1904 int err = 0; 1995 int err = 0;
1905 unsigned long flags, flags2; 1996 unsigned long flags;
1906 1997
1907 dprintk("vino_capture_next():\n"); 1998 dprintk("vino_capture_next():\n");
1908 1999
@@ -1943,10 +2034,6 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
1943 goto out; 2034 goto out;
1944 } 2035 }
1945 2036
1946 spin_lock_irqsave(&fb->state_lock, flags2);
1947 fb->state = VINO_FRAMEBUFFER_UNUSED;
1948 spin_unlock_irqrestore(&fb->state_lock, flags2);
1949
1950 if (start) { 2037 if (start) {
1951 vcs->capturing = 1; 2038 vcs->capturing = 1;
1952 } 2039 }
@@ -1964,7 +2051,7 @@ out:
1964 return err; 2051 return err;
1965} 2052}
1966 2053
1967static int vino_is_capturing(struct vino_channel_settings *vcs) 2054static inline int vino_is_capturing(struct vino_channel_settings *vcs)
1968{ 2055{
1969 int ret; 2056 int ret;
1970 unsigned long flags; 2057 unsigned long flags;
@@ -2076,6 +2163,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs)
2076 dprintk("vino_capture_stop():\n"); 2163 dprintk("vino_capture_stop():\n");
2077 2164
2078 spin_lock_irqsave(&vcs->capture_lock, flags); 2165 spin_lock_irqsave(&vcs->capture_lock, flags);
2166
2079 /* unset capturing to stop queue processing */ 2167 /* unset capturing to stop queue processing */
2080 vcs->capturing = 0; 2168 vcs->capturing = 0;
2081 2169
@@ -2121,6 +2209,7 @@ out:
2121 spin_unlock_irqrestore(&vcs->capture_lock, flags); 2209 spin_unlock_irqrestore(&vcs->capture_lock, flags);
2122} 2210}
2123 2211
2212#if 0
2124static int vino_capture_failed(struct vino_channel_settings *vcs) 2213static int vino_capture_failed(struct vino_channel_settings *vcs)
2125{ 2214{
2126 struct vino_framebuffer *fb; 2215 struct vino_framebuffer *fb;
@@ -2165,9 +2254,31 @@ static int vino_capture_failed(struct vino_channel_settings *vcs)
2165 2254
2166 return 0; 2255 return 0;
2167} 2256}
2257#endif
2258
2259static void vino_skip_frame(struct vino_channel_settings *vcs)
2260{
2261 struct vino_framebuffer *fb;
2262 unsigned long flags;
2263 unsigned int id;
2264
2265 spin_lock_irqsave(&vcs->capture_lock, flags);
2266 fb = vino_queue_peek(&vcs->fb_queue, &id);
2267 if (!fb) {
2268 spin_unlock_irqrestore(&vcs->capture_lock, flags);
2269 dprintk("vino_skip_frame(): vino_queue_peek() failed!\n");
2270 return;
2271 }
2272 spin_unlock_irqrestore(&vcs->capture_lock, flags);
2273
2274 spin_lock_irqsave(&fb->state_lock, flags);
2275 fb->state = VINO_FRAMEBUFFER_UNUSED;
2276 spin_unlock_irqrestore(&fb->state_lock, flags);
2277
2278 vino_capture_next(vcs, 0);
2279}
2168 2280
2169static void vino_frame_done(struct vino_channel_settings *vcs, 2281static void vino_frame_done(struct vino_channel_settings *vcs)
2170 unsigned int fc)
2171{ 2282{
2172 struct vino_framebuffer *fb; 2283 struct vino_framebuffer *fb;
2173 unsigned long flags; 2284 unsigned long flags;
@@ -2181,8 +2292,9 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
2181 } 2292 }
2182 spin_unlock_irqrestore(&vcs->capture_lock, flags); 2293 spin_unlock_irqrestore(&vcs->capture_lock, flags);
2183 2294
2184 fb->frame_counter = fc; 2295 fb->frame_counter = vcs->int_data.frame_counter;
2185 do_gettimeofday(&fb->timestamp); 2296 memcpy(&fb->timestamp, &vcs->int_data.timestamp,
2297 sizeof(struct timeval));
2186 2298
2187 spin_lock_irqsave(&fb->state_lock, flags); 2299 spin_lock_irqsave(&fb->state_lock, flags);
2188 if (fb->state == VINO_FRAMEBUFFER_IN_USE) 2300 if (fb->state == VINO_FRAMEBUFFER_IN_USE)
@@ -2194,72 +2306,175 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
2194 vino_capture_next(vcs, 0); 2306 vino_capture_next(vcs, 0);
2195} 2307}
2196 2308
2309static void vino_capture_tasklet(unsigned long channel) {
2310 struct vino_channel_settings *vcs;
2311
2312 vcs = (channel == VINO_CHANNEL_A)
2313 ? &vino_drvdata->a : &vino_drvdata->b;
2314
2315 if (vcs->int_data.skip)
2316 vcs->int_data.skip_count++;
2317
2318 if (vcs->int_data.skip && (vcs->int_data.skip_count
2319 <= VINO_MAX_FRAME_SKIP_COUNT)) {
2320 vino_skip_frame(vcs);
2321 } else {
2322 vcs->int_data.skip_count = 0;
2323 vino_frame_done(vcs);
2324 }
2325}
2326
2197static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) 2327static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
2198{ 2328{
2199 u32 intr; 2329 u32 ctrl, intr;
2200 unsigned int fc_a, fc_b; 2330 unsigned int fc_a, fc_b;
2201 int done_a = 0; 2331 int handled_a = 0, skip_a = 0, done_a = 0;
2202 int done_b = 0; 2332 int handled_b = 0, skip_b = 0, done_b = 0;
2333
2334#ifdef VINO_DEBUG_INT
2335 int loop = 0;
2336 unsigned int line_count = vino->a.line_count,
2337 page_index = vino->a.page_index,
2338 field_counter = vino->a.field_counter,
2339 start_desc_tbl = vino->a.start_desc_tbl,
2340 next_4_desc = vino->a.next_4_desc;
2341 unsigned int line_count_2,
2342 page_index_2,
2343 field_counter_2,
2344 start_desc_tbl_2,
2345 next_4_desc_2;
2346#endif
2203 2347
2204 spin_lock(&vino_drvdata->vino_lock); 2348 spin_lock(&vino_drvdata->vino_lock);
2205 2349
2206 intr = vino->intr_status; 2350 while ((intr = vino->intr_status)) {
2207 fc_a = vino->a.field_counter / 2; 2351 fc_a = vino->a.field_counter >> 1;
2208 fc_b = vino->b.field_counter / 2; 2352 fc_b = vino->b.field_counter >> 1;
2209 2353
2210 // TODO: handle error-interrupts in some special way ? 2354 /* handle error-interrupts in some special way ?
2211 2355 * --> skips frames */
2212 if (intr & VINO_INTSTAT_A) { 2356 if (intr & VINO_INTSTAT_A) {
2213 if (intr & VINO_INTSTAT_A_EOF) { 2357 if (intr & VINO_INTSTAT_A_EOF) {
2214 vino_drvdata->a.field++; 2358 vino_drvdata->a.field++;
2215 if (vino_drvdata->a.field > 1) { 2359 if (vino_drvdata->a.field > 1) {
2360 vino_dma_stop(&vino_drvdata->a);
2361 vino_clear_interrupt(&vino_drvdata->a);
2362 vino_drvdata->a.field = 0;
2363 done_a = 1;
2364 } else {
2365 if (vino->a.page_index
2366 != vino_drvdata->a.line_size) {
2367 vino->a.line_count = 0;
2368 vino->a.page_index =
2369 vino_drvdata->
2370 a.line_size;
2371 vino->a.next_4_desc =
2372 vino->a.start_desc_tbl;
2373 }
2374 }
2375 dprintk("channel A end-of-field "
2376 "interrupt: %04x\n", intr);
2377 } else {
2216 vino_dma_stop(&vino_drvdata->a); 2378 vino_dma_stop(&vino_drvdata->a);
2217 vino_clear_interrupt(&vino_drvdata->a); 2379 vino_clear_interrupt(&vino_drvdata->a);
2218 vino_drvdata->a.field = 0; 2380 vino_drvdata->a.field = 0;
2219 done_a = 1; 2381 skip_a = 1;
2382 dprintk("channel A error interrupt: %04x\n",
2383 intr);
2220 } 2384 }
2221 dprintk("intr: channel A end-of-field interrupt: " 2385
2222 "%04x\n", intr); 2386#ifdef VINO_DEBUG_INT
2223 } else { 2387 line_count_2 = vino->a.line_count;
2224 vino_dma_stop(&vino_drvdata->a); 2388 page_index_2 = vino->a.page_index;
2225 vino_clear_interrupt(&vino_drvdata->a); 2389 field_counter_2 = vino->a.field_counter;
2226 done_a = 1; 2390 start_desc_tbl_2 = vino->a.start_desc_tbl;
2227 dprintk("channel A error interrupt: %04x\n", intr); 2391 next_4_desc_2 = vino->a.next_4_desc;
2392
2393 printk("intr = %04x, loop = %d, field = %d\n",
2394 intr, loop, vino_drvdata->a.field);
2395 printk("1- line count = %04d, page index = %04d, "
2396 "start = %08x, next = %08x\n"
2397 " fieldc = %d, framec = %d\n",
2398 line_count, page_index, start_desc_tbl,
2399 next_4_desc, field_counter, fc_a);
2400 printk("12-line count = %04d, page index = %04d, "
2401 " start = %08x, next = %08x\n",
2402 line_count_2, page_index_2, start_desc_tbl_2,
2403 next_4_desc_2);
2404
2405 if (done_a)
2406 printk("\n");
2407#endif
2228 } 2408 }
2229 } 2409
2230 if (intr & VINO_INTSTAT_B) { 2410 if (intr & VINO_INTSTAT_B) {
2231 if (intr & VINO_INTSTAT_B_EOF) { 2411 if (intr & VINO_INTSTAT_B_EOF) {
2232 vino_drvdata->b.field++; 2412 vino_drvdata->b.field++;
2233 if (vino_drvdata->b.field > 1) { 2413 if (vino_drvdata->b.field > 1) {
2414 vino_dma_stop(&vino_drvdata->b);
2415 vino_clear_interrupt(&vino_drvdata->b);
2416 vino_drvdata->b.field = 0;
2417 done_b = 1;
2418 }
2419 dprintk("channel B end-of-field "
2420 "interrupt: %04x\n", intr);
2421 } else {
2234 vino_dma_stop(&vino_drvdata->b); 2422 vino_dma_stop(&vino_drvdata->b);
2235 vino_clear_interrupt(&vino_drvdata->b); 2423 vino_clear_interrupt(&vino_drvdata->b);
2236 vino_drvdata->b.field = 0; 2424 vino_drvdata->b.field = 0;
2237 done_b = 1; 2425 skip_b = 1;
2426 dprintk("channel B error interrupt: %04x\n",
2427 intr);
2238 } 2428 }
2239 dprintk("intr: channel B end-of-field interrupt: "
2240 "%04x\n", intr);
2241 } else {
2242 vino_dma_stop(&vino_drvdata->b);
2243 vino_clear_interrupt(&vino_drvdata->b);
2244 done_b = 1;
2245 dprintk("channel B error interrupt: %04x\n", intr);
2246 } 2429 }
2247 }
2248 2430
2249 /* always remember to clear interrupt status */ 2431 /* Always remember to clear interrupt status.
2250 vino->intr_status = ~intr; 2432 * Disable VINO interrupts while we do this. */
2433 ctrl = vino->control;
2434 vino->control = ctrl & ~(VINO_CTRL_A_INT | VINO_CTRL_B_INT);
2435 vino->intr_status = ~intr;
2436 vino->control = ctrl;
2251 2437
2252 spin_unlock(&vino_drvdata->vino_lock); 2438 spin_unlock(&vino_drvdata->vino_lock);
2253 2439
2254 if (done_a) { 2440 if ((!handled_a) && (done_a || skip_a)) {
2255 vino_frame_done(&vino_drvdata->a, fc_a); 2441 if (!skip_a) {
2256 dprintk("channel A frame done, interrupt: %d\n", intr); 2442 do_gettimeofday(&vino_drvdata->
2257 } 2443 a.int_data.timestamp);
2258 if (done_b) { 2444 vino_drvdata->a.int_data.frame_counter = fc_a;
2259 vino_frame_done(&vino_drvdata->b, fc_b); 2445 }
2260 dprintk("channel B frame done, interrupt: %d\n", intr); 2446 vino_drvdata->a.int_data.skip = skip_a;
2447
2448 dprintk("channel A %s, interrupt: %d\n",
2449 skip_a ? "skipping frame" : "frame done",
2450 intr);
2451 tasklet_hi_schedule(&vino_tasklet_a);
2452 handled_a = 1;
2453 }
2454
2455 if ((!handled_b) && (done_b || skip_b)) {
2456 if (!skip_b) {
2457 do_gettimeofday(&vino_drvdata->
2458 b.int_data.timestamp);
2459 vino_drvdata->b.int_data.frame_counter = fc_b;
2460 }
2461 vino_drvdata->b.int_data.skip = skip_b;
2462
2463 dprintk("channel B %s, interrupt: %d\n",
2464 skip_b ? "skipping frame" : "frame done",
2465 intr);
2466 tasklet_hi_schedule(&vino_tasklet_b);
2467 handled_b = 1;
2468 }
2469
2470#ifdef VINO_DEBUG_INT
2471 loop++;
2472#endif
2473 spin_lock(&vino_drvdata->vino_lock);
2261 } 2474 }
2262 2475
2476 spin_unlock(&vino_drvdata->vino_lock);
2477
2263 return IRQ_HANDLED; 2478 return IRQ_HANDLED;
2264} 2479}
2265 2480
@@ -2279,11 +2494,13 @@ static int vino_get_saa7191_input(int input)
2279 } 2494 }
2280} 2495}
2281 2496
2282static int vino_get_saa7191_norm(int norm) 2497static int vino_get_saa7191_norm(unsigned int data_norm)
2283{ 2498{
2284 switch (norm) { 2499 switch (data_norm) {
2285 case VINO_DATA_NORM_AUTO: 2500 case VINO_DATA_NORM_AUTO:
2286 return SAA7191_NORM_AUTO; 2501 return SAA7191_NORM_AUTO;
2502 case VINO_DATA_NORM_AUTO_EXT:
2503 return SAA7191_NORM_AUTO_EXT;
2287 case VINO_DATA_NORM_PAL: 2504 case VINO_DATA_NORM_PAL:
2288 return SAA7191_NORM_PAL; 2505 return SAA7191_NORM_PAL;
2289 case VINO_DATA_NORM_NTSC: 2506 case VINO_DATA_NORM_NTSC:
@@ -2297,6 +2514,57 @@ static int vino_get_saa7191_norm(int norm)
2297 } 2514 }
2298} 2515}
2299 2516
2517static int vino_get_from_saa7191_norm(int saa7191_norm)
2518{
2519 switch (saa7191_norm) {
2520 case SAA7191_NORM_PAL:
2521 return VINO_DATA_NORM_PAL;
2522 case SAA7191_NORM_NTSC:
2523 return VINO_DATA_NORM_NTSC;
2524 case SAA7191_NORM_SECAM:
2525 return VINO_DATA_NORM_SECAM;
2526 default:
2527 printk(KERN_ERR "VINO: vino_get_from_saa7191_norm(): "
2528 "invalid norm!\n");
2529 return VINO_DATA_NORM_NONE;
2530 }
2531}
2532
2533static int vino_saa7191_set_norm(unsigned int *data_norm)
2534{
2535 int saa7191_norm, new_data_norm;
2536 int err = 0;
2537
2538 saa7191_norm = vino_get_saa7191_norm(*data_norm);
2539
2540 err = i2c_decoder_command(DECODER_SAA7191_SET_NORM,
2541 &saa7191_norm);
2542 if (err)
2543 goto out;
2544
2545 if ((*data_norm == VINO_DATA_NORM_AUTO)
2546 || (*data_norm == VINO_DATA_NORM_AUTO_EXT)) {
2547 struct saa7191_status status;
2548
2549 err = i2c_decoder_command(DECODER_SAA7191_GET_STATUS,
2550 &status);
2551 if (err)
2552 goto out;
2553
2554 new_data_norm =
2555 vino_get_from_saa7191_norm(status.norm);
2556 if (new_data_norm == VINO_DATA_NORM_NONE) {
2557 err = -EINVAL;
2558 goto out;
2559 }
2560
2561 *data_norm = (unsigned int)new_data_norm;
2562 }
2563
2564out:
2565 return err;
2566}
2567
2300/* execute with input_lock locked */ 2568/* execute with input_lock locked */
2301static int vino_is_input_owner(struct vino_channel_settings *vcs) 2569static int vino_is_input_owner(struct vino_channel_settings *vcs)
2302{ 2570{
@@ -2313,11 +2581,12 @@ static int vino_is_input_owner(struct vino_channel_settings *vcs)
2313 2581
2314static int vino_acquire_input(struct vino_channel_settings *vcs) 2582static int vino_acquire_input(struct vino_channel_settings *vcs)
2315{ 2583{
2584 unsigned long flags;
2316 int ret = 0; 2585 int ret = 0;
2317 2586
2318 dprintk("vino_acquire_input():\n"); 2587 dprintk("vino_acquire_input():\n");
2319 2588
2320 spin_lock(&vino_drvdata->input_lock); 2589 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2321 2590
2322 /* First try D1 and then SAA7191 */ 2591 /* First try D1 and then SAA7191 */
2323 if (vino_drvdata->camera.driver 2592 if (vino_drvdata->camera.driver
@@ -2332,23 +2601,48 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
2332 vcs->data_norm = VINO_DATA_NORM_D1; 2601 vcs->data_norm = VINO_DATA_NORM_D1;
2333 } else if (vino_drvdata->decoder.driver 2602 } else if (vino_drvdata->decoder.driver
2334 && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) { 2603 && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) {
2604 int input, data_norm;
2335 int saa7191_input; 2605 int saa7191_input;
2336 int saa7191_norm;
2337 2606
2338 if (i2c_use_client(vino_drvdata->decoder.driver)) { 2607 if (i2c_use_client(vino_drvdata->decoder.driver)) {
2339 ret = -ENODEV; 2608 ret = -ENODEV;
2340 goto out; 2609 goto out;
2341 } 2610 }
2342 2611
2343 vino_drvdata->decoder.owner = vcs->channel; 2612 input = VINO_INPUT_COMPOSITE;
2344 vcs->input = VINO_INPUT_COMPOSITE; 2613
2345 vcs->data_norm = VINO_DATA_NORM_PAL; 2614 saa7191_input = vino_get_saa7191_input(input);
2615 ret = i2c_decoder_command(DECODER_SET_INPUT,
2616 &saa7191_input);
2617 if (ret) {
2618 ret = -EINVAL;
2619 goto out;
2620 }
2621
2622 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2346 2623
2347 saa7191_input = vino_get_saa7191_input(vcs->input); 2624 /* Don't hold spinlocks while auto-detecting norm
2348 i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input); 2625 * as it may take a while... */
2349 2626
2350 saa7191_norm = vino_get_saa7191_norm(vcs->data_norm); 2627 data_norm = VINO_DATA_NORM_AUTO_EXT;
2351 i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm); 2628
2629 ret = vino_saa7191_set_norm(&data_norm);
2630 if ((ret == -EBUSY) || (ret == -EAGAIN)) {
2631 data_norm = VINO_DATA_NORM_PAL;
2632 ret = vino_saa7191_set_norm(&data_norm);
2633 }
2634
2635 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2636
2637 if (ret) {
2638 ret = -EINVAL;
2639 goto out;
2640 }
2641
2642 vino_drvdata->decoder.owner = vcs->channel;
2643
2644 vcs->input = input;
2645 vcs->data_norm = data_norm;
2352 } else { 2646 } else {
2353 vcs->input = (vcs->channel == VINO_CHANNEL_A) ? 2647 vcs->input = (vcs->channel == VINO_CHANNEL_A) ?
2354 vino_drvdata->b.input : vino_drvdata->a.input; 2648 vino_drvdata->b.input : vino_drvdata->a.input;
@@ -2361,15 +2655,14 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
2361 goto out; 2655 goto out;
2362 } 2656 }
2363 2657
2364 if (vino_is_input_owner(vcs)) { 2658 vino_set_default_clipping(vcs);
2365 vino_set_default_clipping(vcs); 2659 vino_set_default_scaling(vcs);
2366 vino_set_default_framerate(vcs); 2660 vino_set_default_framerate(vcs);
2367 }
2368 2661
2369 dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name); 2662 dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name);
2370 2663
2371out: 2664out:
2372 spin_unlock(&vino_drvdata->input_lock); 2665 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2373 2666
2374 return ret; 2667 return ret;
2375} 2668}
@@ -2378,16 +2671,17 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
2378{ 2671{
2379 struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ? 2672 struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
2380 &vino_drvdata->b : &vino_drvdata->a; 2673 &vino_drvdata->b : &vino_drvdata->a;
2674 unsigned long flags;
2381 int ret = 0; 2675 int ret = 0;
2382 2676
2383 dprintk("vino_set_input():\n"); 2677 dprintk("vino_set_input():\n");
2384 2678
2385 spin_lock(&vino_drvdata->input_lock); 2679 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2386 2680
2387 if (vcs->input == input) 2681 if (vcs->input == input)
2388 goto out; 2682 goto out;
2389 2683
2390 switch(input) { 2684 switch (input) {
2391 case VINO_INPUT_COMPOSITE: 2685 case VINO_INPUT_COMPOSITE:
2392 case VINO_INPUT_SVIDEO: 2686 case VINO_INPUT_SVIDEO:
2393 if (!vino_drvdata->decoder.driver) { 2687 if (!vino_drvdata->decoder.driver) {
@@ -2404,19 +2698,43 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
2404 } 2698 }
2405 2699
2406 if (vino_drvdata->decoder.owner == vcs->channel) { 2700 if (vino_drvdata->decoder.owner == vcs->channel) {
2701 int data_norm;
2407 int saa7191_input; 2702 int saa7191_input;
2408 int saa7191_norm;
2409 2703
2410 vcs->input = input; 2704 saa7191_input = vino_get_saa7191_input(input);
2411 vcs->data_norm = VINO_DATA_NORM_PAL; 2705 ret = i2c_decoder_command(DECODER_SET_INPUT,
2706 &saa7191_input);
2707 if (ret) {
2708 vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
2709 ret = -EINVAL;
2710 goto out;
2711 }
2712
2713 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2714
2715 /* Don't hold spinlocks while auto-detecting norm
2716 * as it may take a while... */
2717
2718 data_norm = VINO_DATA_NORM_AUTO_EXT;
2719
2720 ret = vino_saa7191_set_norm(&data_norm);
2721 if ((ret == -EBUSY) || (ret == -EAGAIN)) {
2722 data_norm = VINO_DATA_NORM_PAL;
2723 ret = vino_saa7191_set_norm(&data_norm);
2724 }
2412 2725
2413 saa7191_input = vino_get_saa7191_input(vcs->input); 2726 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2414 i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input); 2727
2415 saa7191_norm = vino_get_saa7191_norm(vcs->data_norm); 2728 if (ret) {
2416 i2c_decoder_command(DECODER_SAA7191_SET_NORM, 2729 vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
2417 &saa7191_norm); 2730 ret = -EINVAL;
2731 goto out;
2732 }
2733
2734 vcs->input = input;
2735 vcs->data_norm = data_norm;
2418 } else { 2736 } else {
2419 if (vcs2->input != input) { 2737 if (input != vcs2->input) {
2420 ret = -EBUSY; 2738 ret = -EBUSY;
2421 goto out; 2739 goto out;
2422 } 2740 }
@@ -2471,12 +2789,13 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
2471 } 2789 }
2472 2790
2473 vino_set_default_clipping(vcs); 2791 vino_set_default_clipping(vcs);
2792 vino_set_default_scaling(vcs);
2474 vino_set_default_framerate(vcs); 2793 vino_set_default_framerate(vcs);
2475 2794
2476 dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name); 2795 dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name);
2477 2796
2478out: 2797out:
2479 spin_unlock(&vino_drvdata->input_lock); 2798 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2480 2799
2481 return ret; 2800 return ret;
2482} 2801}
@@ -2485,10 +2804,11 @@ static void vino_release_input(struct vino_channel_settings *vcs)
2485{ 2804{
2486 struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ? 2805 struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
2487 &vino_drvdata->b : &vino_drvdata->a; 2806 &vino_drvdata->b : &vino_drvdata->a;
2807 unsigned long flags;
2488 2808
2489 dprintk("vino_release_input():\n"); 2809 dprintk("vino_release_input():\n");
2490 2810
2491 spin_lock(&vino_drvdata->input_lock); 2811 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2492 2812
2493 /* Release ownership of the channel 2813 /* Release ownership of the channel
2494 * and if the other channel takes input from 2814 * and if the other channel takes input from
@@ -2511,34 +2831,61 @@ static void vino_release_input(struct vino_channel_settings *vcs)
2511 } 2831 }
2512 vcs->input = VINO_INPUT_NONE; 2832 vcs->input = VINO_INPUT_NONE;
2513 2833
2514 spin_unlock(&vino_drvdata->input_lock); 2834 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2515} 2835}
2516 2836
2517/* execute with input_lock locked */ 2837/* execute with input_lock locked */
2518static int vino_set_data_norm(struct vino_channel_settings *vcs, 2838static int vino_set_data_norm(struct vino_channel_settings *vcs,
2519 unsigned int data_norm) 2839 unsigned int data_norm,
2840 unsigned long *flags)
2520{ 2841{
2521 int saa7191_norm; 2842 int err = 0;
2843
2844 if (data_norm == vcs->data_norm)
2845 return 0;
2522 2846
2523 switch (vcs->input) { 2847 switch (vcs->input) {
2524 case VINO_INPUT_D1: 2848 case VINO_INPUT_D1:
2525 /* only one "norm" supported */ 2849 /* only one "norm" supported */
2526 if (data_norm != VINO_DATA_NORM_D1) 2850 if ((data_norm != VINO_DATA_NORM_D1)
2851 && (data_norm != VINO_DATA_NORM_AUTO)
2852 && (data_norm != VINO_DATA_NORM_AUTO_EXT))
2527 return -EINVAL; 2853 return -EINVAL;
2528 break; 2854 break;
2529 case VINO_INPUT_COMPOSITE: 2855 case VINO_INPUT_COMPOSITE:
2530 case VINO_INPUT_SVIDEO: 2856 case VINO_INPUT_SVIDEO: {
2857 if ((data_norm != VINO_DATA_NORM_PAL)
2858 && (data_norm != VINO_DATA_NORM_NTSC)
2859 && (data_norm != VINO_DATA_NORM_SECAM)
2860 && (data_norm != VINO_DATA_NORM_AUTO)
2861 && (data_norm != VINO_DATA_NORM_AUTO_EXT))
2862 return -EINVAL;
2531 2863
2532 saa7191_norm = vino_get_saa7191_norm(data_norm); 2864 spin_unlock_irqrestore(&vino_drvdata->input_lock, *flags);
2865
2866 /* Don't hold spinlocks while setting norm
2867 * as it may take a while... */
2868
2869 err = vino_saa7191_set_norm(&data_norm);
2870
2871 spin_lock_irqsave(&vino_drvdata->input_lock, *flags);
2872
2873 if (err)
2874 goto out;
2533 2875
2534 i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
2535 vcs->data_norm = data_norm; 2876 vcs->data_norm = data_norm;
2877
2878 vino_set_default_clipping(vcs);
2879 vino_set_default_scaling(vcs);
2880 vino_set_default_framerate(vcs);
2536 break; 2881 break;
2882 }
2537 default: 2883 default:
2538 return -EINVAL; 2884 return -EINVAL;
2539 } 2885 }
2540 2886
2541 return 0; 2887out:
2888 return err;
2542} 2889}
2543 2890
2544/* V4L2 helper functions */ 2891/* V4L2 helper functions */
@@ -2558,8 +2905,9 @@ static int vino_find_data_format(__u32 pixelformat)
2558static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index) 2905static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
2559{ 2906{
2560 int data_norm = VINO_DATA_NORM_NONE; 2907 int data_norm = VINO_DATA_NORM_NONE;
2908 unsigned long flags;
2561 2909
2562 spin_lock(&vino_drvdata->input_lock); 2910 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2563 switch(vcs->input) { 2911 switch(vcs->input) {
2564 case VINO_INPUT_COMPOSITE: 2912 case VINO_INPUT_COMPOSITE:
2565 case VINO_INPUT_SVIDEO: 2913 case VINO_INPUT_SVIDEO:
@@ -2577,7 +2925,7 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
2577 } 2925 }
2578 break; 2926 break;
2579 } 2927 }
2580 spin_unlock(&vino_drvdata->input_lock); 2928 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2581 2929
2582 return data_norm; 2930 return data_norm;
2583} 2931}
@@ -2585,8 +2933,9 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
2585static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index) 2933static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
2586{ 2934{
2587 int input = VINO_INPUT_NONE; 2935 int input = VINO_INPUT_NONE;
2936 unsigned long flags;
2588 2937
2589 spin_lock(&vino_drvdata->input_lock); 2938 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2590 if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) { 2939 if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
2591 switch (index) { 2940 switch (index) {
2592 case 0: 2941 case 0:
@@ -2615,7 +2964,7 @@ static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
2615 break; 2964 break;
2616 } 2965 }
2617 } 2966 }
2618 spin_unlock(&vino_drvdata->input_lock); 2967 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2619 2968
2620 return input; 2969 return input;
2621} 2970}
@@ -2704,15 +3053,16 @@ static int vino_v4l2_enuminput(struct vino_channel_settings *vcs,
2704} 3053}
2705 3054
2706static int vino_v4l2_g_input(struct vino_channel_settings *vcs, 3055static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
2707 struct v4l2_input *i) 3056 unsigned int *i)
2708{ 3057{
2709 __u32 index; 3058 __u32 index;
2710 int input; 3059 int input;
3060 unsigned long flags;
2711 3061
2712 spin_lock(&vino_drvdata->input_lock); 3062 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2713 input = vcs->input; 3063 input = vcs->input;
2714 index = vino_find_input_index(vcs); 3064 index = vino_find_input_index(vcs);
2715 spin_unlock(&vino_drvdata->input_lock); 3065 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2716 3066
2717 dprintk("input = %d\n", input); 3067 dprintk("input = %d\n", input);
2718 3068
@@ -2720,23 +3070,18 @@ static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
2720 return -EINVAL; 3070 return -EINVAL;
2721 } 3071 }
2722 3072
2723 memset(i, 0, sizeof(struct v4l2_input)); 3073 *i = index;
2724
2725 i->index = index;
2726 i->type = V4L2_INPUT_TYPE_CAMERA;
2727 i->std = vino_inputs[input].std;
2728 strcpy(i->name, vino_inputs[input].name);
2729 3074
2730 return 0; 3075 return 0;
2731} 3076}
2732 3077
2733static int vino_v4l2_s_input(struct vino_channel_settings *vcs, 3078static int vino_v4l2_s_input(struct vino_channel_settings *vcs,
2734 struct v4l2_input *i) 3079 unsigned int *i)
2735{ 3080{
2736 int input; 3081 int input;
2737 dprintk("requested input = %d\n", i->index); 3082 dprintk("requested input = %d\n", *i);
2738 3083
2739 input = vino_enum_input(vcs, i->index); 3084 input = vino_enum_input(vcs, *i);
2740 if (input == VINO_INPUT_NONE) 3085 if (input == VINO_INPUT_NONE)
2741 return -EINVAL; 3086 return -EINVAL;
2742 3087
@@ -2747,7 +3092,9 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
2747 struct v4l2_standard *s) 3092 struct v4l2_standard *s)
2748{ 3093{
2749 int index = s->index; 3094 int index = s->index;
2750 int data_norm = vino_enum_data_norm(vcs, index); 3095 int data_norm;
3096
3097 data_norm = vino_enum_data_norm(vcs, index);
2751 dprintk("standard index = %d\n", index); 3098 dprintk("standard index = %d\n", index);
2752 3099
2753 if (data_norm == VINO_DATA_NORM_NONE) 3100 if (data_norm == VINO_DATA_NORM_NONE)
@@ -2771,13 +3118,55 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
2771 return 0; 3118 return 0;
2772} 3119}
2773 3120
3121static int vino_v4l2_querystd(struct vino_channel_settings *vcs,
3122 v4l2_std_id *std)
3123{
3124 unsigned long flags;
3125 int err = 0;
3126
3127 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3128
3129 switch (vcs->input) {
3130 case VINO_INPUT_D1:
3131 *std = vino_inputs[vcs->input].std;
3132 break;
3133 case VINO_INPUT_COMPOSITE:
3134 case VINO_INPUT_SVIDEO: {
3135 struct saa7191_status status;
3136
3137 i2c_decoder_command(DECODER_SAA7191_GET_STATUS, &status);
3138
3139 if (status.signal) {
3140 if (status.signal_60hz) {
3141 *std = V4L2_STD_NTSC;
3142 } else {
3143 *std = V4L2_STD_PAL | V4L2_STD_SECAM;
3144 }
3145 } else {
3146 *std = vino_inputs[vcs->input].std;
3147 }
3148 break;
3149 }
3150 default:
3151 err = -EINVAL;
3152 }
3153
3154 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3155
3156 return err;
3157}
3158
2774static int vino_v4l2_g_std(struct vino_channel_settings *vcs, 3159static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
2775 v4l2_std_id *std) 3160 v4l2_std_id *std)
2776{ 3161{
2777 spin_lock(&vino_drvdata->input_lock); 3162 unsigned long flags;
2778 dprintk("current standard = %d\n", vcs->data_norm); 3163
3164 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3165
2779 *std = vino_data_norms[vcs->data_norm].std; 3166 *std = vino_data_norms[vcs->data_norm].std;
2780 spin_unlock(&vino_drvdata->input_lock); 3167 dprintk("current standard = %d\n", vcs->data_norm);
3168
3169 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2781 3170
2782 return 0; 3171 return 0;
2783} 3172}
@@ -2785,13 +3174,18 @@ static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
2785static int vino_v4l2_s_std(struct vino_channel_settings *vcs, 3174static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
2786 v4l2_std_id *std) 3175 v4l2_std_id *std)
2787{ 3176{
3177 unsigned long flags;
2788 int ret = 0; 3178 int ret = 0;
2789 3179
2790 spin_lock(&vino_drvdata->input_lock); 3180 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3181
3182 if (!vino_is_input_owner(vcs)) {
3183 ret = -EBUSY;
3184 goto out;
3185 }
2791 3186
2792 /* check if the standard is valid for the current input */ 3187 /* check if the standard is valid for the current input */
2793 if (vino_is_input_owner(vcs) 3188 if ((*std) & vino_inputs[vcs->input].std) {
2794 && (vino_inputs[vcs->input].std & (*std))) {
2795 dprintk("standard accepted\n"); 3189 dprintk("standard accepted\n");
2796 3190
2797 /* change the video norm for SAA7191 3191 /* change the video norm for SAA7191
@@ -2800,24 +3194,33 @@ static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
2800 if (vcs->input == VINO_INPUT_D1) 3194 if (vcs->input == VINO_INPUT_D1)
2801 goto out; 3195 goto out;
2802 3196
2803 if ((*std) & V4L2_STD_PAL) { 3197 if (((*std) & V4L2_STD_PAL)
2804 vino_set_data_norm(vcs, VINO_DATA_NORM_PAL); 3198 && ((*std) & V4L2_STD_NTSC)
2805 vcs->data_norm = VINO_DATA_NORM_PAL; 3199 && ((*std) & V4L2_STD_SECAM)) {
3200 ret = vino_set_data_norm(vcs, VINO_DATA_NORM_AUTO_EXT,
3201 &flags);
3202 } else if ((*std) & V4L2_STD_PAL) {
3203 ret = vino_set_data_norm(vcs, VINO_DATA_NORM_PAL,
3204 &flags);
2806 } else if ((*std) & V4L2_STD_NTSC) { 3205 } else if ((*std) & V4L2_STD_NTSC) {
2807 vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC); 3206 ret = vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC,
2808 vcs->data_norm = VINO_DATA_NORM_NTSC; 3207 &flags);
2809 } else if ((*std) & V4L2_STD_SECAM) { 3208 } else if ((*std) & V4L2_STD_SECAM) {
2810 vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM); 3209 ret = vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM,
2811 vcs->data_norm = VINO_DATA_NORM_SECAM; 3210 &flags);
2812 } else { 3211 } else {
2813 ret = -EINVAL; 3212 ret = -EINVAL;
2814 } 3213 }
3214
3215 if (ret) {
3216 ret = -EINVAL;
3217 }
2815 } else { 3218 } else {
2816 ret = -EINVAL; 3219 ret = -EINVAL;
2817 } 3220 }
2818 3221
2819out: 3222out:
2820 spin_unlock(&vino_drvdata->input_lock); 3223 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2821 3224
2822 return ret; 3225 return ret;
2823} 3226}
@@ -2855,6 +3258,7 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
2855 struct v4l2_format *f) 3258 struct v4l2_format *f)
2856{ 3259{
2857 struct vino_channel_settings tempvcs; 3260 struct vino_channel_settings tempvcs;
3261 unsigned long flags;
2858 3262
2859 switch (f->type) { 3263 switch (f->type) {
2860 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 3264 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
@@ -2863,13 +3267,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
2863 dprintk("requested: w = %d, h = %d\n", 3267 dprintk("requested: w = %d, h = %d\n",
2864 pf->width, pf->height); 3268 pf->width, pf->height);
2865 3269
2866 spin_lock(&vino_drvdata->input_lock); 3270 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2867 memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings)); 3271 memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings));
2868 spin_unlock(&vino_drvdata->input_lock); 3272 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2869 3273
2870 tempvcs.data_format = vino_find_data_format(pf->pixelformat); 3274 tempvcs.data_format = vino_find_data_format(pf->pixelformat);
2871 if (tempvcs.data_format == VINO_DATA_FMT_NONE) { 3275 if (tempvcs.data_format == VINO_DATA_FMT_NONE) {
2872 tempvcs.data_format = VINO_DATA_FMT_RGB32; 3276 tempvcs.data_format = VINO_DATA_FMT_GREY;
2873 pf->pixelformat = 3277 pf->pixelformat =
2874 vino_data_formats[tempvcs.data_format]. 3278 vino_data_formats[tempvcs.data_format].
2875 pixelformat; 3279 pixelformat;
@@ -2908,10 +3312,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
2908static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs, 3312static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
2909 struct v4l2_format *f) 3313 struct v4l2_format *f)
2910{ 3314{
3315 unsigned long flags;
3316
2911 switch (f->type) { 3317 switch (f->type) {
2912 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 3318 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
2913 struct v4l2_pix_format *pf = &f->fmt.pix; 3319 struct v4l2_pix_format *pf = &f->fmt.pix;
2914 spin_lock(&vino_drvdata->input_lock); 3320
3321 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2915 3322
2916 pf->width = (vcs->clipping.right - vcs->clipping.left) / 3323 pf->width = (vcs->clipping.right - vcs->clipping.left) /
2917 vcs->decimation; 3324 vcs->decimation;
@@ -2930,7 +3337,7 @@ static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
2930 3337
2931 pf->priv = 0; 3338 pf->priv = 0;
2932 3339
2933 spin_unlock(&vino_drvdata->input_lock); 3340 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2934 break; 3341 break;
2935 } 3342 }
2936 case V4L2_BUF_TYPE_VIDEO_OVERLAY: 3343 case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -2945,20 +3352,18 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
2945 struct v4l2_format *f) 3352 struct v4l2_format *f)
2946{ 3353{
2947 int data_format; 3354 int data_format;
3355 unsigned long flags;
2948 3356
2949 switch (f->type) { 3357 switch (f->type) {
2950 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 3358 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
2951 struct v4l2_pix_format *pf = &f->fmt.pix; 3359 struct v4l2_pix_format *pf = &f->fmt.pix;
2952 spin_lock(&vino_drvdata->input_lock);
2953 3360
2954 if (!vino_is_input_owner(vcs)) { 3361 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
2955 spin_unlock(&vino_drvdata->input_lock);
2956 return -EINVAL;
2957 }
2958 3362
2959 data_format = vino_find_data_format(pf->pixelformat); 3363 data_format = vino_find_data_format(pf->pixelformat);
3364
2960 if (data_format == VINO_DATA_FMT_NONE) { 3365 if (data_format == VINO_DATA_FMT_NONE) {
2961 vcs->data_format = VINO_DATA_FMT_RGB32; 3366 vcs->data_format = VINO_DATA_FMT_GREY;
2962 pf->pixelformat = 3367 pf->pixelformat =
2963 vino_data_formats[vcs->data_format]. 3368 vino_data_formats[vcs->data_format].
2964 pixelformat; 3369 pixelformat;
@@ -2985,7 +3390,7 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
2985 3390
2986 pf->priv = 0; 3391 pf->priv = 0;
2987 3392
2988 spin_unlock(&vino_drvdata->input_lock); 3393 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
2989 break; 3394 break;
2990 } 3395 }
2991 case V4L2_BUF_TYPE_VIDEO_OVERLAY: 3396 case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -3000,12 +3405,15 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
3000 struct v4l2_cropcap *ccap) 3405 struct v4l2_cropcap *ccap)
3001{ 3406{
3002 const struct vino_data_norm *norm; 3407 const struct vino_data_norm *norm;
3408 unsigned long flags;
3003 3409
3004 switch (ccap->type) { 3410 switch (ccap->type) {
3005 case V4L2_BUF_TYPE_VIDEO_CAPTURE: 3411 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
3006 spin_lock(&vino_drvdata->input_lock); 3412 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3413
3007 norm = &vino_data_norms[vcs->data_norm]; 3414 norm = &vino_data_norms[vcs->data_norm];
3008 spin_unlock(&vino_drvdata->input_lock); 3415
3416 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3009 3417
3010 ccap->bounds.left = 0; 3418 ccap->bounds.left = 0;
3011 ccap->bounds.top = 0; 3419 ccap->bounds.top = 0;
@@ -3028,16 +3436,18 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
3028static int vino_v4l2_g_crop(struct vino_channel_settings *vcs, 3436static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
3029 struct v4l2_crop *c) 3437 struct v4l2_crop *c)
3030{ 3438{
3439 unsigned long flags;
3440
3031 switch (c->type) { 3441 switch (c->type) {
3032 case V4L2_BUF_TYPE_VIDEO_CAPTURE: 3442 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
3033 spin_lock(&vino_drvdata->input_lock); 3443 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3034 3444
3035 c->c.left = vcs->clipping.left; 3445 c->c.left = vcs->clipping.left;
3036 c->c.top = vcs->clipping.top; 3446 c->c.top = vcs->clipping.top;
3037 c->c.width = vcs->clipping.right - vcs->clipping.left; 3447 c->c.width = vcs->clipping.right - vcs->clipping.left;
3038 c->c.height = vcs->clipping.bottom - vcs->clipping.top; 3448 c->c.height = vcs->clipping.bottom - vcs->clipping.top;
3039 3449
3040 spin_unlock(&vino_drvdata->input_lock); 3450 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3041 break; 3451 break;
3042 case V4L2_BUF_TYPE_VIDEO_OVERLAY: 3452 case V4L2_BUF_TYPE_VIDEO_OVERLAY:
3043 default: 3453 default:
@@ -3050,18 +3460,16 @@ static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
3050static int vino_v4l2_s_crop(struct vino_channel_settings *vcs, 3460static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
3051 struct v4l2_crop *c) 3461 struct v4l2_crop *c)
3052{ 3462{
3463 unsigned long flags;
3464
3053 switch (c->type) { 3465 switch (c->type) {
3054 case V4L2_BUF_TYPE_VIDEO_CAPTURE: 3466 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
3055 spin_lock(&vino_drvdata->input_lock); 3467 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3056 3468
3057 if (!vino_is_input_owner(vcs)) {
3058 spin_unlock(&vino_drvdata->input_lock);
3059 return -EINVAL;
3060 }
3061 vino_set_clipping(vcs, c->c.left, c->c.top, 3469 vino_set_clipping(vcs, c->c.left, c->c.top,
3062 c->c.width, c->c.height); 3470 c->c.width, c->c.height);
3063 3471
3064 spin_unlock(&vino_drvdata->input_lock); 3472 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3065 break; 3473 break;
3066 case V4L2_BUF_TYPE_VIDEO_OVERLAY: 3474 case V4L2_BUF_TYPE_VIDEO_OVERLAY:
3067 default: 3475 default:
@@ -3074,6 +3482,8 @@ static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
3074static int vino_v4l2_g_parm(struct vino_channel_settings *vcs, 3482static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
3075 struct v4l2_streamparm *sp) 3483 struct v4l2_streamparm *sp)
3076{ 3484{
3485 unsigned long flags;
3486
3077 switch (sp->type) { 3487 switch (sp->type) {
3078 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 3488 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
3079 struct v4l2_captureparm *cp = &sp->parm.capture; 3489 struct v4l2_captureparm *cp = &sp->parm.capture;
@@ -3082,9 +3492,11 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
3082 cp->capability = V4L2_CAP_TIMEPERFRAME; 3492 cp->capability = V4L2_CAP_TIMEPERFRAME;
3083 cp->timeperframe.numerator = 1; 3493 cp->timeperframe.numerator = 1;
3084 3494
3085 spin_lock(&vino_drvdata->input_lock); 3495 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3496
3086 cp->timeperframe.denominator = vcs->fps; 3497 cp->timeperframe.denominator = vcs->fps;
3087 spin_unlock(&vino_drvdata->input_lock); 3498
3499 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3088 3500
3089 // TODO: cp->readbuffers = xxx; 3501 // TODO: cp->readbuffers = xxx;
3090 break; 3502 break;
@@ -3100,15 +3512,13 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
3100static int vino_v4l2_s_parm(struct vino_channel_settings *vcs, 3512static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
3101 struct v4l2_streamparm *sp) 3513 struct v4l2_streamparm *sp)
3102{ 3514{
3515 unsigned long flags;
3516
3103 switch (sp->type) { 3517 switch (sp->type) {
3104 case V4L2_BUF_TYPE_VIDEO_CAPTURE: { 3518 case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
3105 struct v4l2_captureparm *cp = &sp->parm.capture; 3519 struct v4l2_captureparm *cp = &sp->parm.capture;
3106 3520
3107 spin_lock(&vino_drvdata->input_lock); 3521 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3108 if (!vino_is_input_owner(vcs)) {
3109 spin_unlock(&vino_drvdata->input_lock);
3110 return -EINVAL;
3111 }
3112 3522
3113 if ((cp->timeperframe.numerator == 0) || 3523 if ((cp->timeperframe.numerator == 0) ||
3114 (cp->timeperframe.denominator == 0)) { 3524 (cp->timeperframe.denominator == 0)) {
@@ -3118,7 +3528,8 @@ static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
3118 vino_set_framerate(vcs, cp->timeperframe.denominator / 3528 vino_set_framerate(vcs, cp->timeperframe.denominator /
3119 cp->timeperframe.numerator); 3529 cp->timeperframe.numerator);
3120 } 3530 }
3121 spin_unlock(&vino_drvdata->input_lock); 3531
3532 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3122 3533
3123 // TODO: set buffers according to cp->readbuffers 3534 // TODO: set buffers according to cp->readbuffers
3124 break; 3535 break;
@@ -3145,21 +3556,23 @@ static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs,
3145 return -EINVAL; 3556 return -EINVAL;
3146 } 3557 }
3147 3558
3148 if (vino_is_capturing(vcs)) {
3149 dprintk("busy, capturing\n");
3150 return -EBUSY;
3151 }
3152
3153 dprintk("count = %d\n", rb->count); 3559 dprintk("count = %d\n", rb->count);
3154 if (rb->count > 0) { 3560 if (rb->count > 0) {
3561 if (vino_is_capturing(vcs)) {
3562 dprintk("busy, capturing\n");
3563 return -EBUSY;
3564 }
3565
3155 if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) { 3566 if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) {
3156 dprintk("busy, buffers still mapped\n"); 3567 dprintk("busy, buffers still mapped\n");
3157 return -EBUSY; 3568 return -EBUSY;
3158 } else { 3569 } else {
3570 vcs->streaming = 0;
3159 vino_queue_free(&vcs->fb_queue); 3571 vino_queue_free(&vcs->fb_queue);
3160 vino_queue_init(&vcs->fb_queue, &rb->count); 3572 vino_queue_init(&vcs->fb_queue, &rb->count);
3161 } 3573 }
3162 } else { 3574 } else {
3575 vcs->streaming = 0;
3163 vino_capture_stop(vcs); 3576 vino_capture_stop(vcs);
3164 vino_queue_free(&vcs->fb_queue); 3577 vino_queue_free(&vcs->fb_queue);
3165 } 3578 }
@@ -3302,12 +3715,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
3302 err = vino_queue_get_incoming(&vcs->fb_queue, &incoming); 3715 err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
3303 if (err) { 3716 if (err) {
3304 dprintk("vino_queue_get_incoming() failed\n"); 3717 dprintk("vino_queue_get_incoming() failed\n");
3305 return -EIO; 3718 return -EINVAL;
3306 } 3719 }
3307 err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing); 3720 err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing);
3308 if (err) { 3721 if (err) {
3309 dprintk("vino_queue_get_outgoing() failed\n"); 3722 dprintk("vino_queue_get_outgoing() failed\n");
3310 return -EIO; 3723 return -EINVAL;
3311 } 3724 }
3312 3725
3313 dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing); 3726 dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing);
@@ -3327,8 +3740,10 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
3327 if (err) { 3740 if (err) {
3328 err = vino_wait_for_frame(vcs); 3741 err = vino_wait_for_frame(vcs);
3329 if (err) { 3742 if (err) {
3330 /* interrupted */ 3743 /* interrupted or
3331 vino_capture_failed(vcs); 3744 * no frames captured because
3745 * of frame skipping */
3746 // vino_capture_failed(vcs);
3332 return -EIO; 3747 return -EIO;
3333 } 3748 }
3334 } 3749 }
@@ -3341,10 +3756,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
3341 } 3756 }
3342 3757
3343 err = vino_check_buffer(vcs, fb); 3758 err = vino_check_buffer(vcs, fb);
3759
3760 vino_v4l2_get_buffer_status(vcs, fb, b);
3761
3344 if (err) 3762 if (err)
3345 return -EIO; 3763 return -EIO;
3346 3764
3347 vino_v4l2_get_buffer_status(vcs, fb, b);
3348 break; 3765 break;
3349 } 3766 }
3350 case V4L2_BUF_TYPE_VIDEO_OVERLAY: 3767 case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -3401,8 +3818,8 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
3401 if (!vcs->streaming) 3818 if (!vcs->streaming)
3402 return 0; 3819 return 0;
3403 3820
3404 vino_capture_stop(vcs);
3405 vcs->streaming = 0; 3821 vcs->streaming = 0;
3822 vino_capture_stop(vcs);
3406 3823
3407 return 0; 3824 return 0;
3408} 3825}
@@ -3410,10 +3827,11 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
3410static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, 3827static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
3411 struct v4l2_queryctrl *queryctrl) 3828 struct v4l2_queryctrl *queryctrl)
3412{ 3829{
3830 unsigned long flags;
3413 int i; 3831 int i;
3414 int err = 0; 3832 int err = 0;
3415 3833
3416 spin_lock(&vino_drvdata->input_lock); 3834 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3417 3835
3418 switch (vcs->input) { 3836 switch (vcs->input) {
3419 case VINO_INPUT_D1: 3837 case VINO_INPUT_D1:
@@ -3423,6 +3841,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
3423 memcpy(queryctrl, 3841 memcpy(queryctrl,
3424 &vino_indycam_v4l2_controls[i], 3842 &vino_indycam_v4l2_controls[i],
3425 sizeof(struct v4l2_queryctrl)); 3843 sizeof(struct v4l2_queryctrl));
3844 queryctrl->reserved[0] = 0;
3426 goto found; 3845 goto found;
3427 } 3846 }
3428 } 3847 }
@@ -3437,6 +3856,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
3437 memcpy(queryctrl, 3856 memcpy(queryctrl,
3438 &vino_saa7191_v4l2_controls[i], 3857 &vino_saa7191_v4l2_controls[i],
3439 sizeof(struct v4l2_queryctrl)); 3858 sizeof(struct v4l2_queryctrl));
3859 queryctrl->reserved[0] = 0;
3440 goto found; 3860 goto found;
3441 } 3861 }
3442 } 3862 }
@@ -3448,7 +3868,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
3448 } 3868 }
3449 3869
3450 found: 3870 found:
3451 spin_unlock(&vino_drvdata->input_lock); 3871 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3452 3872
3453 return err; 3873 return err;
3454} 3874}
@@ -3456,70 +3876,72 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
3456static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs, 3876static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
3457 struct v4l2_control *control) 3877 struct v4l2_control *control)
3458{ 3878{
3459 struct indycam_control indycam_ctrl; 3879 unsigned long flags;
3460 struct saa7191_control saa7191_ctrl; 3880 int i;
3461 int err = 0; 3881 int err = 0;
3462 3882
3463 spin_lock(&vino_drvdata->input_lock); 3883 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3464 3884
3465 switch (vcs->input) { 3885 switch (vcs->input) {
3466 case VINO_INPUT_D1: 3886 case VINO_INPUT_D1: {
3467 i2c_camera_command(DECODER_INDYCAM_GET_CONTROLS, 3887 struct indycam_control indycam_ctrl;
3468 &indycam_ctrl);
3469 3888
3470 switch(control->id) { 3889 for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
3471 case V4L2_CID_AUTOGAIN: 3890 if (vino_indycam_v4l2_controls[i].id ==
3472 control->value = indycam_ctrl.agc; 3891 control->id) {
3473 break; 3892 goto found1;
3474 case V4L2_CID_AUTO_WHITE_BALANCE: 3893 }
3475 control->value = indycam_ctrl.awb; 3894 }
3476 break; 3895
3477 case V4L2_CID_GAIN: 3896 err = -EINVAL;
3478 control->value = indycam_ctrl.gain; 3897 goto out;
3479 break; 3898
3480 case V4L2_CID_PRIVATE_BASE: 3899found1:
3481 control->value = indycam_ctrl.red_saturation; 3900 indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
3482 break; 3901
3483 case V4L2_CID_PRIVATE_BASE + 1: 3902 err = i2c_camera_command(DECODER_INDYCAM_GET_CONTROL,
3484 control->value = indycam_ctrl.blue_saturation; 3903 &indycam_ctrl);
3485 break; 3904 if (err) {
3486 case V4L2_CID_RED_BALANCE:
3487 control->value = indycam_ctrl.red_balance;
3488 break;
3489 case V4L2_CID_BLUE_BALANCE:
3490 control->value = indycam_ctrl.blue_balance;
3491 break;
3492 case V4L2_CID_EXPOSURE:
3493 control->value = indycam_ctrl.shutter;
3494 break;
3495 case V4L2_CID_GAMMA:
3496 control->value = indycam_ctrl.gamma;
3497 break;
3498 default:
3499 err = -EINVAL; 3905 err = -EINVAL;
3906 goto out;
3500 } 3907 }
3908
3909 control->value = indycam_ctrl.value;
3501 break; 3910 break;
3911 }
3502 case VINO_INPUT_COMPOSITE: 3912 case VINO_INPUT_COMPOSITE:
3503 case VINO_INPUT_SVIDEO: 3913 case VINO_INPUT_SVIDEO: {
3504 i2c_decoder_command(DECODER_SAA7191_GET_CONTROLS, 3914 struct saa7191_control saa7191_ctrl;
3505 &saa7191_ctrl);
3506 3915
3507 switch(control->id) { 3916 for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
3508 case V4L2_CID_HUE: 3917 if (vino_saa7191_v4l2_controls[i].id ==
3509 control->value = saa7191_ctrl.hue; 3918 control->id) {
3510 break; 3919 goto found2;
3511 case V4L2_CID_PRIVATE_BASE: 3920 }
3512 control->value = saa7191_ctrl.vtrc; 3921 }
3513 break; 3922
3514 default: 3923 err = -EINVAL;
3924 goto out;
3925
3926found2:
3927 saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
3928
3929 err = i2c_decoder_command(DECODER_SAA7191_GET_CONTROL,
3930 &saa7191_ctrl);
3931 if (err) {
3515 err = -EINVAL; 3932 err = -EINVAL;
3933 goto out;
3516 } 3934 }
3935
3936 control->value = saa7191_ctrl.value;
3517 break; 3937 break;
3938 }
3518 default: 3939 default:
3519 err = -EINVAL; 3940 err = -EINVAL;
3520 } 3941 }
3521 3942
3522 spin_unlock(&vino_drvdata->input_lock); 3943out:
3944 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3523 3945
3524 return err; 3946 return err;
3525} 3947}
@@ -3527,15 +3949,21 @@ static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
3527static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs, 3949static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
3528 struct v4l2_control *control) 3950 struct v4l2_control *control)
3529{ 3951{
3530 struct indycam_control indycam_ctrl; 3952 unsigned long flags;
3531 struct saa7191_control saa7191_ctrl;
3532 int i; 3953 int i;
3533 int err = 0; 3954 int err = 0;
3534 3955
3535 spin_lock(&vino_drvdata->input_lock); 3956 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
3957
3958 if (!vino_is_input_owner(vcs)) {
3959 err = -EBUSY;
3960 goto out;
3961 }
3536 3962
3537 switch (vcs->input) { 3963 switch (vcs->input) {
3538 case VINO_INPUT_D1: 3964 case VINO_INPUT_D1: {
3965 struct indycam_control indycam_ctrl;
3966
3539 for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) { 3967 for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
3540 if (vino_indycam_v4l2_controls[i].id == 3968 if (vino_indycam_v4l2_controls[i].id ==
3541 control->id) { 3969 control->id) {
@@ -3544,65 +3972,31 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
3544 && (control->value <= 3972 && (control->value <=
3545 vino_indycam_v4l2_controls[i]. 3973 vino_indycam_v4l2_controls[i].
3546 maximum)) { 3974 maximum)) {
3547 goto ok1; 3975 goto found1;
3548 } else { 3976 } else {
3549 err = -ERANGE; 3977 err = -ERANGE;
3550 goto error; 3978 goto out;
3551 } 3979 }
3552 } 3980 }
3553 } 3981 }
3982
3554 err = -EINVAL; 3983 err = -EINVAL;
3555 goto error; 3984 goto out;
3556 3985
3557ok1: 3986found1:
3558 indycam_ctrl.agc = INDYCAM_VALUE_UNCHANGED; 3987 indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
3559 indycam_ctrl.awb = INDYCAM_VALUE_UNCHANGED; 3988 indycam_ctrl.value = control->value;
3560 indycam_ctrl.shutter = INDYCAM_VALUE_UNCHANGED;
3561 indycam_ctrl.gain = INDYCAM_VALUE_UNCHANGED;
3562 indycam_ctrl.red_balance = INDYCAM_VALUE_UNCHANGED;
3563 indycam_ctrl.blue_balance = INDYCAM_VALUE_UNCHANGED;
3564 indycam_ctrl.red_saturation = INDYCAM_VALUE_UNCHANGED;
3565 indycam_ctrl.blue_saturation = INDYCAM_VALUE_UNCHANGED;
3566 indycam_ctrl.gamma = INDYCAM_VALUE_UNCHANGED;
3567
3568 switch(control->id) {
3569 case V4L2_CID_AUTOGAIN:
3570 indycam_ctrl.agc = control->value;
3571 break;
3572 case V4L2_CID_AUTO_WHITE_BALANCE:
3573 indycam_ctrl.awb = control->value;
3574 break;
3575 case V4L2_CID_GAIN:
3576 indycam_ctrl.gain = control->value;
3577 break;
3578 case V4L2_CID_PRIVATE_BASE:
3579 indycam_ctrl.red_saturation = control->value;
3580 break;
3581 case V4L2_CID_PRIVATE_BASE + 1:
3582 indycam_ctrl.blue_saturation = control->value;
3583 break;
3584 case V4L2_CID_RED_BALANCE:
3585 indycam_ctrl.red_balance = control->value;
3586 break;
3587 case V4L2_CID_BLUE_BALANCE:
3588 indycam_ctrl.blue_balance = control->value;
3589 break;
3590 case V4L2_CID_EXPOSURE:
3591 indycam_ctrl.shutter = control->value;
3592 break;
3593 case V4L2_CID_GAMMA:
3594 indycam_ctrl.gamma = control->value;
3595 break;
3596 default:
3597 err = -EINVAL;
3598 }
3599 3989
3600 if (!err) 3990 err = i2c_camera_command(DECODER_INDYCAM_SET_CONTROL,
3601 i2c_camera_command(DECODER_INDYCAM_SET_CONTROLS, 3991 &indycam_ctrl);
3602 &indycam_ctrl); 3992 if (err)
3993 err = -EINVAL;
3603 break; 3994 break;
3995 }
3604 case VINO_INPUT_COMPOSITE: 3996 case VINO_INPUT_COMPOSITE:
3605 case VINO_INPUT_SVIDEO: 3997 case VINO_INPUT_SVIDEO: {
3998 struct saa7191_control saa7191_ctrl;
3999
3606 for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) { 4000 for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
3607 if (vino_saa7191_v4l2_controls[i].id == 4001 if (vino_saa7191_v4l2_controls[i].id ==
3608 control->id) { 4002 control->id) {
@@ -3611,41 +4005,32 @@ ok1:
3611 && (control->value <= 4005 && (control->value <=
3612 vino_saa7191_v4l2_controls[i]. 4006 vino_saa7191_v4l2_controls[i].
3613 maximum)) { 4007 maximum)) {
3614 goto ok2; 4008 goto found2;
3615 } else { 4009 } else {
3616 err = -ERANGE; 4010 err = -ERANGE;
3617 goto error; 4011 goto out;
3618 } 4012 }
3619 } 4013 }
3620 } 4014 }
3621 err = -EINVAL; 4015 err = -EINVAL;
3622 goto error; 4016 goto out;
3623
3624ok2:
3625 saa7191_ctrl.hue = SAA7191_VALUE_UNCHANGED;
3626 saa7191_ctrl.vtrc = SAA7191_VALUE_UNCHANGED;
3627 4017
3628 switch(control->id) { 4018found2:
3629 case V4L2_CID_HUE: 4019 saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
3630 saa7191_ctrl.hue = control->value; 4020 saa7191_ctrl.value = control->value;
3631 break;
3632 case V4L2_CID_PRIVATE_BASE:
3633 saa7191_ctrl.vtrc = control->value;
3634 break;
3635 default:
3636 err = -EINVAL;
3637 }
3638 4021
3639 if (!err) 4022 err = i2c_decoder_command(DECODER_SAA7191_SET_CONTROL,
3640 i2c_decoder_command(DECODER_SAA7191_SET_CONTROLS, 4023 &saa7191_ctrl);
3641 &saa7191_ctrl); 4024 if (err)
4025 err = -EINVAL;
3642 break; 4026 break;
4027 }
3643 default: 4028 default:
3644 err = -EINVAL; 4029 err = -EINVAL;
3645 } 4030 }
3646 4031
3647error: 4032out:
3648 spin_unlock(&vino_drvdata->input_lock); 4033 spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
3649 4034
3650 return err; 4035 return err;
3651} 4036}
@@ -3865,9 +4250,9 @@ static unsigned int vino_poll(struct file *file, poll_table *pt)
3865over: 4250over:
3866 dprintk("poll(): data %savailable\n", 4251 dprintk("poll(): data %savailable\n",
3867 (outgoing > 0) ? "" : "not "); 4252 (outgoing > 0) ? "" : "not ");
3868 if (outgoing > 0) { 4253
4254 if (outgoing > 0)
3869 ret = POLLIN | POLLRDNORM; 4255 ret = POLLIN | POLLRDNORM;
3870 }
3871 4256
3872error: 4257error:
3873 4258
@@ -3880,6 +4265,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
3880 struct video_device *dev = video_devdata(file); 4265 struct video_device *dev = video_devdata(file);
3881 struct vino_channel_settings *vcs = video_get_drvdata(dev); 4266 struct vino_channel_settings *vcs = video_get_drvdata(dev);
3882 4267
4268#ifdef VINO_DEBUG
3883 switch (_IOC_TYPE(cmd)) { 4269 switch (_IOC_TYPE(cmd)) {
3884 case 'v': 4270 case 'v':
3885 dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd); 4271 dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd);
@@ -3891,9 +4277,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
3891 default: 4277 default:
3892 dprintk("ioctl(): unsupported command 0x%08x\n", cmd); 4278 dprintk("ioctl(): unsupported command 0x%08x\n", cmd);
3893 } 4279 }
4280#endif
3894 4281
3895 switch (cmd) { 4282 switch (cmd) {
3896 /* TODO: V4L1 interface (use compatibility layer?) */
3897 /* V4L2 interface */ 4283 /* V4L2 interface */
3898 case VIDIOC_QUERYCAP: { 4284 case VIDIOC_QUERYCAP: {
3899 vino_v4l2_querycap(arg); 4285 vino_v4l2_querycap(arg);
@@ -3911,6 +4297,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
3911 case VIDIOC_ENUMSTD: { 4297 case VIDIOC_ENUMSTD: {
3912 return vino_v4l2_enumstd(vcs, arg); 4298 return vino_v4l2_enumstd(vcs, arg);
3913 } 4299 }
4300 case VIDIOC_QUERYSTD: {
4301 return vino_v4l2_querystd(vcs, arg);
4302 }
3914 case VIDIOC_G_STD: { 4303 case VIDIOC_G_STD: {
3915 return vino_v4l2_g_std(vcs, arg); 4304 return vino_v4l2_g_std(vcs, arg);
3916 } 4305 }
@@ -4100,8 +4489,7 @@ static int vino_probe(void)
4100 return -ENODEV; 4489 return -ENODEV;
4101 } 4490 }
4102 4491
4103 printk(KERN_INFO "VINO with chip ID %ld, revision %ld found\n", 4492 printk(KERN_INFO "VINO revision %ld found\n", VINO_REV_NUM(rev_id));
4104 VINO_ID_VALUE(rev_id), VINO_REV_NUM(rev_id));
4105 4493
4106 return 0; 4494 return 0;
4107} 4495}
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index eed2acea1779..39a0d238900e 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -1057,10 +1057,8 @@ zr36057_init (struct zoran *zr)
1057 KERN_ERR 1057 KERN_ERR
1058 "%s: zr36057_init() - kmalloc (STAT_COM) failed\n", 1058 "%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
1059 ZR_DEVNAME(zr)); 1059 ZR_DEVNAME(zr));
1060 if (vdev) 1060 kfree(vdev);
1061 kfree(vdev); 1061 kfree((void *)mem);
1062 if (mem)
1063 kfree((void *)mem);
1064 return -ENOMEM; 1062 return -ENOMEM;
1065 } 1063 }
1066 memset((void *) mem, 0, mem_needed); 1064 memset((void *) mem, 0, mem_needed);
@@ -1105,15 +1103,15 @@ zoran_release (struct zoran *zr)
1105 /* unregister videocodec bus */ 1103 /* unregister videocodec bus */
1106 if (zr->codec) { 1104 if (zr->codec) {
1107 struct videocodec_master *master = zr->codec->master_data; 1105 struct videocodec_master *master = zr->codec->master_data;
1106
1108 videocodec_detach(zr->codec); 1107 videocodec_detach(zr->codec);
1109 if (master) 1108 kfree(master);
1110 kfree(master);
1111 } 1109 }
1112 if (zr->vfe) { 1110 if (zr->vfe) {
1113 struct videocodec_master *master = zr->vfe->master_data; 1111 struct videocodec_master *master = zr->vfe->master_data;
1112
1114 videocodec_detach(zr->vfe); 1113 videocodec_detach(zr->vfe);
1115 if (master) 1114 kfree(master);
1116 kfree(master);
1117 } 1115 }
1118 1116
1119 /* unregister i2c bus */ 1117 /* unregister i2c bus */
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 53adeb70f2ca..07bde9acd672 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -996,8 +996,6 @@ zoran_jpg_queue_frame (struct file *file,
996 return -EINVAL; 996 return -EINVAL;
997 } 997 }
998 998
999 spin_lock_irqsave(&zr->spinlock, flags);
1000
1001 if (fh->jpg_buffers.active == ZORAN_FREE) { 999 if (fh->jpg_buffers.active == ZORAN_FREE) {
1002 if (zr->jpg_buffers.active == ZORAN_FREE) { 1000 if (zr->jpg_buffers.active == ZORAN_FREE) {
1003 zr->jpg_buffers = fh->jpg_buffers; 1001 zr->jpg_buffers = fh->jpg_buffers;
@@ -1016,6 +1014,8 @@ zoran_jpg_queue_frame (struct file *file,
1016 zr36057_enable_jpg(zr, mode); 1014 zr36057_enable_jpg(zr, mode);
1017 } 1015 }
1018 1016
1017 spin_lock_irqsave(&zr->spinlock, flags);
1018
1019 if (!res) { 1019 if (!res) {
1020 switch (zr->jpg_buffers.buffer[num].state) { 1020 switch (zr->jpg_buffers.buffer[num].state) {
1021 case BUZ_STATE_DONE: 1021 case BUZ_STATE_DONE:
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-22 06:18:36 -0500