diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-17 13:46:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:51 -0500 |
commit | 2f4f58d689dd71dea67407b74405a3c43e797cb1 (patch) | |
tree | 8f02ac4a3c8eccc99ee3dae8468e7e5f4c00995c /drivers/media/dvb/dvb-usb/dvb-usb.h | |
parent | b088ba658b3438056dab4d744701364db3f08b9a (diff) |
[media] rc: Name RC keymap tables as rc_map_table
Remote keytables had different names all over the place. Part of the fault
is due to a bad naming when rc subsystem was created, but there were lots
of old names that were still here.
Use a common standard for everything.
Patch generated by this script:
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_scancode,rc_map_table,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_codes_,rc_map_,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,rc_key_map,rc_map_table,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,rc_map_table_size,rc_map_size,g <$i >a && mv a $i; done
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb.h')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 95b1603d5be8..65fa9268e7f7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -75,17 +75,17 @@ struct dvb_usb_device_description { | |||
75 | struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM]; | 75 | struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM]; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static inline u8 rc5_custom(struct ir_scancode *key) | 78 | static inline u8 rc5_custom(struct rc_map_table *key) |
79 | { | 79 | { |
80 | return (key->scancode >> 8) & 0xff; | 80 | return (key->scancode >> 8) & 0xff; |
81 | } | 81 | } |
82 | 82 | ||
83 | static inline u8 rc5_data(struct ir_scancode *key) | 83 | static inline u8 rc5_data(struct rc_map_table *key) |
84 | { | 84 | { |
85 | return key->scancode & 0xff; | 85 | return key->scancode & 0xff; |
86 | } | 86 | } |
87 | 87 | ||
88 | static inline u8 rc5_scan(struct ir_scancode *key) | 88 | static inline u8 rc5_scan(struct rc_map_table *key) |
89 | { | 89 | { |
90 | return key->scancode & 0xffff; | 90 | return key->scancode & 0xffff; |
91 | } | 91 | } |
@@ -159,9 +159,9 @@ struct dvb_usb_adapter_properties { | |||
159 | 159 | ||
160 | /** | 160 | /** |
161 | * struct dvb_rc_legacy - old properties of remote controller | 161 | * struct dvb_rc_legacy - old properties of remote controller |
162 | * @rc_key_map: a hard-wired array of struct ir_scancode (NULL to disable | 162 | * @rc_map_table: a hard-wired array of struct rc_map_table (NULL to disable |
163 | * remote control handling). | 163 | * remote control handling). |
164 | * @rc_key_map_size: number of items in @rc_key_map. | 164 | * @rc_map_size: number of items in @rc_map_table. |
165 | * @rc_query: called to query an event event. | 165 | * @rc_query: called to query an event event. |
166 | * @rc_interval: time in ms between two queries. | 166 | * @rc_interval: time in ms between two queries. |
167 | */ | 167 | */ |
@@ -170,8 +170,8 @@ struct dvb_rc_legacy { | |||
170 | #define REMOTE_NO_KEY_PRESSED 0x00 | 170 | #define REMOTE_NO_KEY_PRESSED 0x00 |
171 | #define REMOTE_KEY_PRESSED 0x01 | 171 | #define REMOTE_KEY_PRESSED 0x01 |
172 | #define REMOTE_KEY_REPEAT 0x02 | 172 | #define REMOTE_KEY_REPEAT 0x02 |
173 | struct ir_scancode *rc_key_map; | 173 | struct rc_map_table *rc_map_table; |
174 | int rc_key_map_size; | 174 | int rc_map_size; |
175 | int (*rc_query) (struct dvb_usb_device *, u32 *, int *); | 175 | int (*rc_query) (struct dvb_usb_device *, u32 *, int *); |
176 | int rc_interval; | 176 | int rc_interval; |
177 | }; | 177 | }; |