Commit b378f43f authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: IR: Allow not to compile keymaps in 



Currently, ir device registration fails if keymap requested by driver is not found.
Fix that by always compiling in the empty keymap, and using it as a failback.

Signed-off-by: default avatarMaxim Levitsky <maximlevitsky@gmail.com>
Acked-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 86ff071c

drivers/media/IR/ir-core-priv.h

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler); 
void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);

void ir_raw_init(void);





int ir_rcmap_init(void);

void ir_rcmap_cleanup(void);

/*

 * Decoder initialization code

 *

drivers/media/IR/ir-sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static int __init ir_core_init(void) 


	/* Initialize/load the decoders/keymap code that will be used */

	ir_raw_init();

	ir_rcmap_init();



	return 0;

}
@@ -332,6 +333,7 @@ static int __init ir_core_init(void) 
static void __exit ir_core_exit(void)

{

	class_unregister(&ir_input_class);

	ir_rcmap_cleanup();

}



module_init(ir_core_init);

drivers/media/IR/keymaps/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ 
			rc-dm1105-nec.o \

			rc-dntv-live-dvb-t.o \

			rc-dntv-live-dvbt-pro.o \

			rc-empty.o \

			rc-em-terratec.o \

			rc-encore-enltv2.o \

			rc-encore-enltv.o \

drivers/media/IR/keymaps/rc-empty.c

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/* empty.h - Keytable for empty Remote Controller

 *

 * keymap imported from ir-keymaps.c

 *

 * Copyright (c) 2010 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

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <media/rc-map.h>



/* empty keytable, can be used as placeholder for not-yet created keytables */



static struct ir_scancode empty[] = {

	{ 0x2a, KEY_COFFEE },

};



static struct rc_keymap empty_map = {

	.map = {

		.scan    = empty,

		.size    = ARRAY_SIZE(empty),

		.ir_type = IR_TYPE_UNKNOWN,	/* Legacy IR type */

		.name    = RC_MAP_EMPTY,

	}

};



static int __init init_rc_map_empty(void)

{

	return ir_register_map(&empty_map);

}



static void __exit exit_rc_map_empty(void)

{

	ir_unregister_map(&empty_map);

}



module_init(init_rc_map_empty)

module_exit(exit_rc_map_empty)



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");

drivers/media/IR/rc-map.c

+23 −0
Original line number Diff line number Diff line
@@ -82,3 +82,26 @@ void ir_unregister_map(struct rc_keymap *map) 
}

EXPORT_SYMBOL_GPL(ir_unregister_map);





static struct ir_scancode empty[] = {

	{ 0x2a, KEY_COFFEE },

};



static struct rc_keymap empty_map = {

	.map = {

		.scan    = empty,

		.size    = ARRAY_SIZE(empty),

		.ir_type = IR_TYPE_UNKNOWN,	/* Legacy IR type */

		.name    = RC_MAP_EMPTY,

	}

};



int ir_rcmap_init(void)

{

	return ir_register_map(&empty_map);

}



void ir_rcmap_cleanup(void)

{

	ir_unregister_map(&empty_map);

}