diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-22 22:24:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:07 -0400 |
commit | c0c46826274a4da5d9e312d7cfd4ca0806c0a358 (patch) | |
tree | e3237889f6ee931f674f46ce72f1844796899b77 /drivers/media/video/ir-kbd-i2c.c | |
parent | 8403472f19fea7e7cec7899e998f38b899e59604 (diff) |
V4L/DVB: bttv: Move PV951 IR to the right driver
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index ece6e15e4c07..02fbd08112c9 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -146,26 +146,6 @@ static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) | |||
146 | return 1; | 146 | return 1; |
147 | } | 147 | } |
148 | 148 | ||
149 | static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) | ||
150 | { | ||
151 | unsigned char b; | ||
152 | |||
153 | /* poll IR chip */ | ||
154 | if (1 != i2c_master_recv(ir->c, &b, 1)) { | ||
155 | dprintk(1,"read error\n"); | ||
156 | return -EIO; | ||
157 | } | ||
158 | |||
159 | /* ignore 0xaa */ | ||
160 | if (b==0xaa) | ||
161 | return 0; | ||
162 | dprintk(2,"key %02x\n", b); | ||
163 | |||
164 | *ir_key = b; | ||
165 | *ir_raw = b; | ||
166 | return 1; | ||
167 | } | ||
168 | |||
169 | static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) | 149 | static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) |
170 | { | 150 | { |
171 | unsigned char buf[4]; | 151 | unsigned char buf[4]; |
@@ -321,12 +301,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
321 | ir_type = IR_TYPE_OTHER; | 301 | ir_type = IR_TYPE_OTHER; |
322 | ir_codes = RC_MAP_EMPTY; | 302 | ir_codes = RC_MAP_EMPTY; |
323 | break; | 303 | break; |
324 | case 0x4b: | ||
325 | name = "PV951"; | ||
326 | ir->get_key = get_key_pv951; | ||
327 | ir_type = IR_TYPE_OTHER; | ||
328 | ir_codes = RC_MAP_PV951; | ||
329 | break; | ||
330 | case 0x18: | 304 | case 0x18: |
331 | case 0x1f: | 305 | case 0x1f: |
332 | case 0x1a: | 306 | case 0x1a: |
@@ -396,9 +370,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
396 | case IR_KBD_GET_KEY_PIXELVIEW: | 370 | case IR_KBD_GET_KEY_PIXELVIEW: |
397 | ir->get_key = get_key_pixelview; | 371 | ir->get_key = get_key_pixelview; |
398 | break; | 372 | break; |
399 | case IR_KBD_GET_KEY_PV951: | ||
400 | ir->get_key = get_key_pv951; | ||
401 | break; | ||
402 | case IR_KBD_GET_KEY_HAUP: | 373 | case IR_KBD_GET_KEY_HAUP: |
403 | ir->get_key = get_key_haup; | 374 | ir->get_key = get_key_haup; |
404 | break; | 375 | break; |