Skip to content

L
linux
Commit 52b66144 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] rc: Rename remote controller type to rc_type instead of ir_type 

for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 29e3ec19
Expand all Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 249 deletions
drivers/media/dvb/dvb-usb/af9015.c
View file @ 52b66144
......@@ -1344,11 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.identify_state = af9015_identify_state,
.rc.core = {
.protocol = IR_TYPE_NEC,
.protocol = RC_TYPE_NEC,
.module_name = "af9015",
.rc_query = af9015_rc_query,
.rc_interval = AF9015_RC_INTERVAL,
.allowed_protos = IR_TYPE_NEC,
.allowed_protos = RC_TYPE_NEC,
},
.i2c_algo = &af9015_i2c_algo,
......@@ -1472,11 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.identify_state = af9015_identify_state,
.rc.core = {
.protocol = IR_TYPE_NEC,
.protocol = RC_TYPE_NEC,
.module_name = "af9015",
.rc_query = af9015_rc_query,
.rc_interval = AF9015_RC_INTERVAL,
.allowed_protos = IR_TYPE_NEC,
.allowed_protos = RC_TYPE_NEC,
},
.i2c_algo = &af9015_i2c_algo,
......@@ -1584,11 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.identify_state = af9015_identify_state,
.rc.core = {
.protocol = IR_TYPE_NEC,
.protocol = RC_TYPE_NEC,
.module_name = "af9015",
.rc_query = af9015_rc_query,
.rc_interval = AF9015_RC_INTERVAL,
.allowed_protos = IR_TYPE_NEC,
.allowed_protos = RC_TYPE_NEC,
},
.i2c_algo = &af9015_i2c_algo,
......
drivers/media/dvb/dvb-usb/anysee.c
View file @ 52b66144
......@@ -476,7 +476,7 @@ static struct dvb_usb_device_properties anysee_properties = {
.rc.core = {
.rc_codes = RC_MAP_ANYSEE,
.protocol = IR_TYPE_OTHER,
.protocol = RC_TYPE_OTHER,
.module_name = "anysee",
.rc_query = anysee_rc_query,
.rc_interval = 250, /* windows driver uses 500ms */
......
drivers/media/dvb/dvb-usb/dib0700.h
View file @ 52b66144
......@@ -60,7 +60,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
extern struct i2c_algorithm dib0700_i2c_algo;
extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
struct dvb_usb_device_description **desc, int *cold);
extern int dib0700_change_protocol(struct rc_dev *dev, u64 ir_type);
extern int dib0700_change_protocol(struct rc_dev *dev, u64 rc_type);
extern int dib0700_device_count;
extern int dvb_usb_dib0700_ir_proto;
......
drivers/media/dvb/dvb-usb/dib0700_core.c
View file @ 52b66144
......@@ -471,7 +471,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
return dib0700_ctrl_wr(adap->dev, b, 4);
}
int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
{
struct dvb_usb_device *d = rc->priv;
struct dib0700_state *st = d->priv;
......@@ -479,11 +479,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
int new_proto, ret;
/* Set the IR mode */
if (ir_type == IR_TYPE_RC5)
if (rc_type == RC_TYPE_RC5)
new_proto = 1;
else if (ir_type == IR_TYPE_NEC)
else if (rc_type == RC_TYPE_NEC)
new_proto = 0;
else if (ir_type == IR_TYPE_RC6) {
else if (rc_type == RC_TYPE_RC6) {
if (st->fw_version < 0x10200)
return -EINVAL;
......@@ -499,7 +499,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 ir_type)
return ret;
}
d->props.rc.core.protocol = ir_type;
d->props.rc.core.protocol = rc_type;
return ret;
}
......@@ -562,7 +562,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
purb->actual_length);
switch (d->props.rc.core.protocol) {
case IR_TYPE_NEC:
case RC_TYPE_NEC:
toggle = 0;
/* NEC protocol sends repeat code as 0 0 0 FF */
......
drivers/media/dvb/dvb-usb/dib0700_devices.c
View file @ 52b66144
......@@ -510,7 +510,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
d->last_event = 0;
switch (d->props.rc.core.protocol) {
case IR_TYPE_NEC:
case RC_TYPE_NEC:
/* NEC protocol sends repeat code as 0 0 0 FF */
if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
(key[3] == 0xff))
......@@ -1924,9 +1924,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -1958,9 +1958,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2017,9 +2017,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2059,9 +2059,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2135,9 +2135,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2179,9 +2179,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2247,9 +2247,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2294,9 +2294,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2363,9 +2363,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2399,9 +2399,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2467,9 +2467,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2511,9 +2511,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2560,9 +2560,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
......@@ -2597,9 +2597,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
.module_name = "dib0700",
.rc_query = dib0700_rc_query_old_firmware,
.allowed_protos = IR_TYPE_RC5 |
IR_TYPE_RC6 |
IR_TYPE_NEC,
.allowed_protos = RC_TYPE_RC5 |
RC_TYPE_RC6 |
RC_TYPE_NEC,
.change_protocol = dib0700_change_protocol,
},
},
......
drivers/media/dvb/dvb-usb/dvb-usb.h
View file @ 52b66144
......@@ -190,7 +190,7 @@ struct dvb_rc {
char *rc_codes;
u64 protocol;
u64 allowed_protos;
int (*change_protocol)(struct rc_dev *dev, u64 ir_type);
int (*change_protocol)(struct rc_dev *dev, u64 rc_type);
char *module_name;
int (*rc_query) (struct dvb_usb_device *d);
int rc_interval;
......
drivers/media/dvb/mantis/mantis_input.c
View file @ 52b66144
......@@ -99,7 +99,7 @@ static struct rc_keymap ir_mantis_map = {
.map = {
.scan = mantis_ir_table,
.size = ARRAY_SIZE(mantis_ir_table),
.ir_type = IR_TYPE_UNKNOWN,
.rc_type = RC_TYPE_UNKNOWN,
.name = RC_MAP_MANTIS,
}
};
......
drivers/media/dvb/siano/smsir.c
View file @ 52b66144
......@@ -88,7 +88,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
dev->priv = coredev;
dev->driver_type = RC_DRIVER_IR_RAW;
dev->allowed_protos = IR_TYPE_ALL;
dev->allowed_protos = RC_TYPE_ALL;
dev->map_name = sms_get_board(board_id)->rc_codes;
dev->driver_name = MODULE_NAME;
......
drivers/media/rc/ene_ir.c
View file @ 52b66144
......@@ -1052,7 +1052,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
learning_mode_force = false;
rdev->driver_type = RC_DRIVER_IR_RAW;
rdev->allowed_protos = IR_TYPE_ALL;
rdev->allowed_protos = RC_TYPE_ALL;
rdev->priv = dev;
rdev->open = ene_open;
rdev->close = ene_close;
......
drivers/media/rc/imon.c
View file @ 52b66144
......@@ -131,7 +131,7 @@ struct imon_context {
u32 last_keycode; /* last reported input keycode */
u32 rc_scancode; /* the computed remote scancode */
u8 rc_toggle; /* the computed remote toggle bit */
u64 ir_type; /* iMON or MCE (RC6) IR protocol? */
u64 rc_type; /* iMON or MCE (RC6) IR protocol? */
bool release_code; /* some keys send a release code */
u8 display_type; /* store the display type */
......@@ -983,7 +983,7 @@ static void imon_touch_display_timeout(unsigned long data)
* really just RC-6), but only one or the other at a time, as the signals
* are decoded onboard the receiver.
*/
static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
{
int retval;
struct imon_context *ictx = rc->priv;
......@@ -992,18 +992,18 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
unsigned char ir_proto_packet[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
if (ir_type && !(ir_type & rc->allowed_protos))
if (rc_type && !(rc_type & rc->allowed_protos))
dev_warn(dev, "Looks like you're trying to use an IR protocol "
"this device does not support\n");
switch (ir_type) {
case IR_TYPE_RC6:
switch (rc_type) {
case RC_TYPE_RC6:
dev_dbg(dev, "Configuring IR receiver for MCE protocol\n");
ir_proto_packet[0] = 0x01;
pad_mouse = false;
break;
case IR_TYPE_UNKNOWN:
case IR_TYPE_OTHER:
case RC_TYPE_UNKNOWN:
case RC_TYPE_OTHER:
dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
if (pad_stabilize && !nomouse)
pad_mouse = true;
......@@ -1012,7 +1012,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
pad_mouse = false;
}
/* ir_proto_packet[0] = 0x00; // already the default */
ir_type = IR_TYPE_OTHER;
rc_type = RC_TYPE_OTHER;
break;
default:
dev_warn(dev, "Unsupported IR protocol specified, overriding "
......@@ -1024,7 +1024,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
pad_mouse = false;
}
/* ir_proto_packet[0] = 0x00; // already the default */
ir_type = IR_TYPE_OTHER;
rc_type = RC_TYPE_OTHER;
break;
}
......@@ -1034,7 +1034,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 ir_type)
if (retval)
goto out;
ictx->ir_type = ir_type;
ictx->rc_type = rc_type;
ictx->pad_mouse = pad_mouse;
out:
......@@ -1306,7 +1306,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
rel_x = buf[2];
rel_y = buf[3];
if (ictx->ir_type == IR_TYPE_OTHER && pad_stabilize) {
if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
dir = stabilize((int)rel_x, (int)rel_y,
timeout, threshold);
......@@ -1373,7 +1373,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
buf[0] = 0x01;
buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
if (ictx->ir_type == IR_TYPE_OTHER && pad_stabilize) {
if (ictx->rc_type == RC_TYPE_OTHER && pad_stabilize) {
dir = stabilize((int)rel_x, (int)rel_y,
timeout, threshold);
if (!dir) {
......@@ -1495,7 +1495,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
kc = imon_panel_key_lookup(scancode);
} else {
scancode = be32_to_cpu(*((u32 *)buf));
if (ictx->ir_type == IR_TYPE_RC6) {
if (ictx->rc_type == RC_TYPE_RC6) {
ktype = IMON_KEY_IMON;
if (buf[0] == 0x80)
ktype = IMON_KEY_MCE;
......@@ -1709,7 +1709,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
{
u8 ffdc_cfg_byte = ictx->usb_rx_buf[6];
u8 detected_display_type = IMON_DISPLAY_TYPE_NONE;
u64 allowed_protos = IR_TYPE_OTHER;
u64 allowed_protos = RC_TYPE_OTHER;
switch (ffdc_cfg_byte) {
/* iMON Knob, no display, iMON IR + vol knob */
......@@ -1738,13 +1738,13 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
case 0x9e:
dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
detected_display_type = IMON_DISPLAY_TYPE_VFD;
allowed_protos = IR_TYPE_RC6;
allowed_protos = RC_TYPE_RC6;
break;
/* iMON LCD, MCE IR */
case 0x9f:
dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
detected_display_type = IMON_DISPLAY_TYPE_LCD;
allowed_protos = IR_TYPE_RC6;
allowed_protos = RC_TYPE_RC6;
break;
default:
dev_info(ictx->dev, "Unknown 0xffdc device, "
......@@ -1757,7 +1757,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
ictx->display_type = detected_display_type;
ictx->rdev->allowed_protos = allowed_protos;
ictx->ir_type = allowed_protos;
ictx->rc_type = allowed_protos;
}
static void imon_set_display_type(struct imon_context *ictx)
......@@ -1836,10 +1836,10 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
rdev->priv = ictx;
rdev->driver_type = RC_DRIVER_SCANCODE;
rdev->allowed_protos = IR_TYPE_OTHER | IR_TYPE_RC6; /* iMON PAD or MCE */
rdev->allowed_protos = RC_TYPE_OTHER | RC_TYPE_RC6; /* iMON PAD or MCE */
rdev->change_protocol = imon_ir_change_protocol;
rdev->driver_name = MOD_NAME;
if (ictx->ir_type == IR_TYPE_RC6)
if (ictx->rc_type == RC_TYPE_RC6)
rdev->map_name = RC_MAP_IMON_MCE;
else
rdev->map_name = RC_MAP_IMON_PAD;
......
drivers/media/rc/ir-jvc-decoder.c
View file @ 52b66144
......@@ -46,7 +46,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
{
struct jvc_dec *data = &dev->raw->jvc;
if (!(dev->raw->enabled_protocols & IR_TYPE_JVC))
if (!(dev->raw->enabled_protocols & RC_TYPE_JVC))
return 0;
if (!is_timing_event(ev)) {
......@@ -173,7 +173,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler jvc_handler = {
.protocols = IR_TYPE_JVC,
.protocols = RC_TYPE_JVC,
.decode = ir_jvc_decode,
};
......
drivers/media/rc/ir-lirc-codec.c
View file @ 52b66144
......@@ -34,7 +34,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
struct lirc_codec *lirc = &dev->raw->lirc;
int sample;
if (!(dev->raw->enabled_protocols & IR_TYPE_LIRC))
if (!(dev->raw->enabled_protocols & RC_TYPE_LIRC))
return 0;
if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
......@@ -373,7 +373,7 @@ static int ir_lirc_unregister(struct rc_dev *dev)
}
static struct ir_raw_handler lirc_handler = {
.protocols = IR_TYPE_LIRC,
.protocols = RC_TYPE_LIRC,
.decode = ir_lirc_decode,
.raw_register = ir_lirc_register,
.raw_unregister = ir_lirc_unregister,
......
drivers/media/rc/ir-nec-decoder.c
View file @ 52b66144
......@@ -50,7 +50,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
u32 scancode;
u8 address, not_address, command, not_command;
if (!(dev->raw->enabled_protocols & IR_TYPE_NEC))
if (!(dev->raw->enabled_protocols & RC_TYPE_NEC))
return 0;
if (!is_timing_event(ev)) {
......@@ -190,7 +190,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler nec_handler = {
.protocols = IR_TYPE_NEC,
.protocols = RC_TYPE_NEC,
.decode = ir_nec_decode,
};
......
drivers/media/rc/ir-rc5-decoder.c
View file @ 52b66144
......@@ -51,7 +51,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
u8 toggle;
u32 scancode;
if (!(dev->raw->enabled_protocols & IR_TYPE_RC5))
if (!(dev->raw->enabled_protocols & RC_TYPE_RC5))
return 0;
if (!is_timing_event(ev)) {
......@@ -163,7 +163,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler rc5_handler = {
.protocols = IR_TYPE_RC5,
.protocols = RC_TYPE_RC5,
.decode = ir_rc5_decode,
};
......
drivers/media/rc/ir-rc5-sz-decoder.c
View file @ 52b66144
......@@ -47,7 +47,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
u8 toggle, command, system;
u32 scancode;
if (!(dev->raw->enabled_protocols & IR_TYPE_RC5_SZ))
if (!(dev->raw->enabled_protocols & RC_TYPE_RC5_SZ))
return 0;
if (!is_timing_event(ev)) {
......@@ -127,7 +127,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler rc5_sz_handler = {
.protocols = IR_TYPE_RC5_SZ,
.protocols = RC_TYPE_RC5_SZ,
.decode = ir_rc5_sz_decode,
};
......
drivers/media/rc/ir-rc6-decoder.c
View file @ 52b66144
......@@ -81,7 +81,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
u32 scancode;
u8 toggle;
if (!(dev->raw->enabled_protocols & IR_TYPE_RC6))
if (!(dev->raw->enabled_protocols & RC_TYPE_RC6))
return 0;
if (!is_timing_event(ev)) {
......@@ -255,7 +255,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler rc6_handler = {
.protocols = IR_TYPE_RC6,
.protocols = RC_TYPE_RC6,
.decode = ir_rc6_decode,
};
......
drivers/media/rc/ir-sony-decoder.c
View file @ 52b66144
......@@ -44,7 +44,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
u32 scancode;
u8 device, subdevice, function;
if (!(dev->raw->enabled_protocols & IR_TYPE_SONY))
if (!(dev->raw->enabled_protocols & RC_TYPE_SONY))
return 0;
if (!is_timing_event(ev)) {
......@@ -156,7 +156,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
}
static struct ir_raw_handler sony_handler = {
.protocols = IR_TYPE_SONY,
.protocols = RC_TYPE_SONY,
.decode = ir_sony_decode,
};
......
drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
View file @ 52b66144
......@@ -67,7 +67,7 @@ static struct rc_keymap adstech_dvb_t_pci_map = {
.map = {
.scan = adstech_dvb_t_pci,
.size = ARRAY_SIZE(adstech_dvb_t_pci),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ADSTECH_DVB_T_PCI,
}
};
......
drivers/media/rc/keymaps/rc-alink-dtu-m.c
View file @ 52b66144
......@@ -46,7 +46,7 @@ static struct rc_keymap alink_dtu_m_map = {
.map = {
.scan = alink_dtu_m,
.size = ARRAY_SIZE(alink_dtu_m),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_ALINK_DTU_M,
}
};
......
drivers/media/rc/keymaps/rc-anysee.c
View file @ 52b66144
......@@ -71,7 +71,7 @@ static struct rc_keymap anysee_map = {
.map = {
.scan = anysee,
.size = ARRAY_SIZE(anysee),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_ANYSEE,
}
};
......
drivers/media/rc/keymaps/rc-apac-viewcomp.c
View file @ 52b66144
......@@ -58,7 +58,7 @@ static struct rc_keymap apac_viewcomp_map = {
.map = {
.scan = apac_viewcomp,
.size = ARRAY_SIZE(apac_viewcomp),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_APAC_VIEWCOMP,
}
};
......
drivers/media/rc/keymaps/rc-asus-pc39.c
View file @ 52b66144
......@@ -69,7 +69,7 @@ static struct rc_keymap asus_pc39_map = {
.map = {
.scan = asus_pc39,
.size = ARRAY_SIZE(asus_pc39),
.ir_type = IR_TYPE_RC5,
.rc_type = RC_TYPE_RC5,
.name = RC_MAP_ASUS_PC39,
}
};
......
drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
View file @ 52b66144
......@@ -47,7 +47,7 @@ static struct rc_keymap ati_tv_wonder_hd_600_map = {
.map = {
.scan = ati_tv_wonder_hd_600,
.size = ARRAY_SIZE(ati_tv_wonder_hd_600),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ATI_TV_WONDER_HD_600,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-a16d.c
View file @ 52b66144
......@@ -53,7 +53,7 @@ static struct rc_keymap avermedia_a16d_map = {
.map = {
.scan = avermedia_a16d,
.size = ARRAY_SIZE(avermedia_a16d),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_A16D,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-cardbus.c
View file @ 52b66144
......@@ -75,7 +75,7 @@ static struct rc_keymap avermedia_cardbus_map = {
.map = {
.scan = avermedia_cardbus,
.size = ARRAY_SIZE(avermedia_cardbus),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_CARDBUS,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-dvbt.c
View file @ 52b66144
......@@ -56,7 +56,7 @@ static struct rc_keymap avermedia_dvbt_map = {
.map = {
.scan = avermedia_dvbt,
.size = ARRAY_SIZE(avermedia_dvbt),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_DVBT,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-m135a.c
View file @ 52b66144
......@@ -125,7 +125,7 @@ static struct rc_keymap avermedia_m135a_map = {
.map = {
.scan = avermedia_m135a,
.size = ARRAY_SIZE(avermedia_m135a),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_AVERMEDIA_M135A,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
View file @ 52b66144
......@@ -73,7 +73,7 @@ static struct rc_keymap avermedia_m733a_rm_k6_map = {
.map = {
.scan = avermedia_m733a_rm_k6,
.size = ARRAY_SIZE(avermedia_m733a_rm_k6),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_AVERMEDIA_M733A_RM_K6,
}
};
......
drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
View file @ 52b66144
......@@ -57,7 +57,7 @@ static struct rc_keymap avermedia_rm_ks_map = {
.map = {
.scan = avermedia_rm_ks,
.size = ARRAY_SIZE(avermedia_rm_ks),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_AVERMEDIA_RM_KS,
}
};
......
drivers/media/rc/keymaps/rc-avermedia.c
View file @ 52b66144
......@@ -64,7 +64,7 @@ static struct rc_keymap avermedia_map = {
.map = {
.scan = avermedia,
.size = ARRAY_SIZE(avermedia),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA,
}
};
......
drivers/media/rc/keymaps/rc-avertv-303.c
View file @ 52b66144
......@@ -63,7 +63,7 @@ static struct rc_keymap avertv_303_map = {
.map = {
.scan = avertv_303,
.size = ARRAY_SIZE(avertv_303),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERTV_303,
}
};
......
drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
View file @ 52b66144
......@@ -80,7 +80,7 @@ static struct rc_keymap azurewave_ad_tu700_map = {
.map = {
.scan = azurewave_ad_tu700,
.size = ARRAY_SIZE(azurewave_ad_tu700),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_AZUREWAVE_AD_TU700,
}
};
......
drivers/media/rc/keymaps/rc-behold-columbus.c
View file @ 52b66144
......@@ -86,7 +86,7 @@ static struct rc_keymap behold_columbus_map = {
.map = {
.scan = behold_columbus,
.size = ARRAY_SIZE(behold_columbus),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_BEHOLD_COLUMBUS,
}
};
......
drivers/media/rc/keymaps/rc-behold.c
View file @ 52b66144
......@@ -119,7 +119,7 @@ static struct rc_keymap behold_map = {
.map = {
.scan = behold,
.size = ARRAY_SIZE(behold),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_BEHOLD,
}
};
......
drivers/media/rc/keymaps/rc-budget-ci-old.c
View file @ 52b66144
......@@ -70,7 +70,7 @@ static struct rc_keymap budget_ci_old_map = {
.map = {
.scan = budget_ci_old,
.size = ARRAY_SIZE(budget_ci_old),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_BUDGET_CI_OLD,
}
};
......
drivers/media/rc/keymaps/rc-cinergy-1400.c
View file @ 52b66144
......@@ -62,7 +62,7 @@ static struct rc_keymap cinergy_1400_map = {
.map = {
.scan = cinergy_1400,
.size = ARRAY_SIZE(cinergy_1400),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_CINERGY_1400,
}
};
......
drivers/media/rc/keymaps/rc-cinergy.c
View file @ 52b66144
......@@ -56,7 +56,7 @@ static struct rc_keymap cinergy_map = {
.map = {
.scan = cinergy,
.size = ARRAY_SIZE(cinergy),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_CINERGY,
}
};
......
drivers/media/rc/keymaps/rc-dib0700-nec.c
View file @ 52b66144
......@@ -102,7 +102,7 @@ static struct rc_keymap dib0700_nec_map = {
.map = {
.scan = dib0700_nec_table,
.size = ARRAY_SIZE(dib0700_nec_table),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_DIB0700_NEC_TABLE,
}
};
......
drivers/media/rc/keymaps/rc-dib0700-rc5.c
View file @ 52b66144
......@@ -213,7 +213,7 @@ static struct rc_keymap dib0700_rc5_map = {
.map = {
.scan = dib0700_rc5_table,
.size = ARRAY_SIZE(dib0700_rc5_table),
.ir_type = IR_TYPE_RC5,
.rc_type = RC_TYPE_RC5,
.name = RC_MAP_DIB0700_RC5_TABLE,
}
};
......
drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
View file @ 52b66144
......@@ -76,7 +76,7 @@ static struct rc_keymap digitalnow_tinytwin_map = {
.map = {
.scan = digitalnow_tinytwin,
.size = ARRAY_SIZE(digitalnow_tinytwin),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_DIGITALNOW_TINYTWIN,
}
};
......
drivers/media/rc/keymaps/rc-digittrade.c
View file @ 52b66144
......@@ -60,7 +60,7 @@ static struct rc_keymap digittrade_map = {
.map = {
.scan = digittrade,
.size = ARRAY_SIZE(digittrade),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_DIGITTRADE,
}
};
......
drivers/media/rc/keymaps/rc-dm1105-nec.c
View file @ 52b66144
......@@ -54,7 +54,7 @@ static struct rc_keymap dm1105_nec_map = {
.map = {
.scan = dm1105_nec,
.size = ARRAY_SIZE(dm1105_nec),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DM1105_NEC,
}
};
......
drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
View file @ 52b66144
......@@ -56,7 +56,7 @@ static struct rc_keymap dntv_live_dvb_t_map = {
.map = {
.scan = dntv_live_dvb_t,
.size = ARRAY_SIZE(dntv_live_dvb_t),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DNTV_LIVE_DVB_T,
}
};
......
drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
View file @ 52b66144
......@@ -75,7 +75,7 @@ static struct rc_keymap dntv_live_dvbt_pro_map = {
.map = {
.scan = dntv_live_dvbt_pro,
.size = ARRAY_SIZE(dntv_live_dvbt_pro),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DNTV_LIVE_DVBT_PRO,
}
};
......
drivers/media/rc/keymaps/rc-em-terratec.c
View file @ 52b66144
......@@ -47,7 +47,7 @@ static struct rc_keymap em_terratec_map = {
.map = {
.scan = em_terratec,
.size = ARRAY_SIZE(em_terratec),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EM_TERRATEC,
}
};
......
drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
View file @ 52b66144
......@@ -59,7 +59,7 @@ static struct rc_keymap encore_enltv_fm53_map = {
.map = {
.scan = encore_enltv_fm53,
.size = ARRAY_SIZE(encore_enltv_fm53),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV_FM53,
}
};
......
drivers/media/rc/keymaps/rc-encore-enltv.c
View file @ 52b66144
......@@ -90,7 +90,7 @@ static struct rc_keymap encore_enltv_map = {
.map = {
.scan = encore_enltv,
.size = ARRAY_SIZE(encore_enltv),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV,
}
};
......
drivers/media/rc/keymaps/rc-encore-enltv2.c
View file @ 52b66144
......@@ -68,7 +68,7 @@ static struct rc_keymap encore_enltv2_map = {
.map = {
.scan = encore_enltv2,
.size = ARRAY_SIZE(encore_enltv2),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV2,
}
};
......
drivers/media/rc/keymaps/rc-evga-indtube.c
View file @ 52b66144
......@@ -39,7 +39,7 @@ static struct rc_keymap evga_indtube_map = {
.map = {
.scan = evga_indtube,
.size = ARRAY_SIZE(evga_indtube),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EVGA_INDTUBE,
}
};
......
drivers/media/rc/keymaps/rc-eztv.c
View file @ 52b66144
......@@ -74,7 +74,7 @@ static struct rc_keymap eztv_map = {
.map = {
.scan = eztv,
.size = ARRAY_SIZE(eztv),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EZTV,
}
};
......
drivers/media/rc/keymaps/rc-flydvb.c
View file @ 52b66144
......@@ -55,7 +55,7 @@ static struct rc_keymap flydvb_map = {
.map = {
.scan = flydvb,
.size = ARRAY_SIZE(flydvb),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FLYDVB,
}
};
......
drivers/media/rc/keymaps/rc-flyvideo.c
View file @ 52b66144
......@@ -48,7 +48,7 @@ static struct rc_keymap flyvideo_map = {
.map = {
.scan = flyvideo,
.size = ARRAY_SIZE(flyvideo),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FLYVIDEO,
}
};
......
drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
View file @ 52b66144
......@@ -76,7 +76,7 @@ static struct rc_keymap fusionhdtv_mce_map = {
.map = {
.scan = fusionhdtv_mce,
.size = ARRAY_SIZE(fusionhdtv_mce),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FUSIONHDTV_MCE,
}
};
......
drivers/media/rc/keymaps/rc-gadmei-rm008z.c
View file @ 52b66144
......@@ -59,7 +59,7 @@ static struct rc_keymap gadmei_rm008z_map = {
.map = {
.scan = gadmei_rm008z,
.size = ARRAY_SIZE(gadmei_rm008z),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GADMEI_RM008Z,
}
};
......
drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
View file @ 52b66144
......@@ -62,7 +62,7 @@ static struct rc_keymap genius_tvgo_a11mce_map = {
.map = {
.scan = genius_tvgo_a11mce,
.size = ARRAY_SIZE(genius_tvgo_a11mce),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GENIUS_TVGO_A11MCE,
}
};
......
drivers/media/rc/keymaps/rc-gotview7135.c
View file @ 52b66144
......@@ -57,7 +57,7 @@ static struct rc_keymap gotview7135_map = {
.map = {
.scan = gotview7135,
.size = ARRAY_SIZE(gotview7135),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GOTVIEW7135,
}
};
......
drivers/media/rc/keymaps/rc-hauppauge-new.c
View file @ 52b66144
......@@ -78,7 +78,7 @@ static struct rc_keymap hauppauge_new_map = {
.map = {
.scan = hauppauge_new,
.size = ARRAY_SIZE(hauppauge_new),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_HAUPPAUGE_NEW,
}
};
......
drivers/media/rc/keymaps/rc-imon-mce.c
View file @ 52b66144
......@@ -120,7 +120,7 @@ static struct rc_keymap imon_mce_map = {
.scan = imon_mce,
.size = ARRAY_SIZE(imon_mce),
/* its RC6, but w/a hardware decoder */
.ir_type = IR_TYPE_RC6,
.rc_type = RC_TYPE_RC6,
.name = RC_MAP_IMON_MCE,
}
};
......
drivers/media/rc/keymaps/rc-imon-pad.c
View file @ 52b66144
......@@ -134,7 +134,7 @@ static struct rc_keymap imon_pad_map = {
.scan = imon_pad,
.size = ARRAY_SIZE(imon_pad),
/* actual protocol details unknown, hardware decoder */
.ir_type = IR_TYPE_OTHER,
.rc_type = RC_TYPE_OTHER,
.name = RC_MAP_IMON_PAD,
}
};
......
drivers/media/rc/keymaps/rc-iodata-bctv7e.c
View file @ 52b66144
......@@ -66,7 +66,7 @@ static struct rc_keymap iodata_bctv7e_map = {
.map = {
.scan = iodata_bctv7e,
.size = ARRAY_SIZE(iodata_bctv7e),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_IODATA_BCTV7E,
}
};
......
drivers/media/rc/keymaps/rc-kaiomy.c
View file @ 52b66144
......@@ -65,7 +65,7 @@ static struct rc_keymap kaiomy_map = {
.map = {
.scan = kaiomy,
.size = ARRAY_SIZE(kaiomy),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_KAIOMY,
}
};
......
drivers/media/rc/keymaps/rc-kworld-315u.c
View file @ 52b66144
......@@ -61,7 +61,7 @@ static struct rc_keymap kworld_315u_map = {
.map = {
.scan = kworld_315u,
.size = ARRAY_SIZE(kworld_315u),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_KWORLD_315U,
}
};
......
drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
View file @ 52b66144
......@@ -77,7 +77,7 @@ static struct rc_keymap kworld_plus_tv_analog_map = {
.map = {
.scan = kworld_plus_tv_analog,
.size = ARRAY_SIZE(kworld_plus_tv_analog),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_KWORLD_PLUS_TV_ANALOG,
}
};
......
drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
View file @ 52b66144
......@@ -77,7 +77,7 @@ static struct rc_keymap leadtek_y04g0051_map = {
.map = {
.scan = leadtek_y04g0051,
.size = ARRAY_SIZE(leadtek_y04g0051),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_LEADTEK_Y04G0051,
}
};
......
drivers/media/rc/keymaps/rc-lirc.c
View file @ 52b66144
......@@ -19,7 +19,7 @@ static struct rc_keymap lirc_map = {
.map = {
.scan = lirc,
.size = ARRAY_SIZE(lirc),
.ir_type = IR_TYPE_LIRC,
.rc_type = RC_TYPE_LIRC,
.name = RC_MAP_LIRC,
}
};
......
drivers/media/rc/keymaps/rc-lme2510.c
View file @ 52b66144
......@@ -46,7 +46,7 @@ static struct rc_keymap lme2510_map = {
.map = {
.scan = lme2510_rc,
.size = ARRAY_SIZE(lme2510_rc),
.ir_type = IR_TYPE_UNKNOWN,
.rc_type = RC_TYPE_UNKNOWN,
.name = RC_MAP_LME2510,
}
};
......
drivers/media/rc/keymaps/rc-manli.c
View file @ 52b66144
......@@ -112,7 +112,7 @@ static struct rc_keymap manli_map = {
.map = {
.scan = manli,
.size = ARRAY_SIZE(manli),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_MANLI,
}
};
......
drivers/media/rc/keymaps/rc-msi-digivox-ii.c
View file @ 52b66144
......@@ -45,7 +45,7 @@ static struct rc_keymap msi_digivox_ii_map = {
.map = {
.scan = msi_digivox_ii,
.size = ARRAY_SIZE(msi_digivox_ii),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_MSI_DIGIVOX_II,
}
};
......
drivers/media/rc/keymaps/rc-msi-digivox-iii.c
View file @ 52b66144
......@@ -63,7 +63,7 @@ static struct rc_keymap msi_digivox_iii_map = {
.map = {
.scan = msi_digivox_iii,
.size = ARRAY_SIZE(msi_digivox_iii),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_MSI_DIGIVOX_III,
}
};
......
drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
View file @ 52b66144
......@@ -101,7 +101,7 @@ static struct rc_keymap msi_tvanywhere_plus_map = {
.map = {
.scan = msi_tvanywhere_plus,
.size = ARRAY_SIZE(msi_tvanywhere_plus),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_MSI_TVANYWHERE_PLUS,
}
};
......
drivers/media/rc/keymaps/rc-msi-tvanywhere.c
View file @ 52b66144
......@@ -47,7 +47,7 @@ static struct rc_keymap msi_tvanywhere_map = {
.map = {
.scan = msi_tvanywhere,
.size = ARRAY_SIZE(msi_tvanywhere),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_MSI_TVANYWHERE,
}
};
......
drivers/media/rc/keymaps/rc-nebula.c
View file @ 52b66144
......@@ -74,7 +74,7 @@ static struct rc_keymap nebula_map = {
.map = {
.scan = nebula,
.size = ARRAY_SIZE(nebula),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_NEBULA,
}
};
......
drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
View file @ 52b66144
......@@ -83,7 +83,7 @@ static struct rc_keymap nec_terratec_cinergy_xs_map = {
.map = {
.scan = nec_terratec_cinergy_xs,
.size = ARRAY_SIZE(nec_terratec_cinergy_xs),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_NEC_TERRATEC_CINERGY_XS,
}
};
......
drivers/media/rc/keymaps/rc-norwood.c
View file @ 52b66144
......@@ -63,7 +63,7 @@ static struct rc_keymap norwood_map = {
.map = {
.scan = norwood,
.size = ARRAY_SIZE(norwood),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_NORWOOD,
}
};
......
drivers/media/rc/keymaps/rc-npgtech.c
View file @ 52b66144
......@@ -58,7 +58,7 @@ static struct rc_keymap npgtech_map = {
.map = {
.scan = npgtech,
.size = ARRAY_SIZE(npgtech),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_NPGTECH,
}
};
......
drivers/media/rc/keymaps/rc-pctv-sedna.c
View file @ 52b66144
......@@ -58,7 +58,7 @@ static struct rc_keymap pctv_sedna_map = {
.map = {
.scan = pctv_sedna,
.size = ARRAY_SIZE(pctv_sedna),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PCTV_SEDNA,
}
};
......
drivers/media/rc/keymaps/rc-pinnacle-color.c
View file @ 52b66144
......@@ -72,7 +72,7 @@ static struct rc_keymap pinnacle_color_map = {
.map = {
.scan = pinnacle_color,
.size = ARRAY_SIZE(pinnacle_color),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PINNACLE_COLOR,
}
};
......
drivers/media/rc/keymaps/rc-pinnacle-grey.c
View file @ 52b66144
......@@ -67,7 +67,7 @@ static struct rc_keymap pinnacle_grey_map = {
.map = {
.scan = pinnacle_grey,
.size = ARRAY_SIZE(pinnacle_grey),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PINNACLE_GREY,
}
};
......
drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
View file @ 52b66144
......@@ -51,7 +51,7 @@ static struct rc_keymap pinnacle_pctv_hd_map = {
.map = {
.scan = pinnacle_pctv_hd,
.size = ARRAY_SIZE(pinnacle_pctv_hd),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PINNACLE_PCTV_HD,
}
};
......
drivers/media/rc/keymaps/rc-pixelview-mk12.c
View file @ 52b66144
......@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_map = {
.map = {
.scan = pixelview_mk12,
.size = ARRAY_SIZE(pixelview_mk12),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_PIXELVIEW_MK12,
}
};
......
drivers/media/rc/keymaps/rc-pixelview-new.c
View file @ 52b66144
......@@ -61,7 +61,7 @@ static struct rc_keymap pixelview_new_map = {
.map = {
.scan = pixelview_new,
.size = ARRAY_SIZE(pixelview_new),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PIXELVIEW_NEW,
}
};
......
drivers/media/rc/keymaps/rc-pixelview.c
View file @ 52b66144
......@@ -60,7 +60,7 @@ static struct rc_keymap pixelview_map = {
.map = {
.scan = pixelview,
.size = ARRAY_SIZE(pixelview),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PIXELVIEW,
}
};
......
drivers/media/rc/keymaps/rc-powercolor-real-angel.c
View file @ 52b66144
......@@ -59,7 +59,7 @@ static struct rc_keymap powercolor_real_angel_map = {
.map = {
.scan = powercolor_real_angel,
.size = ARRAY_SIZE(powercolor_real_angel),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_POWERCOLOR_REAL_ANGEL,
}
};
......
drivers/media/rc/keymaps/rc-proteus-2309.c
View file @ 52b66144
......@@ -47,7 +47,7 @@ static struct rc_keymap proteus_2309_map = {
.map = {
.scan = proteus_2309,
.size = ARRAY_SIZE(proteus_2309),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PROTEUS_2309,
}
};
......
drivers/media/rc/keymaps/rc-purpletv.c
View file @ 52b66144
......@@ -59,7 +59,7 @@ static struct rc_keymap purpletv_map = {
.map = {
.scan = purpletv,
.size = ARRAY_SIZE(purpletv),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PURPLETV,
}
};
......
drivers/media/rc/keymaps/rc-pv951.c
View file @ 52b66144
......@@ -56,7 +56,7 @@ static struct rc_keymap pv951_map = {
.map = {
.scan = pv951,
.size = ARRAY_SIZE(pv951),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_PV951,
}
};
......
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
View file @ 52b66144
......@@ -81,7 +81,7 @@ static struct rc_keymap rc5_hauppauge_new_map = {
.map = {
.scan = rc5_hauppauge_new,
.size = ARRAY_SIZE(rc5_hauppauge_new),
.ir_type = IR_TYPE_RC5,
.rc_type = RC_TYPE_RC5,
.name = RC_MAP_RC5_HAUPPAUGE_NEW,
}
};
......
drivers/media/rc/keymaps/rc-rc5-tv.c
View file @ 52b66144
......@@ -59,7 +59,7 @@ static struct rc_keymap rc5_tv_map = {
.map = {
.scan = rc5_tv,
.size = ARRAY_SIZE(rc5_tv),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_RC5_TV,
}
};
......
drivers/media/rc/keymaps/rc-rc6-mce.c
View file @ 52b66144
......@@ -91,7 +91,7 @@ static struct rc_keymap rc6_mce_map = {
.map = {
.scan = rc6_mce,
.size = ARRAY_SIZE(rc6_mce),
.ir_type = IR_TYPE_RC6,
.rc_type = RC_TYPE_RC6,
.name = RC_MAP_RC6_MCE,
}
};
......
drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
View file @ 52b66144
......@@ -56,7 +56,7 @@ static struct rc_keymap real_audio_220_32_keys_map = {
.map = {
.scan = real_audio_220_32_keys,
.size = ARRAY_SIZE(real_audio_220_32_keys),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_REAL_AUDIO_220_32_KEYS,
}
};
......
drivers/media/rc/keymaps/rc-streamzap.c
View file @ 52b66144
......@@ -60,7 +60,7 @@ static struct rc_keymap streamzap_map = {
.map = {
.scan = streamzap,
.size = ARRAY_SIZE(streamzap),
.ir_type = IR_TYPE_RC5_SZ,
.rc_type = RC_TYPE_RC5_SZ,
.name = RC_MAP_STREAMZAP,
}
};
......
drivers/media/rc/keymaps/rc-tbs-nec.c
View file @ 52b66144
......@@ -51,7 +51,7 @@ static struct rc_keymap tbs_nec_map = {
.map = {
.scan = tbs_nec,
.size = ARRAY_SIZE(tbs_nec),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_TBS_NEC,
}
};
......
drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
View file @ 52b66144
......@@ -70,7 +70,7 @@ static struct rc_keymap terratec_cinergy_xs_map = {
.map = {
.scan = terratec_cinergy_xs,
.size = ARRAY_SIZE(terratec_cinergy_xs),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_TERRATEC_CINERGY_XS,
}
};
......
drivers/media/rc/keymaps/rc-terratec-slim.c
View file @ 52b66144
......@@ -57,7 +57,7 @@ static struct rc_keymap terratec_slim_map = {
.map = {
.scan = terratec_slim,
.size = ARRAY_SIZE(terratec_slim),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_TERRATEC_SLIM,
}
};
......
drivers/media/rc/keymaps/rc-tevii-nec.c
View file @ 52b66144
......@@ -66,7 +66,7 @@ static struct rc_keymap tevii_nec_map = {
.map = {
.scan = tevii_nec,
.size = ARRAY_SIZE(tevii_nec),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_TEVII_NEC,
}
};
......
drivers/media/rc/keymaps/rc-total-media-in-hand.c
View file @ 52b66144
......@@ -63,7 +63,7 @@ static struct rc_keymap total_media_in_hand_map = {
.map = {
.scan = total_media_in_hand,
.size = ARRAY_SIZE(total_media_in_hand),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_TOTAL_MEDIA_IN_HAND,
}
};
......
drivers/media/rc/keymaps/rc-trekstor.c
View file @ 52b66144
......@@ -58,7 +58,7 @@ static struct rc_keymap trekstor_map = {
.map = {
.scan = trekstor,
.size = ARRAY_SIZE(trekstor),
.ir_type = IR_TYPE_NEC,
.rc_type = RC_TYPE_NEC,
.name = RC_MAP_TREKSTOR,
}
};
......
drivers/media/rc/keymaps/rc-tt-1500.c
View file @ 52b66144
......@@ -60,7 +60,7 @@ static struct rc_keymap tt_1500_map = {
.map = {
.scan = tt_1500,
.size = ARRAY_SIZE(tt_1500),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_TT_1500,
}
};
......
drivers/media/rc/keymaps/rc-twinhan1027.c
View file @ 52b66144
......@@ -65,7 +65,7 @@ static struct rc_keymap twinhan_vp1027_map = {
.map = {
.scan = twinhan_vp1027,
.size = ARRAY_SIZE(twinhan_vp1027),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_TWINHAN_VP1027_DVBS,
}
};
......
drivers/media/rc/keymaps/rc-videomate-s350.c
View file @ 52b66144
......@@ -63,7 +63,7 @@ static struct rc_keymap videomate_s350_map = {
.map = {
.scan = videomate_s350,
.size = ARRAY_SIZE(videomate_s350),
.ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_VIDEOMATE_S350,
}
};
......
drivers/media/rc/keymaps/rc-winfast.c
View file @ 52b66144
This diff is collapsed.
drivers/media/rc/mceusb.c
View file @ 52b66144
This diff is collapsed.
drivers/media/rc/nuvoton-cir.c
View file @ 52b66144
This diff is collapsed.
drivers/media/rc/rc-main.c
View file @ 52b66144
This diff is collapsed.
drivers/media/rc/streamzap.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/cx18/cx18-i2c.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/cx231xx/cx231xx-input.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/cx23885/cx23885-input.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/cx88/cx88-input.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/em28xx/em28xx-input.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/ir-kbd-i2c.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/ivtv/ivtv-i2c.c
View file @ 52b66144
This diff is collapsed.
drivers/media/video/saa7134/saa7134-input.c
View file @ 52b66144
This diff is collapsed.
drivers/staging/tm6000/tm6000-input.c
View file @ 52b66144
This diff is collapsed.
include/media/ir-kbd-i2c.h
View file @ 52b66144
This diff is collapsed.
include/media/rc-core.h
View file @ 52b66144
This diff is collapsed.
include/media/rc-map.h
View file @ 52b66144
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7