OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (13613): IR: create ir-core module 

Split the ir-common into two separate modules:
	- ir-core: it is the IR-independent functions;
	- ir-common: has the common part used by V4L drivers.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2009-12-11 08:34:07 -03:00
parent e27d38112e
commit 446e4a64d2
6 changed files with 86 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/IR/Kconfig
View File

@ -1,4 +1,9 @@
config VIDEO_IR
config IR_CORE
tristate
depends on INPUT
default INPUT
config VIDEO_IR
tristate
depends on IR_CORE
default IR_CORE

4
drivers/media/IR/Makefile
View File

@ -1,3 +1,5 @@
ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o
ir-common-objs := ir-functions.o ir-keymaps.o
ir-core-objs := ir-keytable.o
obj-$(CONFIG_IR_CORE) += ir-core.o
obj-$(CONFIG_VIDEO_IR) += ir-common.o

3
drivers/media/IR/ir-functions.c
View File

@ -34,9 +34,6 @@ static int repeat = 1;
module_param(repeat, int, 0444);
MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)");
int media_ir_debug; /* media_ir_debug level (0,1,2) */
module_param_named(debug, media_ir_debug, int, 0644);
/* -------------------------------------------------------------------------- */
static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)

21
drivers/media/IR/ir-keytable.c
View File

@ -1,6 +1,15 @@
/* ir-register.c - handle IR scancode->keycode tables
*
* Copyright (C) 2009 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 <linux/usb/input.h>
@ -10,7 +19,6 @@
#define IR_TAB_MIN_SIZE 32
#define IR_TAB_MAX_SIZE 1024
/**
* ir_seek_table() - returns the element order on the table
* @rc_tab: the ir_scancode_table with the keymap to be used
@ -73,6 +81,7 @@ int ir_roundup_tablesize(int n_elems)
return n_elems;
}
EXPORT_SYMBOL_GPL(ir_roundup_tablesize);
/**
* ir_copy_table() - copies a keytable, discarding the unused entries
@ -101,6 +110,7 @@ int ir_copy_table(struct ir_scancode_table *destin,
return 0;
}
EXPORT_SYMBOL_GPL(ir_copy_table);
/**
* ir_getkeycode() - get a keycode at the evdev scancode ->keycode table
@ -137,7 +147,6 @@ static int ir_getkeycode(struct input_dev *dev,
return 0;
}
/**
* ir_is_resize_needed() - Check if the table needs rezise
* @table: keycode table that may need to resize
@ -379,6 +388,7 @@ u32 ir_g_keycode_from_table(struct input_dev *dev, u32 scancode)
/* Reports userspace that an unknown keycode were got */
return KEY_RESERVED;
}
EXPORT_SYMBOL_GPL(ir_g_keycode_from_table);
/**
* ir_set_keycode_table() - sets the IR keycode table and add the handlers
@ -415,6 +425,7 @@ int ir_set_keycode_table(struct input_dev *input_dev,
return 0;
}
EXPORT_SYMBOL_GPL(ir_set_keycode_table);
void ir_input_free(struct input_dev *dev)
{
@ -431,3 +442,9 @@ void ir_input_free(struct input_dev *dev)
}
EXPORT_SYMBOL_GPL(ir_input_free);
int ir_core_debug; /* ir_debug level (0,1,2) */
EXPORT_SYMBOL_GPL(ir_core_debug);
module_param_named(debug, ir_core_debug, int, 0644);
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
MODULE_LICENSE("GPL");

39
include/media/ir-common.h
View File

@ -26,31 +26,7 @@
#include <linux/input.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
extern int media_ir_debug; /* media_ir_debug level (0,1,2) */
#define IR_dprintk(level, fmt, arg...) if (media_ir_debug >= level) \
printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
enum ir_type {
IR_TYPE_UNKNOWN = 0,
IR_TYPE_RC5 = 1,
IR_TYPE_PD = 2, /* Pulse distance encoded IR */
IR_TYPE_NEC = 3,
IR_TYPE_OTHER = 99,
};
struct ir_scancode {
u16 scancode;
u32 keycode;
};
struct ir_scancode_table {
struct ir_scancode *scan;
int size;
enum ir_type ir_type;
spinlock_t lock;
};
#include <media/ir-core.h>
#define RC5_START(x) (((x)>>12)&3)
#define RC5_TOGGLE(x) (((x)>>11)&1)
@ -123,19 +99,6 @@ u32 ir_rc5_decode(unsigned int code);
void ir_rc5_timer_end(unsigned long data);
void ir_rc5_timer_keyup(unsigned long data);
/* Routines from ir-keytable.c */
u32 ir_g_keycode_from_table(struct input_dev *input_dev,
u32 scancode);
int ir_set_keycode_table(struct input_dev *input_dev,
struct ir_scancode_table *rc_tab);
int ir_roundup_tablesize(int n_elems);
int ir_copy_table(struct ir_scancode_table *destin,
const struct ir_scancode_table *origin);
void ir_input_free(struct input_dev *input_dev);
/* scancode->keycode map tables from ir-keymaps.c */
extern struct ir_scancode_table ir_codes_empty_table;

57
include/media/ir-core.h Normal file
View File

@ -0,0 +1,57 @@
/*
* Remote Controller core header
*
* 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.
*/
#ifndef _IR_CORE
#define _IR_CORE
#include <linux/input.h>
#include <linux/spinlock.h>
extern int ir_core_debug;
#define IR_dprintk(level, fmt, arg...) if (ir_core_debug >= level) \
printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
enum ir_type {
IR_TYPE_UNKNOWN = 0,
IR_TYPE_RC5 = 1,
IR_TYPE_PD = 2, /* Pulse distance encoded IR */
IR_TYPE_NEC = 3,
IR_TYPE_OTHER = 99,
};
struct ir_scancode {
u16 scancode;
u32 keycode;
};
struct ir_scancode_table {
struct ir_scancode *scan;
int size;
enum ir_type ir_type;
spinlock_t lock;
};
/* Routines from ir-keytable.c */
u32 ir_g_keycode_from_table(struct input_dev *input_dev,
u32 scancode);
int ir_set_keycode_table(struct input_dev *input_dev,
struct ir_scancode_table *rc_tab);
int ir_roundup_tablesize(int n_elems);
int ir_copy_table(struct ir_scancode_table *destin,
const struct ir_scancode_table *origin);
void ir_input_free(struct input_dev *input_dev);
#endif