summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 18:28:27 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 11:16:51 +0100
commitb088ba658b3438056dab4d744701364db3f08b9a (patch)
tree6e6ec7ad1c7025595ce173505d88f585b3723fc0 /include/media
parent[media] rc: Rename remote controller type to rc_type instead of ir_type (diff)
downloadlinux-b088ba658b3438056dab4d744701364db3f08b9a.tar.xz
linux-b088ba658b3438056dab4d744701364db3f08b9a.zip
[media] rc: Properly name the rc_map struct
The struct that describes a rc mapping had an weird and long name. We should properly name it, to make easier for developers to work with it, and to avoid confusion. Basically, 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_table,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_tab,rc_map,g <$i >a && mv a $i; done (and manually fixed where needed) Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/rc-core.h4
-rw-r--r--include/media/rc-map.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 42543257fa0f..affb93feed3b 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -39,7 +39,7 @@ enum rc_driver_type {
* @input_id: id of the input child device (struct input_id)
* @driver_name: name of the hardware driver which registered this device
* @map_name: name of the default keymap
- * @rc_tab: current scan/key table
+ * @rc_map: current scan/key table
* @devno: unique remote control device number
* @raw: additional data for raw pulse/space devices
* @input_dev: the input child device used to communicate events to userspace
@@ -86,7 +86,7 @@ struct rc_dev {
struct input_id input_id;
char *driver_name;
const char *map_name;
- struct ir_scancode_table rc_tab;
+ struct rc_map rc_map;
unsigned long devno;
struct ir_raw_event_ctrl *raw;
struct input_dev *input_dev;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index c53351e15f50..a6b2738f2d60 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -30,7 +30,7 @@ struct ir_scancode {
u32 keycode;
};
-struct ir_scancode_table {
+struct rc_map {
struct ir_scancode *scan;
unsigned int size; /* Max number of entries */
unsigned int len; /* Used number of entries */
@@ -42,14 +42,14 @@ struct ir_scancode_table {
struct rc_keymap {
struct list_head list;
- struct ir_scancode_table map;
+ struct rc_map map;
};
/* Routines from rc-map.c */
int ir_register_map(struct rc_keymap *map);
void ir_unregister_map(struct rc_keymap *map);
-struct ir_scancode_table *get_rc_map(const char *name);
+struct rc_map *get_rc_map(const char *name);
void rc_map_init(void);
/* Names of the several keytables defined in-kernel */