Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192918
b: refs/heads/master
c: 9ce50c1
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed May 19, 2010
1 parent fe5bed8 commit 4b36d9a
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 77b7422d48cda9b8e5dabb7f4bc056861c5ed4fe
refs/heads/master: 9ce50c1a5faad80cf6100ea4e8970416ee3b8b59
2 changes: 1 addition & 1 deletion trunk/drivers/media/IR/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ir-common-objs := ir-functions.o ir-keymaps.o
ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o
ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o

obj-$(CONFIG_IR_CORE) += ir-core.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o
Expand Down
75 changes: 75 additions & 0 deletions trunk/drivers/media/IR/rc-map.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/* ir-raw-event.c - handle IR Pulse/Space event
*
* 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 version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

#include <media/ir-core.h>
#include <linux/spinlock.h>

/* Used to handle IR raw handler extensions */
static LIST_HEAD(rc_map_list);
static spinlock_t rc_map_lock;


static struct rc_keymap *seek_rc_map(const char *name)
{
struct rc_keymap *map = NULL;

spin_lock(&rc_map_lock);
list_for_each_entry(map, &rc_map_list, list) {
if (!strcmp(name, map->map.name))
break;
}
spin_unlock(&rc_map_lock);

return map;
}

struct ir_scancode_table *get_rc_map(const char *name)
{
int rc = 0;

struct rc_keymap *map;

map = seek_rc_map(name);
#ifdef MODULE
if (!map) {
rc = request_module("name");
if (rc < 0)
return NULL;

map = seek_rc_map(name);
}
#endif
if (!map)
return NULL;

return &map->map;
}
EXPORT_SYMBOL_GPL(get_rc_map);

int ir_register_map(struct rc_keymap *map)
{
spin_lock(&rc_map_lock);
list_add_tail(&map->list, &rc_map_list);
spin_unlock(&rc_map_lock);
return 0;
}
EXPORT_SYMBOL_GPL(ir_raw_handler_register);

void ir_unregister_map(struct rc_keymap *map)
{
spin_lock(&rc_map_lock);
list_del(&map->list);
spin_unlock(&rc_map_lock);
}
EXPORT_SYMBOL_GPL(ir_raw_handler_unregister);
11 changes: 11 additions & 0 deletions trunk/include/media/ir-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ struct ir_scancode_table {
spinlock_t lock;
};

struct rc_keymap {
struct list_head list;
struct ir_scancode_table map;
};

struct ir_dev_props {
unsigned long allowed_protos;
void *priv;
Expand Down Expand Up @@ -126,6 +131,12 @@ int ir_input_register(struct input_dev *dev,
const char *driver_name);
void ir_input_unregister(struct input_dev *input_dev);

/* Routines from rc-map.c */

int ir_register_map(struct rc_keymap *map);
void ir_unregister_map(struct rc_keymap *map);
struct ir_scancode_table *get_rc_map(const char *name);

/* Routines from ir-sysfs.c */

int ir_register_class(struct input_dev *input_dev);
Expand Down

0 comments on commit 4b36d9a

Please sign in to comment.