diff options
| -rw-r--r-- | drivers/media/IR/ir-sysfs.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 8 | ||||
| -rw-r--r-- | include/media/ir-kbd-i2c.h | 2 | ||||
| -rw-r--r-- | include/media/rc-map.h | 9 |
4 files changed, 9 insertions, 16 deletions
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 002b14123319..d7da63e16c92 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c @@ -57,8 +57,6 @@ static ssize_t show_protocol(struct device *d, s = "Unknown"; else if (ir_type == IR_TYPE_RC5) s = "rc-5"; - else if (ir_type == IR_TYPE_PD) - s = "pulse-distance"; else if (ir_type == IR_TYPE_NEC) s = "nec"; else if (ir_type == IR_TYPE_RC6) @@ -100,8 +98,6 @@ static ssize_t store_protocol(struct device *d, while ((buf = strsep((char **) &data, " \n")) != NULL) { if (!strcasecmp(buf, "rc-5") || !strcasecmp(buf, "rc5")) ir_type |= IR_TYPE_RC5; - if (!strcasecmp(buf, "pd") || !strcasecmp(buf, "pulse-distance")) - ir_type |= IR_TYPE_PD; if (!strcasecmp(buf, "nec")) ir_type |= IR_TYPE_NEC; if (!strcasecmp(buf, "jvc")) @@ -146,8 +142,6 @@ static ssize_t show_supported_protocols(struct device *d, buf += sprintf(buf, "unknown "); if (ir_dev->props->allowed_protos & IR_TYPE_RC5) buf += sprintf(buf, "rc-5 "); - if (ir_dev->props->allowed_protos & IR_TYPE_PD) - buf += sprintf(buf, "pulse-distance "); if (ir_dev->props->allowed_protos & IR_TYPE_NEC) buf += sprintf(buf, "nec "); if (buf == orgbuf) diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 76733349c6cc..e185289e446c 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c @@ -272,7 +272,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) break; case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: ir_codes = RC_MAP_CINERGY_1400; - ir_type = IR_TYPE_PD; + ir_type = IR_TYPE_NEC; ir->sampling = 0xeb04; /* address */ break; case CX88_BOARD_HAUPPAUGE: @@ -375,18 +375,18 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) case CX88_BOARD_PROF_7301: case CX88_BOARD_PROF_6200: ir_codes = RC_MAP_TBS_NEC; - ir_type = IR_TYPE_PD; + ir_type = IR_TYPE_NEC; ir->sampling = 0xff00; /* address */ break; case CX88_BOARD_TEVII_S460: case CX88_BOARD_TEVII_S420: ir_codes = RC_MAP_TEVII_NEC; - ir_type = IR_TYPE_PD; + ir_type = IR_TYPE_NEC; ir->sampling = 0xff00; /* address */ break; case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: ir_codes = RC_MAP_DNTV_LIVE_DVBT_PRO; - ir_type = IR_TYPE_PD; + ir_type = IR_TYPE_NEC; ir->sampling = 0xff00; /* address */ break; case CX88_BOARD_NORWOOD_MICRO: 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 { |