@@ -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
@@ -24,7 +24,7 @@
#include <linux/string.h>
#include <linux/jiffies.h>
#include <media/ir-common.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
/* -------------------------------------------------------------------------- */
@@ -13,7 +13,7 @@
*/
#include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
#define JVC_NBITS 16 /* dev(8) + func(8) */
#define JVC_UNIT 525000 /* ns */
@@ -17,7 +17,7 @@
#include <media/lirc.h>
#include <media/lirc_dev.h>
#include <media/ir-core.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
#define LIRCBUF_SIZE 256
@@ -13,7 +13,7 @@
*/
#include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
#define NEC_NBITS 32
#define NEC_UNIT 562500 /* ns */
@@ -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
@@ -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 */
@@ -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:
@@ -13,7 +13,7 @@
*/
#include <linux/bitrev.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
#define SONY_UNIT 600000 /* ns */
#define SONY_HEADER_PULSE (4 * SONY_UNIT)
similarity index 100%
rename from drivers/media/rc/ir-core-priv.h
rename to drivers/media/rc/rc-core-priv.h
similarity index 99%
rename from drivers/media/rc/ir-keytable.c
rename to drivers/media/rc/rc-main.c
@@ -15,7 +15,7 @@
#include <linux/input.h>
#include <linux/slab.h>
-#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
similarity index 99%
rename from drivers/media/rc/ir-raw-event.c
rename to drivers/media/rc/rc-raw.c
@@ -16,7 +16,7 @@
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/freezer.h>
-#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
similarity index 99%
rename from drivers/media/rc/ir-sysfs.c
rename to drivers/media/rc/rc-sysfs.c
@@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/device.h>
-#include "ir-core-priv.h"
+#include "rc-core-priv.h"
#define IRRCV_NUM_DEVICES 256