Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f4f58d6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b088ba65

drivers/media/dvb/dvb-usb/a800.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_pr 
	return 0;

	return 0;

}

}





static struct ir_scancode ir_codes_a800_table[] = {

static struct rc_map_table rc_map_a800_table[] = {

	{ 0x0201, KEY_PROG1 },       /* SOURCE */

	{ 0x0201, KEY_PROG1 },       /* SOURCE */

	{ 0x0200, KEY_POWER },       /* POWER */

	{ 0x0200, KEY_POWER },       /* POWER */

	{ 0x0205, KEY_1 },           /* 1 */

	{ 0x0205, KEY_1 },           /* 1 */
@@ -148,8 +148,8 @@ static struct dvb_usb_device_properties a800_properties = { 




	.rc.legacy = {

	.rc.legacy = {

		.rc_interval      = DEFAULT_RC_INTERVAL,

		.rc_interval      = DEFAULT_RC_INTERVAL,

		.rc_key_map       = ir_codes_a800_table,

		.rc_map_table     = rc_map_a800_table,

		.rc_key_map_size  = ARRAY_SIZE(ir_codes_a800_table),

		.rc_map_size      = ARRAY_SIZE(rc_map_a800_table),

		.rc_query         = a800_rc_query,

		.rc_query         = a800_rc_query,

	},

	},

drivers/media/dvb/dvb-usb/af9005-remote.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ MODULE_PARM_DESC(debug, 




#define deb_decode(args...)   dprintk(dvb_usb_af9005_remote_debug,0x01,args)

#define deb_decode(args...)   dprintk(dvb_usb_af9005_remote_debug,0x01,args)





struct ir_scancode ir_codes_af9005_table[] = {

struct rc_map_table rc_map_af9005_table[] = {





	{0x01b7, KEY_POWER},

	{0x01b7, KEY_POWER},

	{0x01a7, KEY_VOLUMEUP},

	{0x01a7, KEY_VOLUMEUP},
@@ -74,7 +74,7 @@ struct ir_scancode ir_codes_af9005_table[] = { 
	{0x00d5, KEY_GOTO},	/* marked jump on the remote */

	{0x00d5, KEY_GOTO},	/* marked jump on the remote */

};

};





int ir_codes_af9005_table_size = ARRAY_SIZE(ir_codes_af9005_table);

int rc_map_af9005_table_size = ARRAY_SIZE(rc_map_af9005_table);





static int repeatable_keys[] = {

static int repeatable_keys[] = {

	KEY_VOLUMEUP,

	KEY_VOLUMEUP,
@@ -130,10 +130,10 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, 
				deb_decode("code != inverted code\n");

				deb_decode("code != inverted code\n");

				return 0;

				return 0;

			}

			}

			for (i = 0; i < ir_codes_af9005_table_size; i++) {

			for (i = 0; i < rc_map_af9005_table_size; i++) {

				if (rc5_custom(&ir_codes_af9005_table[i]) == cust

				if (rc5_custom(&rc_map_af9005_table[i]) == cust

				    && rc5_data(&ir_codes_af9005_table[i]) == dat) {

				    && rc5_data(&rc_map_af9005_table[i]) == dat) {

					*event = ir_codes_af9005_table[i].keycode;

					*event = rc_map_af9005_table[i].keycode;

					*state = REMOTE_KEY_PRESSED;

					*state = REMOTE_KEY_PRESSED;

					deb_decode

					deb_decode

					    ("key pressed, event %x\n", *event);

					    ("key pressed, event %x\n", *event);
@@ -146,8 +146,8 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, 
	return 0;

	return 0;

}

}





EXPORT_SYMBOL(ir_codes_af9005_table);

EXPORT_SYMBOL(rc_map_af9005_table);

EXPORT_SYMBOL(ir_codes_af9005_table_size);

EXPORT_SYMBOL(rc_map_af9005_table_size);

EXPORT_SYMBOL(af9005_rc_decode);

EXPORT_SYMBOL(af9005_rc_decode);





MODULE_AUTHOR("Luca Olivetti <luca@ventoso.org>");

MODULE_AUTHOR("Luca Olivetti <luca@ventoso.org>");

drivers/media/dvb/dvb-usb/af9005.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1027,8 +1027,8 @@ static struct dvb_usb_device_properties af9005_properties = { 




	.rc.legacy = {

	.rc.legacy = {

		.rc_interval = 200,

		.rc_interval = 200,

		.rc_key_map = NULL,

		.rc_map_table = NULL,

		.rc_key_map_size = 0,

		.rc_map_size = 0,

		.rc_query = af9005_rc_query,

		.rc_query = af9005_rc_query,

	},

	},
@@ -1070,14 +1070,14 @@ static int __init af9005_usb_module_init(void) 
		return result;

		return result;

	}

	}

	rc_decode = symbol_request(af9005_rc_decode);

	rc_decode = symbol_request(af9005_rc_decode);

	rc_keys = symbol_request(ir_codes_af9005_table);

	rc_keys = symbol_request(rc_map_af9005_table);

	rc_keys_size = symbol_request(ir_codes_af9005_table_size);

	rc_keys_size = symbol_request(rc_map_af9005_table_size);

	if (rc_decode == NULL || rc_keys == NULL || rc_keys_size == NULL) {

	if (rc_decode == NULL || rc_keys == NULL || rc_keys_size == NULL) {

		err("af9005_rc_decode function not found, disabling remote");

		err("af9005_rc_decode function not found, disabling remote");

		af9005_properties.rc.legacy.rc_query = NULL;

		af9005_properties.rc.legacy.rc_query = NULL;

	} else {

	} else {

		af9005_properties.rc.legacy.rc_key_map = rc_keys;

		af9005_properties.rc.legacy.rc_map_table = rc_keys;

		af9005_properties.rc.legacy.rc_key_map_size = *rc_keys_size;

		af9005_properties.rc.legacy.rc_map_size = *rc_keys_size;

	}

	}





	return 0;

	return 0;
@@ -1089,9 +1089,9 @@ static void __exit af9005_usb_module_exit(void) 
	if (rc_decode != NULL)

	if (rc_decode != NULL)

		symbol_put(af9005_rc_decode);

		symbol_put(af9005_rc_decode);

	if (rc_keys != NULL)

	if (rc_keys != NULL)

		symbol_put(ir_codes_af9005_table);

		symbol_put(rc_map_af9005_table);

	if (rc_keys_size != NULL)

	if (rc_keys_size != NULL)

		symbol_put(ir_codes_af9005_table_size);

		symbol_put(rc_map_af9005_table_size);

	/* deregister this driver from the USB subsystem */

	/* deregister this driver from the USB subsystem */

	usb_deregister(&af9005_usb_driver);

	usb_deregister(&af9005_usb_driver);

}

}

drivers/media/dvb/dvb-usb/af9005.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -3490,7 +3490,7 @@ extern u8 regmask[8]; 
/* remote control decoder */

/* remote control decoder */

extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len,

extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len,

			    u32 * event, int *state);

			    u32 * event, int *state);

extern struct ir_scancode ir_codes_af9005_table[];

extern struct rc_map_table rc_map_af9005_table[];

extern int ir_codes_af9005_table_size;

extern int rc_map_af9005_table_size;





#endif
 
#endif

drivers/media/dvb/dvb-usb/az6027.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ static int az6027_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) 
}

}





/* keys for the enclosed remote control */

/* keys for the enclosed remote control */

static struct ir_scancode ir_codes_az6027_table[] = {

static struct rc_map_table rc_map_az6027_table[] = {

	{ 0x01, KEY_1 },

	{ 0x01, KEY_1 },

	{ 0x02, KEY_2 },

	{ 0x02, KEY_2 },

};

};
@@ -1126,8 +1126,8 @@ static struct dvb_usb_device_properties az6027_properties = { 
	.read_mac_address = az6027_read_mac_addr,

	.read_mac_address = az6027_read_mac_addr,

 */

 */

	.rc.legacy = {

	.rc.legacy = {

		.rc_key_map       = ir_codes_az6027_table,

		.rc_map_table     = rc_map_az6027_table,

		.rc_key_map_size  = ARRAY_SIZE(ir_codes_az6027_table),

		.rc_map_size      = ARRAY_SIZE(rc_map_az6027_table),

		.rc_interval      = 400,

		.rc_interval      = 400,

		.rc_query         = az6027_rc_query,

		.rc_query         = az6027_rc_query,

	},

	},