Commit b088ba65 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 52b66144
This diff is collapsed.
...@@ -362,7 +362,7 @@ struct cx231xx_board { ...@@ -362,7 +362,7 @@ struct cx231xx_board {
struct cx231xx_input input[MAX_CX231XX_INPUT]; struct cx231xx_input input[MAX_CX231XX_INPUT];
struct cx231xx_input radio; struct cx231xx_input radio;
struct ir_scancode_table *ir_codes; struct rc_map *ir_codes;
}; };
/* device states */ /* device states */
......
...@@ -39,7 +39,7 @@ enum rc_driver_type { ...@@ -39,7 +39,7 @@ enum rc_driver_type {
* @input_id: id of the input child device (struct input_id) * @input_id: id of the input child device (struct input_id)
* @driver_name: name of the hardware driver which registered this device * @driver_name: name of the hardware driver which registered this device
* @map_name: name of the default keymap * @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 * @devno: unique remote control device number
* @raw: additional data for raw pulse/space devices * @raw: additional data for raw pulse/space devices
* @input_dev: the input child device used to communicate events to userspace * @input_dev: the input child device used to communicate events to userspace
...@@ -86,7 +86,7 @@ struct rc_dev { ...@@ -86,7 +86,7 @@ struct rc_dev {
struct input_id input_id; struct input_id input_id;
char *driver_name; char *driver_name;
const char *map_name; const char *map_name;
struct ir_scancode_table rc_tab; struct rc_map rc_map;
unsigned long devno; unsigned long devno;
struct ir_raw_event_ctrl *raw; struct ir_raw_event_ctrl *raw;
struct input_dev *input_dev; struct input_dev *input_dev;
......
...@@ -30,7 +30,7 @@ struct ir_scancode { ...@@ -30,7 +30,7 @@ struct ir_scancode {
u32 keycode; u32 keycode;
}; };
struct ir_scancode_table { struct rc_map {
struct ir_scancode *scan; struct ir_scancode *scan;
unsigned int size; /* Max number of entries */ unsigned int size; /* Max number of entries */
unsigned int len; /* Used number of entries */ unsigned int len; /* Used number of entries */
...@@ -42,14 +42,14 @@ struct ir_scancode_table { ...@@ -42,14 +42,14 @@ struct ir_scancode_table {
struct rc_keymap { struct rc_keymap {
struct list_head list; struct list_head list;
struct ir_scancode_table map; struct rc_map map;
}; };
/* Routines from rc-map.c */ /* Routines from rc-map.c */
int ir_register_map(struct rc_keymap *map); int ir_register_map(struct rc_keymap *map);
void ir_unregister_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); void rc_map_init(void);
/* Names of the several keytables defined in-kernel */ /* Names of the several keytables defined in-kernel */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment