summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2010-04-24 18:14:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:58:25 -0300
commit5a143b12ebbd37154cb06699a757e9c5845c5e19 (patch)
tree349830c62baf1feca7c419f801a2576b89e25736 /include/media
parent6718e8ad950f73fc895b98a413a63cb2add3b4d2 (diff)
downloadlinux-stable-5a143b12ebbd37154cb06699a757e9c5845c5e19.tar.gz
linux-stable-5a143b12ebbd37154cb06699a757e9c5845c5e19.tar.bz2
linux-stable-5a143b12ebbd37154cb06699a757e9c5845c5e19.zip
V4L/DVB: ir-core: remove IR_TYPE_PD
Pulse-distance is not a protocol, it is a line coding (used by some protocols, like NEC). Looking at the uses of IR_TYPE_PD, the real protocol seems to be NEC in all cases (drivers/media/video/cx88/cx88-input.c is the only user). So, remove IR_TYPE_PD while it is still easy to do so. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/ir-kbd-i2c.h2
-rw-r--r--include/media/rc-map.h9
2 files changed, 5 insertions, 6 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 057ff64f349d..0506e45c9a4f 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -36,7 +36,7 @@ enum ir_kbd_get_key_fn {
struct IR_i2c_init_data {
char *ir_codes;
const char *name;
- u64 type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */
+ u64 type; /* IR_TYPE_RC5, etc */
/*
* Specify either a function pointer or a value indicating one of
* ir_kbd_i2c's internal get_key functions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 280d1ed9a9a0..5833966a7100 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -13,11 +13,10 @@
#define IR_TYPE_UNKNOWN 0
#define IR_TYPE_RC5 (1 << 0) /* Philips RC5 protocol */
-#define IR_TYPE_PD (1 << 1) /* Pulse distance encoded IR */
-#define IR_TYPE_NEC (1 << 2)
-#define IR_TYPE_RC6 (1 << 3) /* Philips RC6 protocol */
-#define IR_TYPE_JVC (1 << 4) /* JVC protocol */
-#define IR_TYPE_SONY (1 << 5) /* Sony12/15/20 protocol */
+#define IR_TYPE_NEC (1 << 1)
+#define IR_TYPE_RC6 (1 << 2) /* Philips RC6 protocol */
+#define IR_TYPE_JVC (1 << 3) /* JVC protocol */
+#define IR_TYPE_SONY (1 << 4) /* Sony12/15/20 protocol */
#define IR_TYPE_OTHER (1u << 31)
struct ir_scancode {