redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[media] rc: rename the remaining things to rc_core

Browse source 
The Remote Controller subsystem is meant to be used not only by Infra Red
but also for similar types of Remote Controllers. The core is not specific
to Infra Red. As such, rename:
	- ir-core.h to rc-core.h
	- IR_CORE to RC_CORE
	- namespace inside rc-core.c/rc-core.h

To be consistent with the other changes.

No functional change on this patch.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-11-17 13:28:38 -03:00
parent a6e3b81f61
commit 6bda96447c
51 changed files with 78 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/dvb/dm1105/Kconfig
View file

@ -8,7 +8,7 @@ config DVB_DM1105
select DVB_CX24116 if !DVB_FE_CUSTOMISE
select DVB_SI21XX if !DVB_FE_CUSTOMISE
select DVB_DS3000 if !DVB_FE_CUSTOMISE
depends on IR_CORE
depends on RC_CORE
help
Support for cards based on the SDMC DM1105 PCI chip like
DvbWorld 2002

2
drivers/media/dvb/dm1105/dm1105.c
View file

@ -27,7 +27,7 @@
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "demux.h"
#include "dmxdev.h"

2
drivers/media/dvb/dvb-usb/Kconfig
View file

@ -1,6 +1,6 @@
config DVB_USB
tristate "Support for various USB DVB devices"
depends on DVB_CORE && USB && I2C && IR_CORE
depends on DVB_CORE && USB && I2C && RC_CORE
help
By enabling this you will be able to choose the various supported
USB1.1 and USB2.0 DVB devices.

2
drivers/media/dvb/dvb-usb/dvb-usb.h
View file

@ -14,7 +14,7 @@
#include <linux/usb.h>
#include <linux/firmware.h>
#include <linux/mutex.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "dvb_frontend.h"
#include "dvb_demux.h"

2
drivers/media/dvb/dvb-usb/lmedm04.c
View file

@ -61,7 +61,7 @@
#define DVB_USB_LOG_PREFIX "LME2510(C)"
#include <linux/usb.h>
#include <linux/usb/input.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "dvb-usb.h"
#include "lmedm04.h"

2
drivers/media/dvb/mantis/Kconfig
View file

@ -1,6 +1,6 @@
config MANTIS_CORE
tristate "Mantis/Hopper PCI bridge based devices"
depends on PCI && I2C && INPUT && IR_CORE
depends on PCI && I2C && INPUT && RC_CORE
help
Support for PCI cards based on the Mantis and Hopper PCi bridge.

2
drivers/media/dvb/mantis/mantis_input.c
View file

@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <linux/pci.h>
#include "dmxdev.h"

2
drivers/media/dvb/siano/Kconfig
View file

@ -4,7 +4,7 @@
config SMS_SIANO_MDTV
tristate "Siano SMS1xxx based MDTV receiver"
depends on DVB_CORE && IR_CORE && HAS_DMA
depends on DVB_CORE && RC_CORE && HAS_DMA
---help---
Choose Y or M here if you have MDTV receiver with a Siano chipset.

2
drivers/media/dvb/siano/smsir.h
View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define __SMS_IR_H__
#include <linux/input.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#define IR_DEFAULT_TIMEOUT 100

2
drivers/media/dvb/ttpci/Kconfig
View file

@ -97,7 +97,7 @@ config DVB_BUDGET_CI
select DVB_LNBP21 if !DVB_FE_CUSTOMISE
select DVB_TDA10023 if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
depends on IR_CORE
depends on RC_CORE
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard

2
drivers/media/dvb/ttpci/budget-ci.c
View file

@ -34,7 +34,7 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "budget.h"

35
drivers/media/rc/Kconfig
View file

@ -1,16 +1,17 @@
menuconfig IR_CORE
tristate "Infrared remote controller adapters"
menuconfig RC_CORE
tristate "Remote Controller adapters"
depends on INPUT
default INPUT
---help---
Enable support for Remote Controllers on Linux. This is
needed in order to support several video capture adapters.
Currently, all supported devices use InfraRed.
Enable this option if you have a video capture board even
if you don't need IR, as otherwise, you may not be able to
compile the driver for your adapter.
if IR_CORE
if RC_CORE
config LIRC
tristate
@ -27,7 +28,7 @@ source "drivers/media/rc/keymaps/Kconfig"
config IR_NEC_DECODER
tristate "Enable IR raw decoder for the NEC protocol"
depends on IR_CORE
depends on RC_CORE
select BITREVERSE
default y
@ -37,7 +38,7 @@ config IR_NEC_DECODER
config IR_RC5_DECODER
tristate "Enable IR raw decoder for the RC-5 protocol"
depends on IR_CORE
depends on RC_CORE
select BITREVERSE
default y
@ -47,7 +48,7 @@ config IR_RC5_DECODER
config IR_RC6_DECODER
tristate "Enable IR raw decoder for the RC6 protocol"
depends on IR_CORE
depends on RC_CORE
select BITREVERSE
default y
@ -57,7 +58,7 @@ config IR_RC6_DECODER
config IR_JVC_DECODER
tristate "Enable IR raw decoder for the JVC protocol"
depends on IR_CORE
depends on RC_CORE
select BITREVERSE
default y
@ -67,7 +68,7 @@ config IR_JVC_DECODER
config IR_SONY_DECODER
tristate "Enable IR raw decoder for the Sony protocol"
depends on IR_CORE
depends on RC_CORE
default y
---help---
@ -76,7 +77,7 @@ config IR_SONY_DECODER
config IR_RC5_SZ_DECODER
tristate "Enable IR raw decoder for the RC-5 (streamzap) protocol"
depends on IR_CORE
depends on RC_CORE
select BITREVERSE
default y
@ -88,7 +89,7 @@ config IR_RC5_SZ_DECODER
config IR_LIRC_CODEC
tristate "Enable IR to LIRC bridge"
depends on IR_CORE
depends on RC_CORE
depends on LIRC
default y
@ -99,7 +100,7 @@ config IR_LIRC_CODEC
config IR_ENE
tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"
depends on PNP
depends on IR_CORE
depends on RC_CORE
---help---
Say Y here to enable support for integrated infrared receiver
/transceiver made by ENE.
@ -113,7 +114,7 @@ config IR_ENE
config IR_IMON
tristate "SoundGraph iMON Receiver and Display"
depends on USB_ARCH_HAS_HCD
depends on IR_CORE
depends on RC_CORE
select USB
---help---
Say Y here if you want to use a SoundGraph iMON (aka Antec Veris)
@ -125,7 +126,7 @@ config IR_IMON
config IR_MCEUSB
tristate "Windows Media Center Ed. eHome Infrared Transceiver"
depends on USB_ARCH_HAS_HCD
depends on IR_CORE
depends on RC_CORE
select USB
---help---
Say Y here if you want to use a Windows Media Center Edition
@ -137,7 +138,7 @@ config IR_MCEUSB
config IR_NUVOTON
tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"
depends on PNP
depends on IR_CORE
depends on RC_CORE
---help---
Say Y here to enable support for integrated infrared receiver
/transciever made by Nuvoton (formerly Winbond). This chip is
@ -150,7 +151,7 @@ config IR_NUVOTON
config IR_STREAMZAP
tristate "Streamzap PC Remote IR Receiver"
depends on USB_ARCH_HAS_HCD
depends on IR_CORE
depends on RC_CORE
select USB
---help---
Say Y here if you want to use a Streamzap PC Remote
@ -162,7 +163,7 @@ config IR_STREAMZAP
config IR_WINBOND_CIR
tristate "Winbond IR remote control"
depends on X86 && PNP
depends on IR_CORE
depends on RC_CORE
select NEW_LEDS
select LEDS_CLASS
select LEDS_TRIGGERS
@ -176,4 +177,4 @@ config IR_WINBOND_CIR
To compile this driver as a module, choose M here: the module will
be called winbond_cir.
endif #IR_CORE
endif #RC_CORE

2
drivers/media/rc/Makefile
View file

@ -2,7 +2,7 @@ rc-core-objs := rc-main.o rc-raw.o
obj-y += keymaps/
obj-$(CONFIG_IR_CORE) += rc-core.o
obj-$(CONFIG_RC_CORE) += rc-core.o
obj-$(CONFIG_LIRC) += lirc_dev.o
obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o

2
drivers/media/rc/ene_ir.c
View file

@ -37,7 +37,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "ene_ir.h"
static int sample_period;

2
drivers/media/rc/imon.c
View file

@ -38,7 +38,7 @@
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <linux/time.h>
#include <linux/timer.h>

2
drivers/media/rc/ir-lirc-codec.c
View file

@ -16,7 +16,7 @@
#include <linux/wait.h>
#include <media/lirc.h>
#include <media/lirc_dev.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "rc-core-priv.h"
#define LIRCBUF_SIZE 256

2
drivers/media/rc/keymaps/Kconfig
View file

@ -1,6 +1,6 @@
config RC_MAP
tristate "Compile Remote Controller keymap modules"
depends on IR_CORE
depends on RC_CORE
default y
---help---

2
drivers/media/rc/keymaps/rc-lirc.c
View file

@ -9,7 +9,7 @@
* (at your option) any later version.
*/
#include <media/ir-core.h>
#include <media/rc-core.h>
static struct ir_scancode lirc[] = {
{ },

2
drivers/media/rc/mceusb.c
View file

@ -37,7 +37,7 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#define DRIVER_VERSION "1.91"
#define DRIVER_AUTHOR "Jarod Wilson <jarod@wilsonet.com>"

2
drivers/media/rc/nuvoton-cir.c
View file

@ -32,7 +32,7 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <linux/pci_ids.h>
#include "nuvoton-cir.h"

2
drivers/media/rc/rc-core-priv.h
View file

@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
struct ir_raw_handler {
struct list_head list;

18
drivers/media/rc/rc-main.c
View file

@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/input.h>
@ -1103,11 +1103,11 @@ EXPORT_SYMBOL_GPL(rc_unregister_device);
* Init/exit code for the module. Basically, creates/removes /sys/class/rc
*/
static int __init ir_core_init(void)
static int __init rc_core_init(void)
{
int rc = class_register(&ir_input_class);
if (rc) {
printk(KERN_ERR "ir_core: unable to register rc class\n");
printk(KERN_ERR "rc_core: unable to register rc class\n");
return rc;
}
@ -1118,18 +1118,18 @@ static int __init ir_core_init(void)
return 0;
}
static void __exit ir_core_exit(void)
static void __exit rc_core_exit(void)
{
class_unregister(&ir_input_class);
ir_unregister_map(&empty_map);
}
module_init(ir_core_init);
module_exit(ir_core_exit);
module_init(rc_core_init);
module_exit(rc_core_exit);
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);
int rc_core_debug; /* ir_debug level (0,1,2) */
EXPORT_SYMBOL_GPL(rc_core_debug);
module_param_named(debug, rc_core_debug, int, 0644);
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
MODULE_LICENSE("GPL");

2
drivers/media/rc/rc-raw.c
View file

@ -357,7 +357,7 @@ static void init_decoders(struct work_struct *work)
load_lirc_codec();
/* If needed, we may later add some init code. In this case,
it is needed to change the CONFIG_MODULE test at ir-core.h
it is needed to change the CONFIG_MODULE test at rc-core.h
*/
}
#endif

2
drivers/media/rc/streamzap.c
View file

@ -36,7 +36,7 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#define DRIVER_VERSION "1.61"
#define DRIVER_NAME "streamzap"

2
drivers/media/rc/winbond-cir.c
View file

@ -50,7 +50,7 @@
#include <linux/io.h>
#include <linux/bitrev.h>
#include <linux/slab.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#define DRVNAME "winbond-cir"

2
drivers/media/video/Kconfig
View file

@ -96,7 +96,7 @@ config VIDEO_HELPER_CHIPS_AUTO
config VIDEO_IR_I2C
tristate "I2C module for IR" if !VIDEO_HELPER_CHIPS_AUTO
depends on I2C && IR_CORE
depends on I2C && RC_CORE
default y
---help---
Most boards have an IR chip directly connected via GPIO. However,

2
drivers/media/video/bt8xx/Kconfig
View file

@ -4,7 +4,7 @@ config VIDEO_BT848
select I2C_ALGOBIT
select VIDEO_BTCX
select VIDEOBUF_DMA_SG
depends on IR_CORE
depends on RC_CORE
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO

2
drivers/media/video/bt8xx/bttvp.h
View file

@ -41,7 +41,7 @@
#include <linux/device.h>
#include <media/videobuf-dma-sg.h>
#include <media/tveeprom.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <media/ir-kbd-i2c.h>
#include "bt848.h"

2
drivers/media/video/cx18/Kconfig
View file

@ -2,7 +2,7 @@ config VIDEO_CX18
tristate "Conexant cx23418 MPEG encoder support"
depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
select I2C_ALGOBIT
depends on IR_CORE
depends on RC_CORE
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_CX2341X

4
drivers/media/video/cx231xx/Kconfig
View file

@ -3,7 +3,7 @@ config VIDEO_CX231XX
depends on VIDEO_DEV && I2C
select VIDEO_TUNER
select VIDEO_TVEEPROM
depends on IR_CORE
depends on RC_CORE
select VIDEOBUF_VMALLOC
select VIDEO_CX25840
select VIDEO_CX2341X
@ -16,7 +16,7 @@ config VIDEO_CX231XX
config VIDEO_CX231XX_RC
bool "Conexant cx231xx Remote Controller additional support"
depends on IR_CORE
depends on RC_CORE
depends on VIDEO_CX231XX
default y
---help---

2
drivers/media/video/cx231xx/cx231xx.h
View file

@ -34,7 +34,7 @@
#include <media/videobuf-vmalloc.h>
#include <media/v4l2-device.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <media/ir-kbd-i2c.h>
#include <media/videobuf-dvb.h>

2
drivers/media/video/cx23885/Kconfig
View file

@ -5,7 +5,7 @@ config VIDEO_CX23885
select VIDEO_BTCX
select VIDEO_TUNER
select VIDEO_TVEEPROM
depends on IR_CORE
depends on RC_CORE
select VIDEOBUF_DVB
select VIDEOBUF_DMA_SG
select VIDEO_CX25840

2
drivers/media/video/cx23885/cx23885-input.c
View file

@ -36,7 +36,7 @@
*/
#include <linux/slab.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <media/v4l2-subdev.h>
#include "cx23885.h"

2
drivers/media/video/cx23885/cx23885.h
View file

@ -30,7 +30,7 @@
#include <media/tveeprom.h>
#include <media/videobuf-dma-sg.h>
#include <media/videobuf-dvb.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "btcx-risc.h"
#include "cx23885-reg.h"

2
drivers/media/video/cx23885/cx23888-ir.c
View file

@ -26,7 +26,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-chip-ident.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "cx23885.h"

2
drivers/media/video/cx25840/cx25840-ir.c
View file

@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <linux/kfifo.h>
#include <media/cx25840.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "cx25840-core.h"

2
drivers/media/video/cx88/Kconfig
View file

@ -1,6 +1,6 @@
config VIDEO_CX88
tristate "Conexant 2388x (bt878 successor) support"
depends on VIDEO_DEV && PCI && I2C && IR_CORE
depends on VIDEO_DEV && PCI && I2C && RC_CORE
select I2C_ALGOBIT
select VIDEO_BTCX
select VIDEOBUF_DMA_SG

2
drivers/media/video/cx88/cx88-input.c
View file

@ -29,7 +29,7 @@
#include <linux/module.h>
#include "cx88.h"
#include <media/ir-core.h>
#include <media/rc-core.h>
#define MODULE_NAME "cx88xx"

2
drivers/media/video/em28xx/Kconfig
View file

@ -3,7 +3,7 @@ config VIDEO_EM28XX
depends on VIDEO_DEV && I2C
select VIDEO_TUNER
select VIDEO_TVEEPROM
depends on IR_CORE
depends on RC_CORE
select VIDEOBUF_VMALLOC
select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO

2
drivers/media/video/em28xx/em28xx.h
View file

@ -33,7 +33,7 @@
#include <media/videobuf-vmalloc.h>
#include <media/v4l2-device.h>
#include <media/ir-kbd-i2c.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
#include <media/videobuf-dvb.h>
#endif

2
drivers/media/video/ir-kbd-i2c.c
View file

@ -46,7 +46,7 @@
#include <linux/i2c.h>
#include <linux/workqueue.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <media/ir-kbd-i2c.h>
/* ----------------------------------------------------------------------- */

2
drivers/media/video/ivtv/Kconfig
View file

@ -2,7 +2,7 @@ config VIDEO_IVTV
tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
depends on VIDEO_V4L2 && PCI && I2C
select I2C_ALGOBIT
depends on IR_CORE
depends on RC_CORE
select VIDEO_TUNER
select VIDEO_TVEEPROM
select VIDEO_CX2341X

2
drivers/media/video/saa7134/Kconfig
View file

@ -26,7 +26,7 @@ config VIDEO_SAA7134_ALSA
config VIDEO_SAA7134_RC
bool "Philips SAA7134 Remote Controller support"
depends on IR_CORE
depends on RC_CORE
depends on VIDEO_SAA7134
default y
---help---

2
drivers/media/video/saa7134/saa7134.h
View file

@ -37,7 +37,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
#include <media/tuner.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include <media/ir-kbd-i2c.h>
#include <media/videobuf-dma-sg.h>
#include <sound/core.h>

2
drivers/media/video/tlg2300/Kconfig
View file

@ -3,7 +3,7 @@ config VIDEO_TLG2300
depends on VIDEO_DEV && I2C && SND && DVB_CORE
select VIDEO_TUNER
select VIDEO_TVEEPROM
depends on IR_CORE
depends on RC_CORE
select VIDEOBUF_VMALLOC
select SND_PCM
select VIDEOBUF_DVB

2
drivers/staging/cx25821/Kconfig
View file

@ -5,7 +5,7 @@ config VIDEO_CX25821
select I2C_ALGOBIT
select VIDEO_BTCX
select VIDEO_TVEEPROM
depends on IR_CORE
depends on RC_CORE
select VIDEOBUF_DVB
select VIDEOBUF_DMA_SG
select VIDEO_CX25840

2
drivers/staging/go7007/Kconfig
View file

@ -4,7 +4,7 @@ config VIDEO_GO7007
depends on BKL # please fix
depends on SND
select VIDEOBUF_DMA_SG
depends on IR_CORE
depends on RC_CORE
select VIDEO_TUNER
select VIDEO_TVEEPROM
select SND_PCM

2
drivers/staging/tm6000/Kconfig
View file

@ -1,6 +1,6 @@
config VIDEO_TM6000
tristate "TV Master TM5600/6000/6010 driver"
depends on VIDEO_DEV && I2C && INPUT && IR_CORE && USB && EXPERIMENTAL
depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB && EXPERIMENTAL
select VIDEO_TUNER
select MEDIA_TUNER_XC2028
select MEDIA_TUNER_XC5000

2
drivers/staging/tm6000/tm6000-input.c
View file

@ -24,7 +24,7 @@
#include <linux/input.h>
#include <linux/usb.h>
#include <media/ir-core.h>
#include <media/rc-core.h>
#include "tm6000.h"
#include "tm6000-regs.h"

2
include/media/ir-kbd-i2c.h
View file

@ -1,7 +1,7 @@
#ifndef _IR_I2C
#define _IR_I2C
#include <media/ir-core.h>
#include <media/rc-core.h>
#define DEFAULT_POLLING_INTERVAL 100 /* ms */

4
include/media/ir-core.h → include/media/rc-core.h
View file

@ -22,8 +22,8 @@
#include <linux/timer.h>
#include <media/rc-map.h>
extern int ir_core_debug;
#define IR_dprintk(level, fmt, arg...) if (ir_core_debug >= level) \
extern int rc_core_debug;
#define IR_dprintk(level, fmt, arg...) if (rc_core_debug >= level) \
printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
enum rc_driver_type {