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

Commit 15195d3a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge 



There are two "hauppauge-new" keymaps, one with protocol
unknown, and the other with the protocol marked accordingly.
However, both tables are miss-named.

Also, the old rc-hauppauge-new is broken, as it mixes
three different controllers as if they were just one.

This patch solves half of the problem by renaming the
correct keycode table as just rc-hauppauge. This table
contains the codes for the four different types of
remote controllers found on Hauppauge cards, properly
mapped with their different addresses.

 create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c
 delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
[Jarod: fix up RC_MAP_HAUPPAUGE defines]

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

drivers/media/dvb/siano/sms-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = { 
		.type	= SMS_NOVA_B0,

		.fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",

		.fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",

		.rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,

		.rc_codes = RC_MAP_HAUPPAUGE,

		.board_cfg.leds_power = 26,

		.board_cfg.led0 = 27,

		.board_cfg.led1 = 28,

drivers/media/rc/keymaps/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ 
			rc-proteus-2309.o \

			rc-purpletv.o \

			rc-pv951.o \

			rc-rc5-hauppauge-new.o \

			rc-hauppauge.o \

			rc-rc5-tv.o \

			rc-rc6-mce.o \

			rc-real-audio-220-32-keys.o \

drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c→drivers/media/rc/keymaps/rc-hauppauge.c

+9 −3
Original line number Diff line number Diff line 
/* rc5-hauppauge-new.h - Keytable for rc5_hauppauge_new Remote Controller

/* rc-hauppauge.c - Keytable for Hauppauge Remote Controllers

 *

 * keymap imported from ir-keymaps.c

 *

 * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>

 * This map currently contains the code for four different RCs:

 *	- New Hauppauge Gray;

 *	- Old Hauppauge Gray (with a golden screen for media keys);

 *	- Hauppauge Black;

 *	- DSR-0112 remote bundled with Haupauge MiniStick.

 *

 * Copyright (c) 2010-2011 by Mauro Carvalho Chehab <mchehab@redhat.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -214,7 +220,7 @@ static struct rc_map_list rc5_hauppauge_new_map = { 
		.scan    = rc5_hauppauge_new,

		.size    = ARRAY_SIZE(rc5_hauppauge_new),

		.rc_type = RC_TYPE_RC5,

		.name    = RC_MAP_RC5_HAUPPAUGE_NEW,

		.name    = RC_MAP_HAUPPAUGE,

	}

};

drivers/media/rc/mceusb.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static const struct mceusb_model mceusb_model[] = { 
		 * remotes, but we should have something handy,

		 * to allow testing it

		 */

		.rc_map = RC_MAP_RC5_HAUPPAUGE_NEW,

		.rc_map = RC_MAP_HAUPPAUGE,

		.name = "Conexant Hybrid TV (cx231xx) MCE IR",

	},

	[CX_HYBRID_TV] = {

drivers/media/video/cx23885/cx23885-input.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ int cx23885_input_init(struct cx23885_dev *dev) 
		driver_type = RC_DRIVER_IR_RAW;

		allowed_protos = RC_TYPE_ALL;

		/* The grey Hauppauge RC-5 remote */

		rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;

		rc_map = RC_MAP_HAUPPAUGE;

		break;

	case CX23885_BOARD_TEVII_S470:

		/* Integrated CX23885 IR controller */