From f62de675f796a992011c598c405a3d6fada9aa20 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 9 Nov 2010 23:09:57 -0300 Subject: [PATCH] [media] Rename rc-core files from ir- to rc- As protocol decoders are specific to InfraRed, keep their names as-is. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/rc/Makefile | 4 ++-- drivers/media/rc/ir-functions.c | 2 +- drivers/media/rc/ir-jvc-decoder.c | 2 +- drivers/media/rc/ir-lirc-codec.c | 2 +- drivers/media/rc/ir-nec-decoder.c | 2 +- drivers/media/rc/ir-rc5-decoder.c | 2 +- drivers/media/rc/ir-rc5-sz-decoder.c | 2 +- drivers/media/rc/ir-rc6-decoder.c | 2 +- drivers/media/rc/ir-sony-decoder.c | 2 +- drivers/media/rc/{ir-core-priv.h => rc-core-priv.h} | 0 drivers/media/rc/{ir-keytable.c => rc-main.c} | 2 +- drivers/media/rc/{ir-raw-event.c => rc-raw.c} | 2 +- drivers/media/rc/{ir-sysfs.c => rc-sysfs.c} | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename drivers/media/rc/{ir-core-priv.h => rc-core-priv.h} (100%) rename drivers/media/rc/{ir-keytable.c => rc-main.c} (99%) rename drivers/media/rc/{ir-raw-event.c => rc-raw.c} (99%) rename drivers/media/rc/{ir-sysfs.c => rc-sysfs.c} (99%) diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile index 38873cff3429..479a8f4c3a9e 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile @@ -1,9 +1,9 @@ ir-common-objs := ir-functions.o -ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o +rc-core-objs := rc-main.o rc-sysfs.o rc-raw.o rc-map.o obj-y += keymaps/ -obj-$(CONFIG_IR_CORE) += ir-core.o +obj-$(CONFIG_IR_CORE) += rc-core.o obj-$(CONFIG_IR_LEGACY) += ir-common.o obj-$(CONFIG_LIRC) += lirc_dev.o obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o diff --git a/drivers/media/rc/ir-functions.c b/drivers/media/rc/ir-functions.c index ec021c92527a..14397d0541d8 100644 --- a/drivers/media/rc/ir-functions.c +++ b/drivers/media/rc/ir-functions.c @@ -24,7 +24,7 @@ #include #include #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" /* -------------------------------------------------------------------------- */ diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c index 63dca6e5458b..d83a5f64bfe4 100644 --- a/drivers/media/rc/ir-jvc-decoder.c +++ b/drivers/media/rc/ir-jvc-decoder.c @@ -13,7 +13,7 @@ */ #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define JVC_NBITS 16 /* dev(8) + func(8) */ #define JVC_UNIT 525000 /* ns */ diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c index 9fc0db9d344d..9345995dbf14 100644 --- a/drivers/media/rc/ir-lirc-codec.c +++ b/drivers/media/rc/ir-lirc-codec.c @@ -17,7 +17,7 @@ #include #include #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define LIRCBUF_SIZE 256 diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c index 70993f79c8a2..cad4e994aa78 100644 --- a/drivers/media/rc/ir-nec-decoder.c +++ b/drivers/media/rc/ir-nec-decoder.c @@ -13,7 +13,7 @@ */ #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define NEC_NBITS 32 #define NEC_UNIT 562500 /* ns */ diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c index 572ed4ca8c68..c07f6e0bb962 100644 --- a/drivers/media/rc/ir-rc5-decoder.c +++ b/drivers/media/rc/ir-rc5-decoder.c @@ -20,7 +20,7 @@ * the first two bits are start bits, and a third one is a filing bit */ -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define RC5_NBITS 14 #define RC5X_NBITS 20 diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c index 7c413501a3f7..0c3b6eb4ccd6 100644 --- a/drivers/media/rc/ir-rc5-sz-decoder.c +++ b/drivers/media/rc/ir-rc5-sz-decoder.c @@ -20,7 +20,7 @@ * the first two bits are start bits, and a third one is a filing bit */ -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define RC5_SZ_NBITS 15 #define RC5_UNIT 888888 /* ns */ diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c index d25da91f44ff..48e82be5e01e 100644 --- a/drivers/media/rc/ir-rc6-decoder.c +++ b/drivers/media/rc/ir-rc6-decoder.c @@ -12,7 +12,7 @@ * GNU General Public License for more details. */ -#include "ir-core-priv.h" +#include "rc-core-priv.h" /* * This decoder currently supports: diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c index 2d15730822bc..0a5cadbf9bfb 100644 --- a/drivers/media/rc/ir-sony-decoder.c +++ b/drivers/media/rc/ir-sony-decoder.c @@ -13,7 +13,7 @@ */ #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define SONY_UNIT 600000 /* ns */ #define SONY_HEADER_PULSE (4 * SONY_UNIT) diff --git a/drivers/media/rc/ir-core-priv.h b/drivers/media/rc/rc-core-priv.h similarity index 100% rename from drivers/media/rc/ir-core-priv.h rename to drivers/media/rc/rc-core-priv.h diff --git a/drivers/media/rc/ir-keytable.c b/drivers/media/rc/rc-main.c similarity index 99% rename from drivers/media/rc/ir-keytable.c rename to drivers/media/rc/rc-main.c index 8039110350d3..d6de2e25315e 100644 --- a/drivers/media/rc/ir-keytable.c +++ b/drivers/media/rc/rc-main.c @@ -15,7 +15,7 @@ #include #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" /* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */ #define IR_TAB_MIN_SIZE 256 diff --git a/drivers/media/rc/ir-raw-event.c b/drivers/media/rc/rc-raw.c similarity index 99% rename from drivers/media/rc/ir-raw-event.c rename to drivers/media/rc/rc-raw.c index a06a07e4e0b1..d6c556e3f0d8 100644 --- a/drivers/media/rc/ir-raw-event.c +++ b/drivers/media/rc/rc-raw.c @@ -16,7 +16,7 @@ #include #include #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" /* Define the max number of pulse/space transitions to buffer */ #define MAX_IR_EVENT_SIZE 512 diff --git a/drivers/media/rc/ir-sysfs.c b/drivers/media/rc/rc-sysfs.c similarity index 99% rename from drivers/media/rc/ir-sysfs.c rename to drivers/media/rc/rc-sysfs.c index 38423a8da871..a5f81d107ed4 100644 --- a/drivers/media/rc/ir-sysfs.c +++ b/drivers/media/rc/rc-sysfs.c @@ -15,7 +15,7 @@ #include #include #include -#include "ir-core-priv.h" +#include "rc-core-priv.h" #define IRRCV_NUM_DEVICES 256 -- 2.20.1