diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-17 12:20:52 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:50 -0500 |
commit | 52b661449aecc47e652a164c0d8078b31e10aca0 (patch) | |
tree | 42af14cf5b6df82b841ec4bf38f22da54fc4439b /drivers/media/video/cx88/cx88-input.c | |
parent | 29e3ec19d5c88d534ced219d3962d67243e4d310 (diff) |
[media] rc: Rename remote controller type to rc_type instead of ir_type
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-input.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index cfeba4c08715..4a3bf5476c71 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -241,7 +241,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
241 | struct cx88_IR *ir; | 241 | struct cx88_IR *ir; |
242 | struct rc_dev *dev; | 242 | struct rc_dev *dev; |
243 | char *ir_codes = NULL; | 243 | char *ir_codes = NULL; |
244 | u64 ir_type = IR_TYPE_OTHER; | 244 | u64 rc_type = RC_TYPE_OTHER; |
245 | int err = -ENOMEM; | 245 | int err = -ENOMEM; |
246 | u32 hardware_mask = 0; /* For devices with a hardware mask, when | 246 | u32 hardware_mask = 0; /* For devices with a hardware mask, when |
247 | * used with a full-code IR table | 247 | * used with a full-code IR table |
@@ -404,7 +404,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
404 | break; | 404 | break; |
405 | case CX88_BOARD_TWINHAN_VP1027_DVBS: | 405 | case CX88_BOARD_TWINHAN_VP1027_DVBS: |
406 | ir_codes = RC_MAP_TWINHAN_VP1027_DVBS; | 406 | ir_codes = RC_MAP_TWINHAN_VP1027_DVBS; |
407 | ir_type = IR_TYPE_NEC; | 407 | rc_type = RC_TYPE_NEC; |
408 | ir->sampling = 0xff00; /* address */ | 408 | ir->sampling = 0xff00; /* address */ |
409 | break; | 409 | break; |
410 | } | 410 | } |
@@ -457,7 +457,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
457 | dev->timeout = 10 * 1000 * 1000; /* 10 ms */ | 457 | dev->timeout = 10 * 1000 * 1000; /* 10 ms */ |
458 | } else { | 458 | } else { |
459 | dev->driver_type = RC_DRIVER_SCANCODE; | 459 | dev->driver_type = RC_DRIVER_SCANCODE; |
460 | dev->allowed_protos = ir_type; | 460 | dev->allowed_protos = rc_type; |
461 | } | 461 | } |
462 | 462 | ||
463 | ir->core = core; | 463 | ir->core = core; |
@@ -557,7 +557,7 @@ void cx88_i2c_init_ir(struct cx88_core *core) | |||
557 | /* Hauppauge XVR */ | 557 | /* Hauppauge XVR */ |
558 | core->init_data.name = "cx88 Hauppauge XVR remote"; | 558 | core->init_data.name = "cx88 Hauppauge XVR remote"; |
559 | core->init_data.ir_codes = RC_MAP_HAUPPAUGE_NEW; | 559 | core->init_data.ir_codes = RC_MAP_HAUPPAUGE_NEW; |
560 | core->init_data.type = IR_TYPE_RC5; | 560 | core->init_data.type = RC_TYPE_RC5; |
561 | core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; | 561 | core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; |
562 | 562 | ||
563 | info.platform_data = &core->init_data; | 563 | info.platform_data = &core->init_data; |