Commit 56c0893c authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

[media] rc: further key name standardization 



Use the newly introduced KEY_IMAGES where appropriate, and standardize
on KEY_MEDIA for media center/application launcher button (such as the
Windows logo key on the Windows Media Center Ed. remotes).

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d8ee99e7

drivers/media/dvb/dvb-usb/dibusb-common.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ struct rc_map_table rc_map_dibusb_table[] = { 


	{ 0x8008, KEY_DVD },

	{ 0x8009, KEY_AUDIO },

	{ 0x800a, KEY_MEDIA },      /* Pictures */

	{ 0x800a, KEY_IMAGES },      /* Pictures */

	{ 0x800b, KEY_VIDEO },



	{ 0x800c, KEY_BACK },

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

+8 −8
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = { 
	{ 0x16, KEY_POWER },

	{ 0x17, KEY_FAVORITES },

	{ 0x0f, KEY_TEXT },

	{ 0x48, KEY_MEDIA },		/* preview */

	{ 0x48, KEY_PROGRAM },		/* preview */

	{ 0x1c, KEY_EPG },

	{ 0x04, KEY_LIST },		/* record list */

	{ 0x03, KEY_1 },
@@ -674,14 +674,14 @@ static struct rc_map_table rc_map_pinnacle310e_table[] = { 
	{ 0x0e, KEY_MUTE },

/*	{ 0x49, KEY_LR },	*/		/* L/R */

	{ 0x07, KEY_SLEEP },		/* Hibernate */

	{ 0x08, KEY_MEDIA },		/* A/V */

	{ 0x08, KEY_VIDEO },		/* A/V */

	{ 0x0e, KEY_MENU },		/* Recall */

	{ 0x45, KEY_ZOOMIN },

	{ 0x46, KEY_ZOOMOUT },

	{ 0x18, KEY_TV },			/* Red */

	{ 0x53, KEY_VCR },			/* Green */

	{ 0x5e, KEY_SAT },			/* Yellow */

	{ 0x5f, KEY_PLAYER },		/* Blue */

	{ 0x18, KEY_RED },		/* Red */

	{ 0x53, KEY_GREEN },		/* Green */

	{ 0x5e, KEY_YELLOW },		/* Yellow */

	{ 0x5f, KEY_BLUE },		/* Blue */

};



/* DVB USB Driver stuff */

drivers/media/dvb/dvb-usb/nova-t-usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static struct rc_map_table rc_map_haupp_table[] = { 
	{ 0x1e17, KEY_RIGHT },

	{ 0x1e18, KEY_VIDEO },

	{ 0x1e19, KEY_AUDIO },

	{ 0x1e1a, KEY_MEDIA },

	{ 0x1e1a, KEY_IMAGES },

	{ 0x1e1b, KEY_EPG },

	{ 0x1e1c, KEY_TV },

	{ 0x1e1e, KEY_NEXT },

drivers/media/rc/keymaps/rc-avermedia-cardbus.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static struct rc_map_table avermedia_cardbus[] = { 
	{ 0x28, KEY_SELECT },		/* Select */

	{ 0x29, KEY_BLUE },		/* Blue/Picture */

	{ 0x2a, KEY_BACKSPACE },	/* Back */

	{ 0x2b, KEY_MEDIA },		/* PIP (Picture-in-picture) */

	{ 0x2b, KEY_VIDEO },		/* PIP (Picture-in-picture) */

	{ 0x2c, KEY_DOWN },

	{ 0x2e, KEY_DOT },

	{ 0x2f, KEY_TV },		/* Live TV */

drivers/media/rc/keymaps/rc-imon-mce.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct rc_map_table imon_mce[] = { 
	{ 0x800ff44d, KEY_TITLE },



	{ 0x800ff40c, KEY_POWER },

	{ 0x800ff40d, KEY_LEFTMETA }, /* Windows MCE button */

	{ 0x800ff40d, KEY_MEDIA }, /* Windows MCE button */



};