Skip to content

L
linux
Commit 6d741bfe authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files
Options

media: rc: rename RC_TYPE_* to RC_PROTO_* and RC_BIT_* to RC_PROTO_BIT_* 

RC_TYPE is confusing and it's just the protocol. So rename it.
Suggested-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a9a249a2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1204 additions and 1158 deletions
drivers/hid/hid-picolcd_cir.c
View file @ 6d741bfe
...@@ -113,7 +113,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report) ...@@ -113,7 +113,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report)
return -ENOMEM; return -ENOMEM;
rdev->priv = data; rdev->priv = data;
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rdev->open = picolcd_cir_open; rdev->open = picolcd_cir_open;
rdev->close = picolcd_cir_close; rdev->close = picolcd_cir_close;
rdev->device_name = data->hdev->name; rdev->device_name = data->hdev->name;
......
drivers/media/cec/cec-adap.c
View file @ 6d741bfe
...@@ -1897,7 +1897,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg, ...@@ -1897,7 +1897,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
} }
/* Send key press */ /* Send key press */
rc_keydown(adap->rc, RC_TYPE_CEC, scancode, 0); rc_keydown(adap->rc, RC_PROTO_CEC, scancode, 0);
/* When in repeating mode, we're done */ /* When in repeating mode, we're done */
if (adap->rc_repeating) if (adap->rc_repeating)
......
drivers/media/cec/cec-core.c
View file @ 6d741bfe
...@@ -275,8 +275,8 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops, ...@@ -275,8 +275,8 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
adap->rc->input_id.product = 0; adap->rc->input_id.product = 0;
adap->rc->input_id.version = 1; adap->rc->input_id.version = 1;
adap->rc->driver_name = CEC_NAME; adap->rc->driver_name = CEC_NAME;
adap->rc->allowed_protocols = RC_BIT_CEC; adap->rc->allowed_protocols = RC_PROTO_BIT_CEC;
adap->rc->enabled_protocols = RC_BIT_CEC; adap->rc->enabled_protocols = RC_PROTO_BIT_CEC;
adap->rc->priv = adap; adap->rc->priv = adap;
adap->rc->map_name = RC_MAP_CEC; adap->rc->map_name = RC_MAP_CEC;
adap->rc->timeout = MS_TO_NS(100); adap->rc->timeout = MS_TO_NS(100);
......
drivers/media/common/siano/smsir.c
View file @ 6d741bfe
...@@ -86,7 +86,7 @@ int sms_ir_init(struct smscore_device_t *coredev) ...@@ -86,7 +86,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
#endif #endif
dev->priv = coredev; dev->priv = coredev;
dev->allowed_protocols = RC_BIT_ALL_IR_DECODER; dev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
dev->map_name = sms_get_board(board_id)->rc_codes; dev->map_name = sms_get_board(board_id)->rc_codes;
dev->driver_name = MODULE_NAME; dev->driver_name = MODULE_NAME;
......
drivers/media/i2c/ir-kbd-i2c.c
View file @ 6d741bfe
...@@ -59,8 +59,8 @@ module_param(debug, int, 0644); /* debug level (0,1,2) */ ...@@ -59,8 +59,8 @@ module_param(debug, int, 0644); /* debug level (0,1,2) */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_haup_common(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *ptoggle, int size) u32 *scancode, u8 *ptoggle, int size)
{ {
unsigned char buf[6]; unsigned char buf[6];
int start, range, toggle, dev, code, ircode, vendor; int start, range, toggle, dev, code, ircode, vendor;
...@@ -99,7 +99,7 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -99,7 +99,7 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
dprintk(1, "ir hauppauge (rc5): s%d r%d t%d dev=%d code=%d\n", dprintk(1, "ir hauppauge (rc5): s%d r%d t%d dev=%d code=%d\n",
start, range, toggle, dev, code); start, range, toggle, dev, code);
*protocol = RC_TYPE_RC5; *protocol = RC_PROTO_RC5;
*scancode = RC_SCANCODE_RC5(dev, code); *scancode = RC_SCANCODE_RC5(dev, code);
*ptoggle = toggle; *ptoggle = toggle;
...@@ -111,13 +111,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -111,13 +111,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
if (vendor == 0x800f) { if (vendor == 0x800f) {
*ptoggle = (dev & 0x80) != 0; *ptoggle = (dev & 0x80) != 0;
*protocol = RC_TYPE_RC6_MCE; *protocol = RC_PROTO_RC6_MCE;
dev &= 0x7f; dev &= 0x7f;
dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n", dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n",
*ptoggle, vendor, dev, code); *ptoggle, vendor, dev, code);
} else { } else {
*ptoggle = 0; *ptoggle = 0;
*protocol = RC_TYPE_RC6_6A_32; *protocol = RC_PROTO_RC6_6A_32;
dprintk(1, "ir hauppauge (rc6-6a-32): vendor=%d dev=%d code=%d\n", dprintk(1, "ir hauppauge (rc6-6a-32): vendor=%d dev=%d code=%d\n",
vendor, dev, code); vendor, dev, code);
} }
...@@ -130,13 +130,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -130,13 +130,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
return 0; return 0;
} }
static int get_key_haup(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_haup(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
return get_key_haup_common(ir, protocol, scancode, toggle, 3); return get_key_haup_common(ir, protocol, scancode, toggle, 3);
} }
static int get_key_haup_xvr(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_haup_xvr(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
int ret; int ret;
...@@ -155,7 +155,7 @@ static int get_key_haup_xvr(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -155,7 +155,7 @@ static int get_key_haup_xvr(struct IR_i2c *ir, enum rc_type *protocol,
return get_key_haup_common(ir, protocol, scancode, toggle, 6); return get_key_haup_common(ir, protocol, scancode, toggle, 6);
} }
static int get_key_pixelview(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pixelview(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -166,13 +166,13 @@ static int get_key_pixelview(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -166,13 +166,13 @@ static int get_key_pixelview(struct IR_i2c *ir, enum rc_type *protocol,
return -EIO; return -EIO;
} }
*protocol = RC_TYPE_OTHER; *protocol = RC_PROTO_OTHER;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_fusionhdtv(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_fusionhdtv(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char buf[4]; unsigned char buf[4];
...@@ -191,13 +191,13 @@ static int get_key_fusionhdtv(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -191,13 +191,13 @@ static int get_key_fusionhdtv(struct IR_i2c *ir, enum rc_type *protocol,
if(buf[0] != 0x1 || buf[1] != 0xfe) if(buf[0] != 0x1 || buf[1] != 0xfe)
return 0; return 0;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = buf[2]; *scancode = buf[2];
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_knc1(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_knc1(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -221,13 +221,13 @@ static int get_key_knc1(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -221,13 +221,13 @@ static int get_key_knc1(struct IR_i2c *ir, enum rc_type *protocol,
/* keep old data */ /* keep old data */
return 1; return 1;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char subaddr, key, keygroup; unsigned char subaddr, key, keygroup;
...@@ -262,7 +262,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -262,7 +262,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol,
} }
key |= (keygroup & 1) << 6; key |= (keygroup & 1) << 6;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = key; *scancode = key;
if (ir->c->addr == 0x41) /* AVerMedia EM78P153 */ if (ir->c->addr == 0x41) /* AVerMedia EM78P153 */
*scancode |= keygroup << 8; *scancode |= keygroup << 8;
...@@ -274,7 +274,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -274,7 +274,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol,
static int ir_key_poll(struct IR_i2c *ir) static int ir_key_poll(struct IR_i2c *ir)
{ {
enum rc_type protocol; enum rc_proto protocol;
u32 scancode; u32 scancode;
u8 toggle; u8 toggle;
int rc; int rc;
...@@ -315,7 +315,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -315,7 +315,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
{ {
char *ir_codes = NULL; char *ir_codes = NULL;
const char *name = NULL; const char *name = NULL;
u64 rc_type = RC_BIT_UNKNOWN; u64 rc_proto = RC_PROTO_BIT_UNKNOWN;
struct IR_i2c *ir; struct IR_i2c *ir;
struct rc_dev *rc = NULL; struct rc_dev *rc = NULL;
struct i2c_adapter *adap = client->adapter; struct i2c_adapter *adap = client->adapter;
...@@ -334,7 +334,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -334,7 +334,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
case 0x64: case 0x64:
name = "Pixelview"; name = "Pixelview";
ir->get_key = get_key_pixelview; ir->get_key = get_key_pixelview;
rc_type = RC_BIT_OTHER; rc_proto = RC_PROTO_BIT_OTHER;
ir_codes = RC_MAP_EMPTY; ir_codes = RC_MAP_EMPTY;
break; break;
case 0x18: case 0x18:
...@@ -342,38 +342,39 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -342,38 +342,39 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
case 0x1a: case 0x1a:
name = "Hauppauge"; name = "Hauppauge";
ir->get_key = get_key_haup; ir->get_key = get_key_haup;
rc_type = RC_BIT_RC5; rc_proto = RC_PROTO_BIT_RC5;
ir_codes = RC_MAP_HAUPPAUGE; ir_codes = RC_MAP_HAUPPAUGE;
break; break;
case 0x30: case 0x30:
name = "KNC One"; name = "KNC One";
ir->get_key = get_key_knc1; ir->get_key = get_key_knc1;
rc_type = RC_BIT_OTHER; rc_proto = RC_PROTO_BIT_OTHER;
ir_codes = RC_MAP_EMPTY; ir_codes = RC_MAP_EMPTY;
break; break;
case 0x6b: case 0x6b:
name = "FusionHDTV"; name = "FusionHDTV";
ir->get_key = get_key_fusionhdtv; ir->get_key = get_key_fusionhdtv;
rc_type = RC_BIT_UNKNOWN; rc_proto = RC_PROTO_BIT_UNKNOWN;
ir_codes = RC_MAP_FUSIONHDTV_MCE; ir_codes = RC_MAP_FUSIONHDTV_MCE;
break; break;
case 0x40: case 0x40:
name = "AVerMedia Cardbus remote"; name = "AVerMedia Cardbus remote";
ir->get_key = get_key_avermedia_cardbus; ir->get_key = get_key_avermedia_cardbus;
rc_type = RC_BIT_OTHER; rc_proto = RC_PROTO_BIT_OTHER;
ir_codes = RC_MAP_AVERMEDIA_CARDBUS; ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
break; break;
case 0x41: case 0x41:
name = "AVerMedia EM78P153"; name = "AVerMedia EM78P153";
ir->get_key = get_key_avermedia_cardbus; ir->get_key = get_key_avermedia_cardbus;
rc_type = RC_BIT_OTHER; rc_proto = RC_PROTO_BIT_OTHER;
/* RM-KV remote, seems to be same as RM-K6 */ /* RM-KV remote, seems to be same as RM-K6 */
ir_codes = RC_MAP_AVERMEDIA_M733A_RM_K6; ir_codes = RC_MAP_AVERMEDIA_M733A_RM_K6;
break; break;
case 0x71: case 0x71:
name = "Hauppauge/Zilog Z8"; name = "Hauppauge/Zilog Z8";
ir->get_key = get_key_haup_xvr; ir->get_key = get_key_haup_xvr;
rc_type = RC_BIT_RC5 | RC_BIT_RC6_MCE | RC_BIT_RC6_6A_32; rc_proto = RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_MCE |
RC_PROTO_BIT_RC6_6A_32;
ir_codes = RC_MAP_HAUPPAUGE; ir_codes = RC_MAP_HAUPPAUGE;
break; break;
} }
...@@ -388,7 +389,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -388,7 +389,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
name = init_data->name; name = init_data->name;
if (init_data->type) if (init_data->type)
rc_type = init_data->type; rc_proto = init_data->type;
if (init_data->polling_interval) if (init_data->polling_interval)
ir->polling_interval = init_data->polling_interval; ir->polling_interval = init_data->polling_interval;
...@@ -431,7 +432,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -431,7 +432,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
ir->rc = rc; ir->rc = rc;
/* Make sure we are all setup before going on */ /* Make sure we are all setup before going on */
if (!name || !ir->get_key || !rc_type || !ir_codes) { if (!name || !ir->get_key || !rc_proto || !ir_codes) {
dprintk(1, ": Unsupported device at address 0x%02x\n", dprintk(1, ": Unsupported device at address 0x%02x\n",
addr); addr);
err = -ENODEV; err = -ENODEV;
...@@ -458,8 +459,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -458,8 +459,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
* Initialize the other fields of rc_dev * Initialize the other fields of rc_dev
*/ */
rc->map_name = ir->ir_codes; rc->map_name = ir->ir_codes;
rc->allowed_protocols = rc_type; rc->allowed_protocols = rc_proto;
rc->enabled_protocols = rc_type; rc->enabled_protocols = rc_proto;
if (!rc->driver_name) if (!rc->driver_name)
rc->driver_name = MODULE_NAME; rc->driver_name = MODULE_NAME;
......
drivers/media/pci/bt8xx/bttv-input.c
View file @ 6d741bfe
...@@ -69,12 +69,13 @@ static void ir_handle_key(struct bttv *btv) ...@@ -69,12 +69,13 @@ static void ir_handle_key(struct bttv *btv)
if ((ir->mask_keydown && (gpio & ir->mask_keydown)) || if ((ir->mask_keydown && (gpio & ir->mask_keydown)) ||
(ir->mask_keyup && !(gpio & ir->mask_keyup))) { (ir->mask_keyup && !(gpio & ir->mask_keyup))) {
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data, 0);
} else { } else {
/* HACK: Probably, ir->mask_keydown is missing /* HACK: Probably, ir->mask_keydown is missing
for this board */ for this board */
if (btv->c.type == BTTV_BOARD_WINFAST2000) if (btv->c.type == BTTV_BOARD_WINFAST2000)
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
rc_keyup(ir->dev); rc_keyup(ir->dev);
} }
...@@ -99,7 +100,7 @@ static void ir_enltv_handle_key(struct bttv *btv) ...@@ -99,7 +100,7 @@ static void ir_enltv_handle_key(struct bttv *btv)
gpio, data, gpio, data,
(gpio & ir->mask_keyup) ? " up" : "up/down"); (gpio & ir->mask_keyup) ? " up" : "up/down");
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data, 0);
if (keyup) if (keyup)
rc_keyup(ir->dev); rc_keyup(ir->dev);
} else { } else {
...@@ -113,7 +114,8 @@ static void ir_enltv_handle_key(struct bttv *btv) ...@@ -113,7 +114,8 @@ static void ir_enltv_handle_key(struct bttv *btv)
if (keyup) if (keyup)
rc_keyup(ir->dev); rc_keyup(ir->dev);
else else
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
} }
ir->last_gpio = data | keyup; ir->last_gpio = data | keyup;
...@@ -235,7 +237,7 @@ static void bttv_rc5_timer_end(unsigned long data) ...@@ -235,7 +237,7 @@ static void bttv_rc5_timer_end(unsigned long data)
} }
scancode = RC_SCANCODE_RC5(system, command); scancode = RC_SCANCODE_RC5(system, command);
rc_keydown(ir->dev, RC_TYPE_RC5, scancode, toggle); rc_keydown(ir->dev, RC_PROTO_RC5, scancode, toggle);
dprintk("scancode %x, toggle %x\n", scancode, toggle); dprintk("scancode %x, toggle %x\n", scancode, toggle);
} }
...@@ -327,7 +329,7 @@ static void bttv_ir_stop(struct bttv *btv) ...@@ -327,7 +329,7 @@ static void bttv_ir_stop(struct bttv *btv)
* Get_key functions used by I2C remotes * Get_key functions used by I2C remotes
*/ */
static int get_key_pv951(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pv951(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -355,7 +357,7 @@ static int get_key_pv951(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -355,7 +357,7 @@ static int get_key_pv951(struct IR_i2c *ir, enum rc_type *protocol,
* the device is bound to the vendor-provided RC. * the device is bound to the vendor-provided RC.
*/ */
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
......
drivers/media/pci/cx18/cx18-i2c.c
View file @ 6d741bfe
...@@ -93,8 +93,8 @@ static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw, ...@@ -93,8 +93,8 @@ static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw,
case CX18_HW_Z8F0811_IR_RX_HAUP: case CX18_HW_Z8F0811_IR_RX_HAUP:
init_data->ir_codes = RC_MAP_HAUPPAUGE; init_data->ir_codes = RC_MAP_HAUPPAUGE;
init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
init_data->type = RC_BIT_RC5 | RC_BIT_RC6_MCE | init_data->type = RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_MCE |
RC_BIT_RC6_6A_32; RC_PROTO_BIT_RC6_6A_32;
init_data->name = cx->card_name; init_data->name = cx->card_name;
info.platform_data = init_data; info.platform_data = init_data;
break; break;
......
drivers/media/pci/cx23885/cx23885-input.c
View file @ 6d741bfe
...@@ -284,32 +284,32 @@ int cx23885_input_init(struct cx23885_dev *dev) ...@@ -284,32 +284,32 @@ int cx23885_input_init(struct cx23885_dev *dev)
case CX23885_BOARD_HAUPPAUGE_HVR1290: case CX23885_BOARD_HAUPPAUGE_HVR1290:
case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_HAUPPAUGE_HVR1250:
/* Integrated CX2388[58] IR controller */ /* Integrated CX2388[58] IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
/* The grey Hauppauge RC-5 remote */ /* The grey Hauppauge RC-5 remote */
rc_map = RC_MAP_HAUPPAUGE; rc_map = RC_MAP_HAUPPAUGE;
break; break;
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
/* The grey Terratec remote with orange buttons */ /* The grey Terratec remote with orange buttons */
rc_map = RC_MAP_NEC_TERRATEC_CINERGY_XS; rc_map = RC_MAP_NEC_TERRATEC_CINERGY_XS;
break; break;
case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_TEVII_S470:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
/* A guess at the remote */ /* A guess at the remote */
rc_map = RC_MAP_TEVII_NEC; rc_map = RC_MAP_TEVII_NEC;
break; break;
case CX23885_BOARD_MYGICA_X8507: case CX23885_BOARD_MYGICA_X8507:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
/* A guess at the remote */ /* A guess at the remote */
rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02; rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
break; break;
case CX23885_BOARD_TBS_6980: case CX23885_BOARD_TBS_6980:
case CX23885_BOARD_TBS_6981: case CX23885_BOARD_TBS_6981:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
/* A guess at the remote */ /* A guess at the remote */
rc_map = RC_MAP_TBS_NEC; rc_map = RC_MAP_TBS_NEC;
break; break;
...@@ -320,12 +320,12 @@ int cx23885_input_init(struct cx23885_dev *dev) ...@@ -320,12 +320,12 @@ int cx23885_input_init(struct cx23885_dev *dev)
case CX23885_BOARD_DVBSKY_S952: case CX23885_BOARD_DVBSKY_S952:
case CX23885_BOARD_DVBSKY_T982: case CX23885_BOARD_DVBSKY_T982:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
rc_map = RC_MAP_DVBSKY; rc_map = RC_MAP_DVBSKY;
break; break;
case CX23885_BOARD_TT_CT2_4500_CI: case CX23885_BOARD_TT_CT2_4500_CI:
/* Integrated CX23885 IR controller */ /* Integrated CX23885 IR controller */
allowed_protos = RC_BIT_ALL_IR_DECODER; allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
rc_map = RC_MAP_TT_1500; rc_map = RC_MAP_TT_1500;
break; break;
default: default:
......
drivers/media/pci/cx88/cx88-input.c
View file @ 6d741bfe
...@@ -132,7 +132,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) ...@@ -132,7 +132,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
data = (data << 4) | ((gpio_key & 0xf0) >> 4); data = (data << 4) | ((gpio_key & 0xf0) >> 4);
rc_keydown(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown(ir->dev, RC_PROTO_UNKNOWN, data, 0);
} else if (ir->core->boardnr == CX88_BOARD_PROLINK_PLAYTVPVR || } else if (ir->core->boardnr == CX88_BOARD_PROLINK_PLAYTVPVR ||
ir->core->boardnr == CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO) { ir->core->boardnr == CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO) {
...@@ -146,7 +146,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) ...@@ -146,7 +146,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
scancode = RC_SCANCODE_NECX(addr, cmd); scancode = RC_SCANCODE_NECX(addr, cmd);
if (0 == (gpio & ir->mask_keyup)) if (0 == (gpio & ir->mask_keyup))
rc_keydown_notimeout(ir->dev, RC_TYPE_NECX, scancode, rc_keydown_notimeout(ir->dev, RC_PROTO_NECX, scancode,
0); 0);
else else
rc_keyup(ir->dev); rc_keyup(ir->dev);
...@@ -154,20 +154,22 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) ...@@ -154,20 +154,22 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
} else if (ir->mask_keydown) { } else if (ir->mask_keydown) {
/* bit set on keydown */ /* bit set on keydown */
if (gpio & ir->mask_keydown) if (gpio & ir->mask_keydown)
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
else else
rc_keyup(ir->dev); rc_keyup(ir->dev);
} else if (ir->mask_keyup) { } else if (ir->mask_keyup) {
/* bit cleared on keydown */ /* bit cleared on keydown */
if (0 == (gpio & ir->mask_keyup)) if (0 == (gpio & ir->mask_keyup))
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
else else
rc_keyup(ir->dev); rc_keyup(ir->dev);
} else { } else {
/* can't distinguish keydown/up :-/ */ /* can't distinguish keydown/up :-/ */
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data, 0);
rc_keyup(ir->dev); rc_keyup(ir->dev);
} }
} }
...@@ -267,7 +269,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ...@@ -267,7 +269,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
struct cx88_IR *ir; struct cx88_IR *ir;
struct rc_dev *dev; struct rc_dev *dev;
char *ir_codes = NULL; char *ir_codes = NULL;
u64 rc_type = RC_BIT_OTHER; u64 rc_proto = RC_PROTO_BIT_OTHER;
int err = -ENOMEM; int err = -ENOMEM;
u32 hardware_mask = 0; /* For devices with a hardware mask, when u32 hardware_mask = 0; /* For devices with a hardware mask, when
* used with a full-code IR table * used with a full-code IR table
...@@ -348,7 +350,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ...@@ -348,7 +350,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
* 002-T mini RC, provided with newer PV hardware * 002-T mini RC, provided with newer PV hardware
*/ */
ir_codes = RC_MAP_PIXELVIEW_MK12; ir_codes = RC_MAP_PIXELVIEW_MK12;
rc_type = RC_BIT_NECX; rc_proto = RC_PROTO_BIT_NECX;
ir->gpio_addr = MO_GP1_IO; ir->gpio_addr = MO_GP1_IO;
ir->mask_keyup = 0x80; ir->mask_keyup = 0x80;
ir->polling = 10; /* ms */ ir->polling = 10; /* ms */
...@@ -487,7 +489,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ...@@ -487,7 +489,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
dev->timeout = 10 * 1000 * 1000; /* 10 ms */ dev->timeout = 10 * 1000 * 1000; /* 10 ms */
} else { } else {
dev->driver_type = RC_DRIVER_SCANCODE; dev->driver_type = RC_DRIVER_SCANCODE;
dev->allowed_protocols = rc_type; dev->allowed_protocols = rc_proto;
} }
ir->core = core; ir->core = core;
...@@ -557,7 +559,7 @@ void cx88_ir_irq(struct cx88_core *core) ...@@ -557,7 +559,7 @@ void cx88_ir_irq(struct cx88_core *core)
ir_raw_event_handle(ir->dev); ir_raw_event_handle(ir->dev);
} }
static int get_key_pvr2000(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pvr2000(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
int flags, code; int flags, code;
...@@ -582,7 +584,7 @@ static int get_key_pvr2000(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -582,7 +584,7 @@ static int get_key_pvr2000(struct IR_i2c *ir, enum rc_type *protocol,
dprintk("IR Key/Flags: (0x%02x/0x%02x)\n", dprintk("IR Key/Flags: (0x%02x/0x%02x)\n",
code & 0xff, flags & 0xff); code & 0xff, flags & 0xff);
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = code & 0xff; *scancode = code & 0xff;
*toggle = 0; *toggle = 0;
return 1; return 1;
...@@ -612,7 +614,7 @@ void cx88_i2c_init_ir(struct cx88_core *core) ...@@ -612,7 +614,7 @@ void cx88_i2c_init_ir(struct cx88_core *core)
case CX88_BOARD_LEADTEK_PVR2000: case CX88_BOARD_LEADTEK_PVR2000:
addr_list = pvr2000_addr_list; addr_list = pvr2000_addr_list;
core->init_data.name = "cx88 Leadtek PVR 2000 remote"; core->init_data.name = "cx88 Leadtek PVR 2000 remote";
core->init_data.type = RC_BIT_UNKNOWN; core->init_data.type = RC_PROTO_BIT_UNKNOWN;
core->init_data.get_key = get_key_pvr2000; core->init_data.get_key = get_key_pvr2000;
core->init_data.ir_codes = RC_MAP_EMPTY; core->init_data.ir_codes = RC_MAP_EMPTY;
break; break;
...@@ -633,8 +635,8 @@ void cx88_i2c_init_ir(struct cx88_core *core) ...@@ -633,8 +635,8 @@ void cx88_i2c_init_ir(struct cx88_core *core)
/* Hauppauge XVR */ /* Hauppauge XVR */
core->init_data.name = "cx88 Hauppauge XVR remote"; core->init_data.name = "cx88 Hauppauge XVR remote";
core->init_data.ir_codes = RC_MAP_HAUPPAUGE; core->init_data.ir_codes = RC_MAP_HAUPPAUGE;
core->init_data.type = RC_BIT_RC5 | RC_BIT_RC6_MCE | core->init_data.type = RC_PROTO_BIT_RC5 |
RC_BIT_RC6_6A_32; RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_RC6_6A_32;
core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; core->init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
info.platform_data = &core->init_data; info.platform_data = &core->init_data;
......
drivers/media/pci/dm1105/dm1105.c
View file @ 6d741bfe
...@@ -675,7 +675,7 @@ static void dm1105_emit_key(struct work_struct *work) ...@@ -675,7 +675,7 @@ static void dm1105_emit_key(struct work_struct *work)
data = (ircom >> 8) & 0x7f; data = (ircom >> 8) & 0x7f;
/* FIXME: UNKNOWN because we don't generate a full NEC scancode (yet?) */ /* FIXME: UNKNOWN because we don't generate a full NEC scancode (yet?) */
rc_keydown(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown(ir->dev, RC_PROTO_UNKNOWN, data, 0);
} }
/* work handler */ /* work handler */
......
drivers/media/pci/ivtv/ivtv-i2c.c
View file @ 6d741bfe
...@@ -148,7 +148,7 @@ static const char * const hw_devicenames[] = { ...@@ -148,7 +148,7 @@ static const char * const hw_devicenames[] = {
"ir_video", /* IVTV_HW_I2C_IR_RX_ADAPTEC */ "ir_video", /* IVTV_HW_I2C_IR_RX_ADAPTEC */
}; };
static int get_key_adaptec(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_adaptec(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char keybuf[4]; unsigned char keybuf[4];
...@@ -168,7 +168,7 @@ static int get_key_adaptec(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -168,7 +168,7 @@ static int get_key_adaptec(struct IR_i2c *ir, enum rc_type *protocol,
keybuf[2] &= 0x7f; keybuf[2] &= 0x7f;
keybuf[3] |= 0x80; keybuf[3] |= 0x80;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = keybuf[3] | keybuf[2] << 8 | keybuf[1] << 16 |keybuf[0] << 24; *scancode = keybuf[3] | keybuf[2] << 8 | keybuf[1] << 16 |keybuf[0] << 24;
*toggle = 0; *toggle = 0;
return 1; return 1;
...@@ -201,22 +201,22 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr) ...@@ -201,22 +201,22 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS; init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
init_data->internal_get_key_func = init_data->internal_get_key_func =
IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; IR_KBD_GET_KEY_AVERMEDIA_CARDBUS;
init_data->type = RC_BIT_OTHER; init_data->type = RC_PROTO_BIT_OTHER;
init_data->name = "AVerMedia AVerTV card"; init_data->name = "AVerMedia AVerTV card";
break; break;
case IVTV_HW_I2C_IR_RX_HAUP_EXT: case IVTV_HW_I2C_IR_RX_HAUP_EXT:
case IVTV_HW_I2C_IR_RX_HAUP_INT: case IVTV_HW_I2C_IR_RX_HAUP_INT:
init_data->ir_codes = RC_MAP_HAUPPAUGE; init_data->ir_codes = RC_MAP_HAUPPAUGE;
init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
init_data->type = RC_BIT_RC5; init_data->type = RC_PROTO_BIT_RC5;
init_data->name = itv->card_name; init_data->name = itv->card_name;
break; break;
case IVTV_HW_Z8F0811_IR_RX_HAUP: case IVTV_HW_Z8F0811_IR_RX_HAUP:
/* Default to grey remote */ /* Default to grey remote */
init_data->ir_codes = RC_MAP_HAUPPAUGE; init_data->ir_codes = RC_MAP_HAUPPAUGE;
init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
init_data->type = RC_BIT_RC5 | RC_BIT_RC6_MCE | init_data->type = RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_MCE |
RC_BIT_RC6_6A_32; RC_PROTO_BIT_RC6_6A_32;
init_data->name = itv->card_name; init_data->name = itv->card_name;
break; break;
case IVTV_HW_I2C_IR_RX_ADAPTEC: case IVTV_HW_I2C_IR_RX_ADAPTEC:
...@@ -224,7 +224,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr) ...@@ -224,7 +224,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
init_data->name = itv->card_name; init_data->name = itv->card_name;
/* FIXME: The protocol and RC_MAP needs to be corrected */ /* FIXME: The protocol and RC_MAP needs to be corrected */
init_data->ir_codes = RC_MAP_EMPTY; init_data->ir_codes = RC_MAP_EMPTY;
init_data->type = RC_BIT_UNKNOWN; init_data->type = RC_PROTO_BIT_UNKNOWN;
break; break;
} }
......
drivers/media/pci/mantis/mantis_input.c
View file @ 6d741bfe
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
void mantis_input_process(struct mantis_pci *mantis, int scancode) void mantis_input_process(struct mantis_pci *mantis, int scancode)
{ {
if (mantis->rc) if (mantis->rc)
rc_keydown(mantis->rc, RC_TYPE_UNKNOWN, scancode, 0); rc_keydown(mantis->rc, RC_PROTO_UNKNOWN, scancode, 0);
} }
int mantis_input_init(struct mantis_pci *mantis) int mantis_input_init(struct mantis_pci *mantis)
......
drivers/media/pci/saa7134/saa7134-input.c
View file @ 6d741bfe
...@@ -83,14 +83,16 @@ static int build_key(struct saa7134_dev *dev) ...@@ -83,14 +83,16 @@ static int build_key(struct saa7134_dev *dev)
if (data == ir->mask_keycode) if (data == ir->mask_keycode)
rc_keyup(ir->dev); rc_keyup(ir->dev);
else else
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
return 0; return 0;
} }
if (ir->polling) { if (ir->polling) {
if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) ||
(ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) {
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
} else { } else {
rc_keyup(ir->dev); rc_keyup(ir->dev);
} }
...@@ -98,7 +100,8 @@ static int build_key(struct saa7134_dev *dev) ...@@ -98,7 +100,8 @@ static int build_key(struct saa7134_dev *dev)
else { /* IRQ driven mode - handle key press and release in one go */ else { /* IRQ driven mode - handle key press and release in one go */
if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) ||
(ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) {
rc_keydown_notimeout(ir->dev, RC_TYPE_UNKNOWN, data, 0); rc_keydown_notimeout(ir->dev, RC_PROTO_UNKNOWN, data,
0);
rc_keyup(ir->dev); rc_keyup(ir->dev);
} }
} }
...@@ -108,7 +111,7 @@ static int build_key(struct saa7134_dev *dev) ...@@ -108,7 +111,7 @@ static int build_key(struct saa7134_dev *dev)
/* --------------------- Chip specific I2C key builders ----------------- */ /* --------------------- Chip specific I2C key builders ----------------- */
static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
int gpio; int gpio;
...@@ -154,13 +157,14 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -154,13 +157,14 @@ static int get_key_flydvb_trio(struct IR_i2c *ir, enum rc_type *protocol,
return -EIO; return -EIO;
} }
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir,
enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -201,14 +205,14 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, enum rc_type *protocol ...@@ -201,14 +205,14 @@ static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, enum rc_type *protocol
/* Button pressed */ /* Button pressed */
input_dbg("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b); input_dbg("get_key_msi_tvanywhere_plus: Key = 0x%02X\n", b);
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
/* copied and modified from get_key_msi_tvanywhere_plus() */ /* copied and modified from get_key_msi_tvanywhere_plus() */
static int get_key_kworld_pc150u(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_kworld_pc150u(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -249,13 +253,13 @@ static int get_key_kworld_pc150u(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -249,13 +253,13 @@ static int get_key_kworld_pc150u(struct IR_i2c *ir, enum rc_type *protocol,
/* Button pressed */ /* Button pressed */
input_dbg("get_key_kworld_pc150u: Key = 0x%02X\n", b); input_dbg("get_key_kworld_pc150u: Key = 0x%02X\n", b);
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_purpletv(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_purpletv(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char b; unsigned char b;
...@@ -274,13 +278,13 @@ static int get_key_purpletv(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -274,13 +278,13 @@ static int get_key_purpletv(struct IR_i2c *ir, enum rc_type *protocol,
if (b & 0x80) if (b & 0x80)
return 1; return 1;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = b; *scancode = b;
*toggle = 0; *toggle = 0;
return 1; return 1;
} }
static int get_key_hvr1110(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_hvr1110(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char buf[5]; unsigned char buf[5];
...@@ -304,14 +308,14 @@ static int get_key_hvr1110(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -304,14 +308,14 @@ static int get_key_hvr1110(struct IR_i2c *ir, enum rc_type *protocol,
* *
* FIXME: start bits could maybe be used...? * FIXME: start bits could maybe be used...?
*/ */
*protocol = RC_TYPE_RC5; *protocol = RC_PROTO_RC5;
*scancode = RC_SCANCODE_RC5(buf[3] & 0x1f, buf[4] >> 2); *scancode = RC_SCANCODE_RC5(buf[3] & 0x1f, buf[4] >> 2);
*toggle = !!(buf[3] & 0x40); *toggle = !!(buf[3] & 0x40);
return 1; return 1;
} }
static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
unsigned char data[12]; unsigned char data[12];
...@@ -338,7 +342,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -338,7 +342,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol,
if (data[9] != (unsigned char)(~data[8])) if (data[9] != (unsigned char)(~data[8]))
return 0; return 0;
*protocol = RC_TYPE_NECX; *protocol = RC_PROTO_NECX;
*scancode = RC_SCANCODE_NECX(data[11] << 8 | data[10], data[9]); *scancode = RC_SCANCODE_NECX(data[11] << 8 | data[10], data[9]);
*toggle = 0; *toggle = 0;
return 1; return 1;
...@@ -347,7 +351,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -347,7 +351,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol,
/* Common (grey or coloured) pinnacle PCTV remote handling /* Common (grey or coloured) pinnacle PCTV remote handling
* *
*/ */
static int get_key_pinnacle(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pinnacle(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle, int parity_offset, u32 *scancode, u8 *toggle, int parity_offset,
int marker, int code_modulo) int marker, int code_modulo)
{ {
...@@ -384,7 +388,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -384,7 +388,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, enum rc_type *protocol,
code %= code_modulo; code %= code_modulo;
*protocol = RC_TYPE_UNKNOWN; *protocol = RC_PROTO_UNKNOWN;
*scancode = code; *scancode = code;
*toggle = 0; *toggle = 0;
...@@ -401,7 +405,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -401,7 +405,7 @@ static int get_key_pinnacle(struct IR_i2c *ir, enum rc_type *protocol,
* *
* Sylvain Pasche <sylvain.pasche@gmail.com> * Sylvain Pasche <sylvain.pasche@gmail.com>
*/ */
static int get_key_pinnacle_grey(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pinnacle_grey(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
...@@ -413,7 +417,7 @@ static int get_key_pinnacle_grey(struct IR_i2c *ir, enum rc_type *protocol, ...@@ -413,7 +417,7 @@ static int get_key_pinnacle_grey(struct IR_i2c *ir, enum rc_type *protocol,
* *
* Ricardo Cerqueira <v4l@cerqueira.org> * Ricardo Cerqueira <v4l@cerqueira.org>
*/ */
static int get_key_pinnacle_color(struct IR_i2c *ir, enum rc_type *protocol, static int get_key_pinnacle_color(struct IR_i2c *ir, enum rc_proto *protocol,
u32 *scancode, u8 *toggle) u32 *scancode, u8 *toggle)
{ {
/* code_modulo parameter (0x88) is used to reduce code value to fit inside IR_KEYTAB_SIZE /* code_modulo parameter (0x88) is used to reduce code value to fit inside IR_KEYTAB_SIZE
...@@ -858,7 +862,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) ...@@ -858,7 +862,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
rc->close = saa7134_ir_close; rc->close = saa7134_ir_close;
if (raw_decode) { if (raw_decode) {
rc->driver_type = RC_DRIVER_IR_RAW; rc->driver_type = RC_DRIVER_IR_RAW;
rc->allowed_protocols = RC_BIT_ALL_IR_DECODER; rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
} }
rc->device_name = ir->name; rc->device_name = ir->name;
...@@ -1022,7 +1026,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev) ...@@ -1022,7 +1026,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
dev->init_data.name = "BeholdTV"; dev->init_data.name = "BeholdTV";
dev->init_data.get_key = get_key_beholdm6xx; dev->init_data.get_key = get_key_beholdm6xx;
dev->init_data.ir_codes = RC_MAP_BEHOLD; dev->init_data.ir_codes = RC_MAP_BEHOLD;
dev->init_data.type = RC_BIT_NECX; dev->init_data.type = RC_PROTO_BIT_NECX;
info.addr = 0x2d; info.addr = 0x2d;
break; break;
case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
......
drivers/media/pci/smipcie/smipcie-ir.c
View file @ 6d741bfe
...@@ -144,7 +144,7 @@ static void smi_ir_decode(struct work_struct *work) ...@@ -144,7 +144,7 @@ static void smi_ir_decode(struct work_struct *work)
rc5_system = (dwIRCode & 0x7C0) >> 6; rc5_system = (dwIRCode & 0x7C0) >> 6;
toggle = (dwIRCode & 0x800) ? 1 : 0; toggle = (dwIRCode & 0x800) ? 1 : 0;
scancode = rc5_system << 8 | rc5_command; scancode = rc5_system << 8 | rc5_command;
rc_keydown(rc_dev, RC_TYPE_RC5, scancode, toggle); rc_keydown(rc_dev, RC_PROTO_RC5, scancode, toggle);
} }
} }
end_ir_decode: end_ir_decode:
......
drivers/media/pci/ttpci/budget-ci.c
View file @ 6d741bfe
...@@ -158,14 +158,15 @@ static void msp430_ir_interrupt(unsigned long data) ...@@ -158,14 +158,15 @@ static void msp430_ir_interrupt(unsigned long data)
return; return;
if (budget_ci->ir.full_rc5) { if (budget_ci->ir.full_rc5) {
rc_keydown(dev, RC_TYPE_RC5, rc_keydown(dev, RC_PROTO_RC5,
RC_SCANCODE_RC5(budget_ci->ir.rc5_device, budget_ci->ir.ir_key), RC_SCANCODE_RC5(budget_ci->ir.rc5_device, budget_ci->ir.ir_key),
!!(command & 0x20)); !!(command & 0x20));
return; return;
} }
/* FIXME: We should generate complete scancodes for all devices */ /* FIXME: We should generate complete scancodes for all devices */
rc_keydown(dev, RC_TYPE_UNKNOWN, budget_ci->ir.ir_key, !!(command & 0x20)); rc_keydown(dev, RC_PROTO_UNKNOWN, budget_ci->ir.ir_key,
!!(command & 0x20));
} }
static int msp430_ir_init(struct budget_ci *budget_ci) static int msp430_ir_init(struct budget_ci *budget_ci)
......
drivers/media/rc/ati_remote.c
View file @ 6d741bfe
...@@ -622,7 +622,8 @@ static void ati_remote_input_report(struct urb *urb) ...@@ -622,7 +622,8 @@ static void ati_remote_input_report(struct urb *urb)
* it would cause ghost repeats which would be a * it would cause ghost repeats which would be a
* regression for this driver. * regression for this driver.
*/ */
rc_keydown_notimeout(ati_remote->rdev, RC_TYPE_OTHER, rc_keydown_notimeout(ati_remote->rdev,
RC_PROTO_OTHER,
scancode, data[2]); scancode, data[2]);
rc_keyup(ati_remote->rdev); rc_keyup(ati_remote->rdev);
} }
...@@ -760,7 +761,7 @@ static void ati_remote_rc_init(struct ati_remote *ati_remote) ...@@ -760,7 +761,7 @@ static void ati_remote_rc_init(struct ati_remote *ati_remote)
struct rc_dev *rdev = ati_remote->rdev; struct rc_dev *rdev = ati_remote->rdev;
rdev->priv = ati_remote; rdev->priv = ati_remote;
rdev->allowed_protocols = RC_BIT_OTHER; rdev->allowed_protocols = RC_PROTO_BIT_OTHER;
rdev->driver_name = "ati_remote"; rdev->driver_name = "ati_remote";
rdev->open = ati_remote_rc_open; rdev->open = ati_remote_rc_open;
......
drivers/media/rc/ene_ir.c
View file @ 6d741bfe
...@@ -1053,7 +1053,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id) ...@@ -1053,7 +1053,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
if (!dev->hw_learning_and_tx_capable) if (!dev->hw_learning_and_tx_capable)
learning_mode_force = false; learning_mode_force = false;
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rdev->priv = dev; rdev->priv = dev;
rdev->open = ene_open; rdev->open = ene_open;
rdev->close = ene_close; rdev->close = ene_close;
......
drivers/media/rc/fintek-cir.c
View file @ 6d741bfe
...@@ -529,7 +529,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id ...@@ -529,7 +529,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
/* Set up the rc device */ /* Set up the rc device */
rdev->priv = fintek; rdev->priv = fintek;
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rdev->open = fintek_open; rdev->open = fintek_open;
rdev->close = fintek_close; rdev->close = fintek_close;
rdev->device_name = FINTEK_DESCRIPTION; rdev->device_name = FINTEK_DESCRIPTION;
......
drivers/media/rc/gpio-ir-recv.c
View file @ 6d741bfe
...@@ -143,7 +143,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) ...@@ -143,7 +143,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
if (pdata->allowed_protos) if (pdata->allowed_protos)
rcdev->allowed_protocols = pdata->allowed_protos; rcdev->allowed_protocols = pdata->allowed_protos;
else else
rcdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rcdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY; rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
gpio_dev->rcdev = rcdev; gpio_dev->rcdev = rcdev;
......
drivers/media/rc/igorplugusb.c
View file @ 6d741bfe
...@@ -202,10 +202,11 @@ static int igorplugusb_probe(struct usb_interface *intf, ...@@ -202,10 +202,11 @@ static int igorplugusb_probe(struct usb_interface *intf,
* This device can only store 36 pulses + spaces, which is not enough * This device can only store 36 pulses + spaces, which is not enough
* for the NEC protocol and many others. * for the NEC protocol and many others.
*/ */
rc->allowed_protocols = RC_BIT_ALL_IR_DECODER & ~(RC_BIT_NEC | rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER &
RC_BIT_NECX | RC_BIT_NEC32 | RC_BIT_RC6_6A_20 | ~(RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32 |
RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE | RC_PROTO_BIT_RC6_6A_20 | RC_PROTO_BIT_RC6_6A_24 |
RC_BIT_SONY20 | RC_BIT_SANYO); RC_PROTO_BIT_RC6_6A_32 | RC_PROTO_BIT_RC6_MCE |
RC_PROTO_BIT_SONY20 | RC_PROTO_BIT_SANYO);
rc->priv = ir; rc->priv = ir;
rc->driver_name = DRIVER_NAME; rc->driver_name = DRIVER_NAME;
......
drivers/media/rc/iguanair.c
View file @ 6d741bfe
...@@ -491,7 +491,7 @@ static int iguanair_probe(struct usb_interface *intf, ...@@ -491,7 +491,7 @@ static int iguanair_probe(struct usb_interface *intf,
rc->input_phys = ir->phys; rc->input_phys = ir->phys;
usb_to_input_id(ir->udev, &rc->input_id); usb_to_input_id(ir->udev, &rc->input_id);
rc->dev.parent = &intf->dev; rc->dev.parent = &intf->dev;
rc->allowed_protocols = RC_BIT_ALL_IR_DECODER; rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rc->priv = ir; rc->priv = ir;
rc->open = iguanair_open; rc->open = iguanair_open;
rc->close = iguanair_close; rc->close = iguanair_close;
......
drivers/media/rc/img-ir/img-ir-hw.c
View file @ 6d741bfe
...@@ -589,7 +589,7 @@ static void img_ir_set_decoder(struct img_ir_priv *priv, ...@@ -589,7 +589,7 @@ static void img_ir_set_decoder(struct img_ir_priv *priv,
/* clear the wakeup scancode filter */ /* clear the wakeup scancode filter */
rdev->scancode_wakeup_filter.data = 0; rdev->scancode_wakeup_filter.data = 0;
rdev->scancode_wakeup_filter.mask = 0; rdev->scancode_wakeup_filter.mask = 0;
rdev->wakeup_protocol = RC_TYPE_UNKNOWN; rdev->wakeup_protocol = RC_PROTO_UNKNOWN;
/* clear raw filters */ /* clear raw filters */
_img_ir_set_filter(priv, NULL); _img_ir_set_filter(priv, NULL);
...@@ -823,7 +823,7 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw) ...@@ -823,7 +823,7 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
int ret = IMG_IR_SCANCODE; int ret = IMG_IR_SCANCODE;
struct img_ir_scancode_req request; struct img_ir_scancode_req request;
request.protocol = RC_TYPE_UNKNOWN; request.protocol = RC_PROTO_UNKNOWN;
request.toggle = 0; request.toggle = 0;
if (dec->scancode) if (dec->scancode)
......
drivers/media/rc/img-ir/img-ir-hw.h
View file @ 6d741bfe
...@@ -135,13 +135,13 @@ struct img_ir_timing_regvals { ...@@ -135,13 +135,13 @@ struct img_ir_timing_regvals {
/** /**
* struct img_ir_scancode_req - Scancode request data. * struct img_ir_scancode_req - Scancode request data.
* @protocol: Protocol code of received message (defaults to * @protocol: Protocol code of received message (defaults to
* RC_TYPE_UNKNOWN). * RC_PROTO_UNKNOWN).
* @scancode: Scan code of received message (must be written by * @scancode: Scan code of received message (must be written by
* handler if IMG_IR_SCANCODE is returned). * handler if IMG_IR_SCANCODE is returned).
* @toggle: Toggle bit (defaults to 0). * @toggle: Toggle bit (defaults to 0).
*/ */
struct img_ir_scancode_req { struct img_ir_scancode_req {
enum rc_type protocol; enum rc_proto protocol;
u32 scancode; u32 scancode;
u8 toggle; u8 toggle;
}; };
......
drivers/media/rc/img-ir/img-ir-jvc.c
View file @ 6d741bfe
...@@ -23,7 +23,7 @@ static int img_ir_jvc_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -23,7 +23,7 @@ static int img_ir_jvc_scancode(int len, u64 raw, u64 enabled_protocols,
cust = (raw >> 0) & 0xff; cust = (raw >> 0) & 0xff;
data = (raw >> 8) & 0xff; data = (raw >> 8) & 0xff;
request->protocol = RC_TYPE_JVC; request->protocol = RC_PROTO_JVC;
request->scancode = cust << 8 | data; request->scancode = cust << 8 | data;
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
} }
...@@ -52,7 +52,7 @@ static int img_ir_jvc_filter(const struct rc_scancode_filter *in, ...@@ -52,7 +52,7 @@ static int img_ir_jvc_filter(const struct rc_scancode_filter *in,
* http://support.jvc.com/consumer/support/documents/RemoteCodes.pdf * http://support.jvc.com/consumer/support/documents/RemoteCodes.pdf
*/ */
struct img_ir_decoder img_ir_jvc = { struct img_ir_decoder img_ir_jvc = {
.type = RC_BIT_JVC, .type = RC_PROTO_BIT_JVC,
.control = { .control = {
.decoden = 1, .decoden = 1,
.code_type = IMG_IR_CODETYPE_PULSEDIST, .code_type = IMG_IR_CODETYPE_PULSEDIST,
......
drivers/media/rc/img-ir/img-ir-nec.c
View file @ 6d741bfe
...@@ -35,20 +35,20 @@ static int img_ir_nec_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -35,20 +35,20 @@ static int img_ir_nec_scancode(int len, u64 raw, u64 enabled_protocols,
bitrev8(addr_inv) << 16 | bitrev8(addr_inv) << 16 |
bitrev8(data) << 8 | bitrev8(data) << 8 |
bitrev8(data_inv); bitrev8(data_inv);
request->protocol = RC_TYPE_NEC32; request->protocol = RC_PROTO_NEC32;
} else if ((addr_inv ^ addr) != 0xff) { } else if ((addr_inv ^ addr) != 0xff) {
/* Extended NEC */ /* Extended NEC */
/* scan encoding: AAaaDD */ /* scan encoding: AAaaDD */
request->scancode = addr << 16 | request->scancode = addr << 16 |
addr_inv << 8 | addr_inv << 8 |
data; data;
request->protocol = RC_TYPE_NECX; request->protocol = RC_PROTO_NECX;
} else { } else {
/* Normal NEC */ /* Normal NEC */
/* scan encoding: AADD */ /* scan encoding: AADD */
request->scancode = addr << 8 | request->scancode = addr << 8 |
data; data;
request->protocol = RC_TYPE_NEC; request->protocol = RC_PROTO_NEC;
} }
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
} }
...@@ -63,7 +63,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in, ...@@ -63,7 +63,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
data = in->data & 0xff; data = in->data & 0xff;
data_m = in->mask & 0xff; data_m = in->mask & 0xff;
protocols &= RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32; protocols &= RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32;
/* /*
* If only one bit is set, we were requested to do an exact * If only one bit is set, we were requested to do an exact
...@@ -72,14 +72,14 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in, ...@@ -72,14 +72,14 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
*/ */
if (!is_power_of_2(protocols)) { if (!is_power_of_2(protocols)) {
if ((in->data | in->mask) & 0xff000000) if ((in->data | in->mask) & 0xff000000)
protocols = RC_BIT_NEC32; protocols = RC_PROTO_BIT_NEC32;
else if ((in->data | in->mask) & 0x00ff0000) else if ((in->data | in->mask) & 0x00ff0000)
protocols = RC_BIT_NECX; protocols = RC_PROTO_BIT_NECX;
else else
protocols = RC_BIT_NEC; protocols = RC_PROTO_BIT_NEC;
} }
if (protocols == RC_BIT_NEC32) { if (protocols == RC_PROTO_BIT_NEC32) {
/* 32-bit NEC (used by Apple and TiVo remotes) */ /* 32-bit NEC (used by Apple and TiVo remotes) */
/* scan encoding: as transmitted, MSBit = first received bit */ /* scan encoding: as transmitted, MSBit = first received bit */
addr = bitrev8(in->data >> 24); addr = bitrev8(in->data >> 24);
...@@ -90,7 +90,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in, ...@@ -90,7 +90,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
data_m = bitrev8(in->mask >> 8); data_m = bitrev8(in->mask >> 8);
data_inv = bitrev8(in->data >> 0); data_inv = bitrev8(in->data >> 0);
data_inv_m = bitrev8(in->mask >> 0); data_inv_m = bitrev8(in->mask >> 0);
} else if (protocols == RC_BIT_NECX) { } else if (protocols == RC_PROTO_BIT_NECX) {
/* Extended NEC */ /* Extended NEC */
/* scan encoding AAaaDD */ /* scan encoding AAaaDD */
addr = (in->data >> 16) & 0xff; addr = (in->data >> 16) & 0xff;
...@@ -128,7 +128,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in, ...@@ -128,7 +128,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
* http://wiki.altium.com/display/ADOH/NEC+Infrared+Transmission+Protocol * http://wiki.altium.com/display/ADOH/NEC+Infrared+Transmission+Protocol
*/ */
struct img_ir_decoder img_ir_nec = { struct img_ir_decoder img_ir_nec = {
.type = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32, .type = RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32,
.control = { .control = {
.decoden = 1, .decoden = 1,
.code_type = IMG_IR_CODETYPE_PULSEDIST, .code_type = IMG_IR_CODETYPE_PULSEDIST,
......
drivers/media/rc/img-ir/img-ir-rc5.c
View file @ 6d741bfe
...@@ -33,7 +33,7 @@ static int img_ir_rc5_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -33,7 +33,7 @@ static int img_ir_rc5_scancode(int len, u64 raw, u64 enabled_protocols,
if (!start) if (!start)
return -EINVAL; return -EINVAL;
request->protocol = RC_TYPE_RC5; request->protocol = RC_PROTO_RC5;
request->scancode = addr << 8 | cmd; request->scancode = addr << 8 | cmd;
request->toggle = tgl; request->toggle = tgl;
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
...@@ -52,7 +52,7 @@ static int img_ir_rc5_filter(const struct rc_scancode_filter *in, ...@@ -52,7 +52,7 @@ static int img_ir_rc5_filter(const struct rc_scancode_filter *in,
* see http://www.sbprojects.com/knowledge/ir/rc5.php * see http://www.sbprojects.com/knowledge/ir/rc5.php
*/ */
struct img_ir_decoder img_ir_rc5 = { struct img_ir_decoder img_ir_rc5 = {
.type = RC_BIT_RC5, .type = RC_PROTO_BIT_RC5,
.control = { .control = {
.bitoriend2 = 1, .bitoriend2 = 1,
.code_type = IMG_IR_CODETYPE_BIPHASE, .code_type = IMG_IR_CODETYPE_BIPHASE,
......
drivers/media/rc/img-ir/img-ir-rc6.c
View file @ 6d741bfe
...@@ -54,7 +54,7 @@ static int img_ir_rc6_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -54,7 +54,7 @@ static int img_ir_rc6_scancode(int len, u64 raw, u64 enabled_protocols,
if (mode) if (mode)
return -EINVAL; return -EINVAL;
request->protocol = RC_TYPE_RC6_0; request->protocol = RC_PROTO_RC6_0;
request->scancode = addr << 8 | cmd; request->scancode = addr << 8 | cmd;
request->toggle = trl2; request->toggle = trl2;
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
...@@ -73,7 +73,7 @@ static int img_ir_rc6_filter(const struct rc_scancode_filter *in, ...@@ -73,7 +73,7 @@ static int img_ir_rc6_filter(const struct rc_scancode_filter *in,
* see http://www.sbprojects.com/knowledge/ir/rc6.php * see http://www.sbprojects.com/knowledge/ir/rc6.php
*/ */
struct img_ir_decoder img_ir_rc6 = { struct img_ir_decoder img_ir_rc6 = {
.type = RC_BIT_RC6_0, .type = RC_PROTO_BIT_RC6_0,
.control = { .control = {
.bitorien = 1, .bitorien = 1,
.code_type = IMG_IR_CODETYPE_BIPHASE, .code_type = IMG_IR_CODETYPE_BIPHASE,
......
drivers/media/rc/img-ir/img-ir-sanyo.c
View file @ 6d741bfe
...@@ -44,7 +44,7 @@ static int img_ir_sanyo_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -44,7 +44,7 @@ static int img_ir_sanyo_scancode(int len, u64 raw, u64 enabled_protocols,
return -EINVAL; return -EINVAL;
/* Normal Sanyo */ /* Normal Sanyo */
request->protocol = RC_TYPE_SANYO; request->protocol = RC_PROTO_SANYO;
request->scancode = addr << 8 | data; request->scancode = addr << 8 | data;
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
} }
...@@ -80,7 +80,7 @@ static int img_ir_sanyo_filter(const struct rc_scancode_filter *in, ...@@ -80,7 +80,7 @@ static int img_ir_sanyo_filter(const struct rc_scancode_filter *in,
/* Sanyo decoder */ /* Sanyo decoder */
struct img_ir_decoder img_ir_sanyo = { struct img_ir_decoder img_ir_sanyo = {
.type = RC_BIT_SANYO, .type = RC_PROTO_BIT_SANYO,
.control = { .control = {
.decoden = 1, .decoden = 1,
.code_type = IMG_IR_CODETYPE_PULSEDIST, .code_type = IMG_IR_CODETYPE_PULSEDIST,
......
drivers/media/rc/img-ir/img-ir-sharp.c
View file @ 6d741bfe
...@@ -32,7 +32,7 @@ static int img_ir_sharp_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -32,7 +32,7 @@ static int img_ir_sharp_scancode(int len, u64 raw, u64 enabled_protocols,
/* probably the second half of the message */ /* probably the second half of the message */
return -EINVAL; return -EINVAL;
request->protocol = RC_TYPE_SHARP; request->protocol = RC_PROTO_SHARP;
request->scancode = addr << 8 | cmd; request->scancode = addr << 8 | cmd;
return IMG_IR_SCANCODE; return IMG_IR_SCANCODE;
} }
...@@ -73,7 +73,7 @@ static int img_ir_sharp_filter(const struct rc_scancode_filter *in, ...@@ -73,7 +73,7 @@ static int img_ir_sharp_filter(const struct rc_scancode_filter *in,
* See also http://www.sbprojects.com/knowledge/ir/sharp.php * See also http://www.sbprojects.com/knowledge/ir/sharp.php
*/ */
struct img_ir_decoder img_ir_sharp = { struct img_ir_decoder img_ir_sharp = {
.type = RC_BIT_SHARP, .type = RC_PROTO_BIT_SHARP,
.control = { .control = {
.decoden = 0, .decoden = 0,
.decodend2 = 1, .decodend2 = 1,
......
drivers/media/rc/img-ir/img-ir-sony.c
View file @ 6d741bfe
...@@ -19,32 +19,32 @@ static int img_ir_sony_scancode(int len, u64 raw, u64 enabled_protocols, ...@@ -19,32 +19,32 @@ static int img_ir_sony_scancode(int len, u64 raw, u64 enabled_protocols,
switch (len) { switch (len) {
case 12: case 12:
if (!(enabled_protocols & RC_BIT_SONY12)) if (!(enabled_protocols & RC_PROTO_BIT_SONY12))
return -EINVAL; return -EINVAL;
func = raw & 0x7f; /* first 7 bits */ func = raw & 0x7f; /* first 7 bits */
raw >>= 7; raw >>= 7;
dev = raw & 0x1f; /* next 5 bits */ dev = raw & 0x1f; /* next 5 bits */
subdev = 0; subdev = 0;
request->protocol = RC_TYPE_SONY12; request->protocol = RC_PROTO_SONY12;
break; break;
case 15: case 15:
if (!(enabled_protocols & RC_BIT_SONY15)) if (!(enabled_protocols & RC_PROTO_BIT_SONY15))
return -EINVAL; return -EINVAL;
func = raw & 0x7f; /* first 7 bits */ func = raw & 0x7f; /* first 7 bits */
raw >>= 7; raw >>= 7;
dev = raw & 0xff; /* next 8 bits */ dev = raw & 0xff; /* next 8 bits */
subdev = 0; subdev = 0;
request->protocol = RC_TYPE_SONY15; request->protocol = RC_PROTO_SONY15;
break; break;
case 20: case 20:
if (!(enabled_protocols & RC_BIT_SONY20)) if (!(enabled_protocols & RC_PROTO_BIT_SONY20))
return -EINVAL; return -EINVAL;
func = raw & 0x7f; /* first 7 bits */ func = raw & 0x7f; /* first 7 bits */
raw >>= 7; raw >>= 7;
dev = raw & 0x1f; /* next 5 bits */ dev = raw & 0x1f; /* next 5 bits */
raw >>= 5; raw >>= 5;
subdev = raw & 0xff; /* next 8 bits */ subdev = raw & 0xff; /* next 8 bits */
request->protocol = RC_TYPE_SONY20; request->protocol = RC_PROTO_SONY20;
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -68,7 +68,8 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in, ...@@ -68,7 +68,8 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in,
func = (in->data >> 0) & 0x7f; func = (in->data >> 0) & 0x7f;
func_m = (in->mask >> 0) & 0x7f; func_m = (in->mask >> 0) & 0x7f;
protocols &= RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20; protocols &= RC_PROTO_BIT_SONY12 | RC_PROTO_BIT_SONY15 |
RC_PROTO_BIT_SONY20;
/* /*
* If only one bit is set, we were requested to do an exact * If only one bit is set, we were requested to do an exact
...@@ -77,20 +78,20 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in, ...@@ -77,20 +78,20 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in,
*/ */
if (!is_power_of_2(protocols)) { if (!is_power_of_2(protocols)) {
if (subdev & subdev_m) if (subdev & subdev_m)
protocols = RC_BIT_SONY20; protocols = RC_PROTO_BIT_SONY20;
else if (dev & dev_m & 0xe0) else if (dev & dev_m & 0xe0)
protocols = RC_BIT_SONY15; protocols = RC_PROTO_BIT_SONY15;
else else
protocols = RC_BIT_SONY12; protocols = RC_PROTO_BIT_SONY12;
} }
if (protocols == RC_BIT_SONY20) { if (protocols == RC_PROTO_BIT_SONY20) {
/* can't encode subdev and higher device bits */ /* can't encode subdev and higher device bits */
if (dev & dev_m & 0xe0) if (dev & dev_m & 0xe0)
return -EINVAL; return -EINVAL;
len = 20; len = 20;
dev_m &= 0x1f; dev_m &= 0x1f;
} else if (protocols == RC_BIT_SONY15) { } else if (protocols == RC_PROTO_BIT_SONY15) {
len = 15; len = 15;
subdev_m = 0; subdev_m = 0;
} else { } else {
...@@ -128,7 +129,7 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in, ...@@ -128,7 +129,7 @@ static int img_ir_sony_filter(const struct rc_scancode_filter *in,
* http://picprojects.org.uk/projects/sirc/sonysirc.pdf * http://picprojects.org.uk/projects/sirc/sonysirc.pdf
*/ */
struct img_ir_decoder img_ir_sony = { struct img_ir_decoder img_ir_sony = {
.type = RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20, .type = RC_PROTO_BIT_SONY12 | RC_PROTO_BIT_SONY15 | RC_PROTO_BIT_SONY20,
.control = { .control = {
.decoden = 1, .decoden = 1,
.code_type = IMG_IR_CODETYPE_PULSELEN, .code_type = IMG_IR_CODETYPE_PULSELEN,
......
drivers/media/rc/imon.c
View file @ 6d741bfe
...@@ -148,7 +148,7 @@ struct imon_context { ...@@ -148,7 +148,7 @@ struct imon_context {
u32 last_keycode; /* last reported input keycode */ u32 last_keycode; /* last reported input keycode */
u32 rc_scancode; /* the computed remote scancode */ u32 rc_scancode; /* the computed remote scancode */
u8 rc_toggle; /* the computed remote toggle bit */ u8 rc_toggle; /* the computed remote toggle bit */
u64 rc_type; /* iMON or MCE (RC6) IR protocol? */ u64 rc_proto; /* iMON or MCE (RC6) IR protocol? */
bool release_code; /* some keys send a release code */ bool release_code; /* some keys send a release code */
u8 display_type; /* store the display type */ u8 display_type; /* store the display type */
...@@ -1118,7 +1118,7 @@ static void imon_touch_display_timeout(unsigned long data) ...@@ -1118,7 +1118,7 @@ static void imon_touch_display_timeout(unsigned long data)
* it is not, so we must acquire it prior to calling send_packet, which * it is not, so we must acquire it prior to calling send_packet, which
* requires that the lock is held. * requires that the lock is held.
*/ */
static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type) static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_proto)
{ {
int retval; int retval;
struct imon_context *ictx = rc->priv; struct imon_context *ictx = rc->priv;
...@@ -1127,25 +1127,25 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type) ...@@ -1127,25 +1127,25 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type)
unsigned char ir_proto_packet[] = { unsigned char ir_proto_packet[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
if (*rc_type && !(*rc_type & rc->allowed_protocols)) if (*rc_proto && !(*rc_proto & rc->allowed_protocols))
dev_warn(dev, "Looks like you're trying to use an IR protocol this device does not support\n"); dev_warn(dev, "Looks like you're trying to use an IR protocol this device does not support\n");
if (*rc_type & RC_BIT_RC6_MCE) { if (*rc_proto & RC_PROTO_BIT_RC6_MCE) {
dev_dbg(dev, "Configuring IR receiver for MCE protocol\n"); dev_dbg(dev, "Configuring IR receiver for MCE protocol\n");
ir_proto_packet[0] = 0x01; ir_proto_packet[0] = 0x01;
*rc_type = RC_BIT_RC6_MCE; *rc_proto = RC_PROTO_BIT_RC6_MCE;
} else if (*rc_type & RC_BIT_OTHER) { } else if (*rc_proto & RC_PROTO_BIT_OTHER) {
dev_dbg(dev, "Configuring IR receiver for iMON protocol\n"); dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
if (!pad_stabilize) if (!pad_stabilize)
dev_dbg(dev, "PAD stabilize functionality disabled\n"); dev_dbg(dev, "PAD stabilize functionality disabled\n");
/* ir_proto_packet[0] = 0x00; // already the default */ /* ir_proto_packet[0] = 0x00; // already the default */
*rc_type = RC_BIT_OTHER; *rc_proto = RC_PROTO_BIT_OTHER;
} else { } else {
dev_warn(dev, "Unsupported IR protocol specified, overriding to iMON IR protocol\n"); dev_warn(dev, "Unsupported IR protocol specified, overriding to iMON IR protocol\n");
if (!pad_stabilize) if (!pad_stabilize)
dev_dbg(dev, "PAD stabilize functionality disabled\n"); dev_dbg(dev, "PAD stabilize functionality disabled\n");
/* ir_proto_packet[0] = 0x00; // already the default */ /* ir_proto_packet[0] = 0x00; // already the default */
*rc_type = RC_BIT_OTHER; *rc_proto = RC_PROTO_BIT_OTHER;
} }
memcpy(ictx->usb_tx_buf, &ir_proto_packet, sizeof(ir_proto_packet)); memcpy(ictx->usb_tx_buf, &ir_proto_packet, sizeof(ir_proto_packet));
...@@ -1159,7 +1159,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type) ...@@ -1159,7 +1159,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type)
if (retval) if (retval)
goto out; goto out;
ictx->rc_type = *rc_type; ictx->rc_proto = *rc_proto;
ictx->pad_mouse = false; ictx->pad_mouse = false;
out: out:
...@@ -1435,7 +1435,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) ...@@ -1435,7 +1435,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
rel_x = buf[2]; rel_x = buf[2];
rel_y = buf[3]; rel_y = buf[3];
if (ictx->rc_type == RC_BIT_OTHER && pad_stabilize) { if (ictx->rc_proto == RC_PROTO_BIT_OTHER && pad_stabilize) {
if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) { if ((buf[1] == 0) && ((rel_x != 0) || (rel_y != 0))) {
dir = stabilize((int)rel_x, (int)rel_y, dir = stabilize((int)rel_x, (int)rel_y,
timeout, threshold); timeout, threshold);
...@@ -1502,7 +1502,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) ...@@ -1502,7 +1502,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
buf[0] = 0x01; buf[0] = 0x01;
buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0; buf[1] = buf[4] = buf[5] = buf[6] = buf[7] = 0;
if (ictx->rc_type == RC_BIT_OTHER && pad_stabilize) { if (ictx->rc_proto == RC_PROTO_BIT_OTHER && pad_stabilize) {
dir = stabilize((int)rel_x, (int)rel_y, dir = stabilize((int)rel_x, (int)rel_y,
timeout, threshold); timeout, threshold);
if (!dir) { if (!dir) {
...@@ -1706,7 +1706,7 @@ static void imon_incoming_scancode(struct imon_context *ictx, ...@@ -1706,7 +1706,7 @@ static void imon_incoming_scancode(struct imon_context *ictx,
ictx->release_code = false; ictx->release_code = false;
} else { } else {
scancode = be32_to_cpu(*((__be32 *)buf)); scancode = be32_to_cpu(*((__be32 *)buf));
if (ictx->rc_type == RC_BIT_RC6_MCE) { if (ictx->rc_proto == RC_PROTO_BIT_RC6_MCE) {
ktype = IMON_KEY_IMON; ktype = IMON_KEY_IMON;
if (buf[0] == 0x80) if (buf[0] == 0x80)
ktype = IMON_KEY_MCE; ktype = IMON_KEY_MCE;
...@@ -1769,10 +1769,10 @@ static void imon_incoming_scancode(struct imon_context *ictx, ...@@ -1769,10 +1769,10 @@ static void imon_incoming_scancode(struct imon_context *ictx,
if (press_type == 0) if (press_type == 0)
rc_keyup(ictx->rdev); rc_keyup(ictx->rdev);
else { else {
if (ictx->rc_type == RC_BIT_RC6_MCE || if (ictx->rc_proto == RC_PROTO_BIT_RC6_MCE ||
ictx->rc_type == RC_BIT_OTHER) ictx->rc_proto == RC_PROTO_BIT_OTHER)
rc_keydown(ictx->rdev, rc_keydown(ictx->rdev,
ictx->rc_type == RC_BIT_RC6_MCE ? RC_TYPE_RC6_MCE : RC_TYPE_OTHER, ictx->rc_proto == RC_PROTO_BIT_RC6_MCE ? RC_PROTO_RC6_MCE : RC_PROTO_OTHER,
ictx->rc_scancode, ictx->rc_toggle); ictx->rc_scancode, ictx->rc_toggle);
spin_lock_irqsave(&ictx->kc_lock, flags); spin_lock_irqsave(&ictx->kc_lock, flags);
ictx->last_keycode = ictx->kc; ictx->last_keycode = ictx->kc;
...@@ -1936,7 +1936,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx) ...@@ -1936,7 +1936,7 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
{ {
u8 ffdc_cfg_byte = ictx->usb_rx_buf[6]; u8 ffdc_cfg_byte = ictx->usb_rx_buf[6];
u8 detected_display_type = IMON_DISPLAY_TYPE_NONE; u8 detected_display_type = IMON_DISPLAY_TYPE_NONE;
u64 allowed_protos = RC_BIT_OTHER; u64 allowed_protos = RC_PROTO_BIT_OTHER;
switch (ffdc_cfg_byte) { switch (ffdc_cfg_byte) {
/* iMON Knob, no display, iMON IR + vol knob */ /* iMON Knob, no display, iMON IR + vol knob */
...@@ -1967,27 +1967,27 @@ static void imon_get_ffdc_type(struct imon_context *ictx) ...@@ -1967,27 +1967,27 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
case 0x9e: case 0x9e:
dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR"); dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
detected_display_type = IMON_DISPLAY_TYPE_VFD; detected_display_type = IMON_DISPLAY_TYPE_VFD;
allowed_protos = RC_BIT_RC6_MCE; allowed_protos = RC_PROTO_BIT_RC6_MCE;
break; break;
/* iMON LCD, MCE IR */ /* iMON LCD, MCE IR */
case 0x9f: case 0x9f:
dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR"); dev_info(ictx->dev, "0xffdc iMON LCD, MCE IR");
detected_display_type = IMON_DISPLAY_TYPE_LCD; detected_display_type = IMON_DISPLAY_TYPE_LCD;
allowed_protos = RC_BIT_RC6_MCE; allowed_protos = RC_PROTO_BIT_RC6_MCE;
break; break;
default: default:
dev_info(ictx->dev, "Unknown 0xffdc device, defaulting to VFD and iMON IR"); dev_info(ictx->dev, "Unknown 0xffdc device, defaulting to VFD and iMON IR");
detected_display_type = IMON_DISPLAY_TYPE_VFD; detected_display_type = IMON_DISPLAY_TYPE_VFD;
/* We don't know which one it is, allow user to set the /* We don't know which one it is, allow user to set the
* RC6 one from userspace if OTHER wasn't correct. */ * RC6 one from userspace if OTHER wasn't correct. */
allowed_protos |= RC_BIT_RC6_MCE; allowed_protos |= RC_PROTO_BIT_RC6_MCE;
break; break;
} }
printk(KERN_CONT " (id 0x%02x)\n", ffdc_cfg_byte); printk(KERN_CONT " (id 0x%02x)\n", ffdc_cfg_byte);
ictx->display_type = detected_display_type; ictx->display_type = detected_display_type;
ictx->rc_type = allowed_protos; ictx->rc_proto = allowed_protos;
} }
static void imon_set_display_type(struct imon_context *ictx) static void imon_set_display_type(struct imon_context *ictx)
...@@ -2070,10 +2070,11 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx) ...@@ -2070,10 +2070,11 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
rdev->priv = ictx; rdev->priv = ictx;
if (ictx->dev_descr->flags & IMON_IR_RAW) if (ictx->dev_descr->flags & IMON_IR_RAW)
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
else else
/* iMON PAD or MCE */ /* iMON PAD or MCE */
rdev->allowed_protocols = RC_BIT_OTHER | RC_BIT_RC6_MCE; rdev->allowed_protocols = RC_PROTO_BIT_OTHER |
RC_PROTO_BIT_RC6_MCE;
rdev->change_protocol = imon_ir_change_protocol; rdev->change_protocol = imon_ir_change_protocol;
rdev->driver_name = MOD_NAME; rdev->driver_name = MOD_NAME;
...@@ -2086,12 +2087,12 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx) ...@@ -2086,12 +2087,12 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
if (ictx->product == 0xffdc) { if (ictx->product == 0xffdc) {
imon_get_ffdc_type(ictx); imon_get_ffdc_type(ictx);
rdev->allowed_protocols = ictx->rc_type; rdev->allowed_protocols = ictx->rc_proto;
} }
imon_set_display_type(ictx); imon_set_display_type(ictx);
if (ictx->rc_type == RC_BIT_RC6_MCE || if (ictx->rc_proto == RC_PROTO_BIT_RC6_MCE ||
ictx->dev_descr->flags & IMON_IR_RAW) ictx->dev_descr->flags & IMON_IR_RAW)
rdev->map_name = RC_MAP_IMON_MCE; rdev->map_name = RC_MAP_IMON_MCE;
else else
......
drivers/media/rc/ir-hix5hd2.c
View file @ 6d741bfe
...@@ -242,7 +242,7 @@ static int hix5hd2_ir_probe(struct platform_device *pdev) ...@@ -242,7 +242,7 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
clk_prepare_enable(priv->clock); clk_prepare_enable(priv->clock);
priv->rate = clk_get_rate(priv->clock); priv->rate = clk_get_rate(priv->clock);
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rdev->priv = priv; rdev->priv = priv;
rdev->open = hix5hd2_ir_open; rdev->open = hix5hd2_ir_open;
rdev->close = hix5hd2_ir_close; rdev->close = hix5hd2_ir_close;
......
drivers/media/rc/ir-jvc-decoder.c
View file @ 6d741bfe
...@@ -137,7 +137,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -137,7 +137,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
scancode = (bitrev8((data->bits >> 8) & 0xff) << 8) | scancode = (bitrev8((data->bits >> 8) & 0xff) << 8) |
(bitrev8((data->bits >> 0) & 0xff) << 0); (bitrev8((data->bits >> 0) & 0xff) << 0);
IR_dprintk(1, "JVC scancode 0x%04x\n", scancode); IR_dprintk(1, "JVC scancode 0x%04x\n", scancode);
rc_keydown(dev, RC_TYPE_JVC, scancode, data->toggle); rc_keydown(dev, RC_PROTO_JVC, scancode, data->toggle);
data->first = false; data->first = false;
data->old_bits = data->bits; data->old_bits = data->bits;
} else if (data->bits == data->old_bits) { } else if (data->bits == data->old_bits) {
...@@ -193,7 +193,7 @@ static const struct ir_raw_timings_pd ir_jvc_timings = { ...@@ -193,7 +193,7 @@ static const struct ir_raw_timings_pd ir_jvc_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_jvc_encode(enum rc_type protocol, u32 scancode, static int ir_jvc_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
...@@ -209,7 +209,7 @@ static int ir_jvc_encode(enum rc_type protocol, u32 scancode, ...@@ -209,7 +209,7 @@ static int ir_jvc_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler jvc_handler = { static struct ir_raw_handler jvc_handler = {
.protocols = RC_BIT_JVC, .protocols = RC_PROTO_BIT_JVC,
.decode = ir_jvc_decode, .decode = ir_jvc_decode,
.encode = ir_jvc_encode, .encode = ir_jvc_encode,
}; };
......
drivers/media/rc/ir-mce_kbd-decoder.c
View file @ 6d741bfe
...@@ -444,14 +444,14 @@ static const struct ir_raw_timings_manchester ir_mce_kbd_timings = { ...@@ -444,14 +444,14 @@ static const struct ir_raw_timings_manchester ir_mce_kbd_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_mce_kbd_encode(enum rc_type protocol, u32 scancode, static int ir_mce_kbd_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
int len, ret; int len, ret;
u64 raw; u64 raw;
if (protocol == RC_TYPE_MCIR2_KBD) { if (protocol == RC_PROTO_MCIR2_KBD) {
raw = scancode | raw = scancode |
((u64)MCIR2_KEYBOARD_HEADER << MCIR2_KEYBOARD_NBITS); ((u64)MCIR2_KEYBOARD_HEADER << MCIR2_KEYBOARD_NBITS);
len = MCIR2_KEYBOARD_NBITS + MCIR2_HEADER_NBITS + 1; len = MCIR2_KEYBOARD_NBITS + MCIR2_HEADER_NBITS + 1;
...@@ -469,7 +469,7 @@ static int ir_mce_kbd_encode(enum rc_type protocol, u32 scancode, ...@@ -469,7 +469,7 @@ static int ir_mce_kbd_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler mce_kbd_handler = { static struct ir_raw_handler mce_kbd_handler = {
.protocols = RC_BIT_MCIR2_KBD | RC_BIT_MCIR2_MSE, .protocols = RC_PROTO_BIT_MCIR2_KBD | RC_PROTO_BIT_MCIR2_MSE,
.decode = ir_mce_kbd_decode, .decode = ir_mce_kbd_decode,
.encode = ir_mce_kbd_encode, .encode = ir_mce_kbd_encode,
.raw_register = ir_mce_kbd_register, .raw_register = ir_mce_kbd_register,
......
drivers/media/rc/ir-nec-decoder.c
View file @ 6d741bfe
...@@ -49,7 +49,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -49,7 +49,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
{ {
struct nec_dec *data = &dev->raw->nec; struct nec_dec *data = &dev->raw->nec;
u32 scancode; u32 scancode;
enum rc_type rc_type; enum rc_proto rc_proto;
u8 address, not_address, command, not_command; u8 address, not_address, command, not_command;
if (!is_timing_event(ev)) { if (!is_timing_event(ev)) {
...@@ -158,12 +158,12 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -158,12 +158,12 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
scancode = ir_nec_bytes_to_scancode(address, not_address, scancode = ir_nec_bytes_to_scancode(address, not_address,
command, not_command, command, not_command,
&rc_type); &rc_proto);
if (data->is_nec_x) if (data->is_nec_x)
data->necx_repeat = true; data->necx_repeat = true;
rc_keydown(dev, rc_type, scancode, 0); rc_keydown(dev, rc_proto, scancode, 0);
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -180,19 +180,19 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -180,19 +180,19 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
* @scancode: a single NEC scancode. * @scancode: a single NEC scancode.
* @raw: raw data to be modulated. * @raw: raw data to be modulated.
*/ */
static u32 ir_nec_scancode_to_raw(enum rc_type protocol, u32 scancode) static u32 ir_nec_scancode_to_raw(enum rc_proto protocol, u32 scancode)
{ {
unsigned int addr, addr_inv, data, data_inv; unsigned int addr, addr_inv, data, data_inv;
data = scancode & 0xff; data = scancode & 0xff;
if (protocol == RC_TYPE_NEC32) { if (protocol == RC_PROTO_NEC32) {
/* 32-bit NEC (used by Apple and TiVo remotes) */ /* 32-bit NEC (used by Apple and TiVo remotes) */
/* scan encoding: aaAAddDD */ /* scan encoding: aaAAddDD */
addr_inv = (scancode >> 24) & 0xff; addr_inv = (scancode >> 24) & 0xff;
addr = (scancode >> 16) & 0xff; addr = (scancode >> 16) & 0xff;
data_inv = (scancode >> 8) & 0xff; data_inv = (scancode >> 8) & 0xff;
} else if (protocol == RC_TYPE_NECX) { } else if (protocol == RC_PROTO_NECX) {
/* Extended NEC */ /* Extended NEC */
/* scan encoding AAaaDD */ /* scan encoding AAaaDD */
addr = (scancode >> 16) & 0xff; addr = (scancode >> 16) & 0xff;
...@@ -236,7 +236,7 @@ static const struct ir_raw_timings_pd ir_nec_timings = { ...@@ -236,7 +236,7 @@ static const struct ir_raw_timings_pd ir_nec_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_nec_encode(enum rc_type protocol, u32 scancode, static int ir_nec_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
...@@ -255,7 +255,8 @@ static int ir_nec_encode(enum rc_type protocol, u32 scancode, ...@@ -255,7 +255,8 @@ static int ir_nec_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler nec_handler = { static struct ir_raw_handler nec_handler = {
.protocols = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32, .protocols = RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX |
RC_PROTO_BIT_NEC32,
.decode = ir_nec_decode, .decode = ir_nec_decode,
.encode = ir_nec_encode, .encode = ir_nec_encode,
}; };
......
drivers/media/rc/ir-rc5-decoder.c
View file @ 6d741bfe
...@@ -51,7 +51,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -51,7 +51,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
struct rc5_dec *data = &dev->raw->rc5; struct rc5_dec *data = &dev->raw->rc5;
u8 toggle; u8 toggle;
u32 scancode; u32 scancode;
enum rc_type protocol; enum rc_proto protocol;
if (!is_timing_event(ev)) { if (!is_timing_event(ev)) {
if (ev.reset) if (ev.reset)
...@@ -124,7 +124,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -124,7 +124,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
if (data->is_rc5x && data->count == RC5X_NBITS) { if (data->is_rc5x && data->count == RC5X_NBITS) {
/* RC5X */ /* RC5X */
u8 xdata, command, system; u8 xdata, command, system;
if (!(dev->enabled_protocols & RC_BIT_RC5X_20)) { if (!(dev->enabled_protocols & RC_PROTO_BIT_RC5X_20)) {
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -134,12 +134,12 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -134,12 +134,12 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
toggle = (data->bits & 0x20000) ? 1 : 0; toggle = (data->bits & 0x20000) ? 1 : 0;
command += (data->bits & 0x40000) ? 0 : 0x40; command += (data->bits & 0x40000) ? 0 : 0x40;
scancode = system << 16 | command << 8 | xdata; scancode = system << 16 | command << 8 | xdata;
protocol = RC_TYPE_RC5X_20; protocol = RC_PROTO_RC5X_20;
} else if (!data->is_rc5x && data->count == RC5_NBITS) { } else if (!data->is_rc5x && data->count == RC5_NBITS) {
/* RC5 */ /* RC5 */
u8 command, system; u8 command, system;
if (!(dev->enabled_protocols & RC_BIT_RC5)) { if (!(dev->enabled_protocols & RC_PROTO_BIT_RC5)) {
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -148,12 +148,12 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -148,12 +148,12 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
toggle = (data->bits & 0x00800) ? 1 : 0; toggle = (data->bits & 0x00800) ? 1 : 0;
command += (data->bits & 0x01000) ? 0 : 0x40; command += (data->bits & 0x01000) ? 0 : 0x40;
scancode = system << 8 | command; scancode = system << 8 | command;
protocol = RC_TYPE_RC5; protocol = RC_PROTO_RC5;
} else if (!data->is_rc5x && data->count == RC5_SZ_NBITS) { } else if (!data->is_rc5x && data->count == RC5_SZ_NBITS) {
/* RC5 StreamZap */ /* RC5 StreamZap */
u8 command, system; u8 command, system;
if (!(dev->enabled_protocols & RC_BIT_RC5_SZ)) { if (!(dev->enabled_protocols & RC_PROTO_BIT_RC5_SZ)) {
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -161,7 +161,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -161,7 +161,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
system = (data->bits & 0x02FC0) >> 6; system = (data->bits & 0x02FC0) >> 6;
toggle = (data->bits & 0x01000) ? 1 : 0; toggle = (data->bits & 0x01000) ? 1 : 0;
scancode = system << 6 | command; scancode = system << 6 | command;
protocol = RC_TYPE_RC5_SZ; protocol = RC_PROTO_RC5_SZ;
} else } else
break; break;
...@@ -221,7 +221,7 @@ static const struct ir_raw_timings_manchester ir_rc5_sz_timings = { ...@@ -221,7 +221,7 @@ static const struct ir_raw_timings_manchester ir_rc5_sz_timings = {
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
* -EINVAL if the scancode is ambiguous or invalid. * -EINVAL if the scancode is ambiguous or invalid.
*/ */
static int ir_rc5_encode(enum rc_type protocol, u32 scancode, static int ir_rc5_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
int ret; int ret;
...@@ -229,7 +229,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode, ...@@ -229,7 +229,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode,
unsigned int data, xdata, command, commandx, system, pre_space_data; unsigned int data, xdata, command, commandx, system, pre_space_data;
/* Detect protocol and convert scancode to raw data */ /* Detect protocol and convert scancode to raw data */
if (protocol == RC_TYPE_RC5) { if (protocol == RC_PROTO_RC5) {
/* decode scancode */ /* decode scancode */
command = (scancode & 0x003f) >> 0; command = (scancode & 0x003f) >> 0;
commandx = (scancode & 0x0040) >> 6; commandx = (scancode & 0x0040) >> 6;
...@@ -242,7 +242,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode, ...@@ -242,7 +242,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode,
RC5_NBITS, data); RC5_NBITS, data);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (protocol == RC_TYPE_RC5X_20) { } else if (protocol == RC_PROTO_RC5X_20) {
/* decode scancode */ /* decode scancode */
xdata = (scancode & 0x00003f) >> 0; xdata = (scancode & 0x00003f) >> 0;
command = (scancode & 0x003f00) >> 8; command = (scancode & 0x003f00) >> 8;
...@@ -264,7 +264,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode, ...@@ -264,7 +264,7 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode,
data); data);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (protocol == RC_TYPE_RC5_SZ) { } else if (protocol == RC_PROTO_RC5_SZ) {
/* RC5-SZ scancode is raw enough for Manchester as it is */ /* RC5-SZ scancode is raw enough for Manchester as it is */
ret = ir_raw_gen_manchester(&e, max, &ir_rc5_sz_timings, ret = ir_raw_gen_manchester(&e, max, &ir_rc5_sz_timings,
RC5_SZ_NBITS, scancode & 0x2fff); RC5_SZ_NBITS, scancode & 0x2fff);
...@@ -278,7 +278,8 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode, ...@@ -278,7 +278,8 @@ static int ir_rc5_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler rc5_handler = { static struct ir_raw_handler rc5_handler = {
.protocols = RC_BIT_RC5 | RC_BIT_RC5X_20 | RC_BIT_RC5_SZ, .protocols = RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 |
RC_PROTO_BIT_RC5_SZ,
.decode = ir_rc5_decode, .decode = ir_rc5_decode,
.encode = ir_rc5_encode, .encode = ir_rc5_encode,
}; };
......
drivers/media/rc/ir-rc6-decoder.c
View file @ 6d741bfe
...@@ -88,7 +88,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -88,7 +88,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
struct rc6_dec *data = &dev->raw->rc6; struct rc6_dec *data = &dev->raw->rc6;
u32 scancode; u32 scancode;
u8 toggle; u8 toggle;
enum rc_type protocol; enum rc_proto protocol;
if (!is_timing_event(ev)) { if (!is_timing_event(ev)) {
if (ev.reset) if (ev.reset)
...@@ -229,7 +229,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -229,7 +229,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
case RC6_MODE_0: case RC6_MODE_0:
scancode = data->body; scancode = data->body;
toggle = data->toggle; toggle = data->toggle;
protocol = RC_TYPE_RC6_0; protocol = RC_PROTO_RC6_0;
IR_dprintk(1, "RC6(0) scancode 0x%04x (toggle: %u)\n", IR_dprintk(1, "RC6(0) scancode 0x%04x (toggle: %u)\n",
scancode, toggle); scancode, toggle);
break; break;
...@@ -244,20 +244,20 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -244,20 +244,20 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
scancode = data->body; scancode = data->body;
switch (data->count) { switch (data->count) {
case 20: case 20:
protocol = RC_TYPE_RC6_6A_20; protocol = RC_PROTO_RC6_6A_20;
toggle = 0; toggle = 0;
break; break;
case 24: case 24:
protocol = RC_TYPE_RC6_6A_24; protocol = RC_PROTO_RC6_6A_24;
toggle = 0; toggle = 0;
break; break;
case 32: case 32:
if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
protocol = RC_TYPE_RC6_MCE; protocol = RC_PROTO_RC6_MCE;
toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
scancode &= ~RC6_6A_MCE_TOGGLE_MASK; scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
} else { } else {
protocol = RC_TYPE_RC6_6A_32; protocol = RC_PROTO_RC6_6A_32;
toggle = 0; toggle = 0;
} }
break; break;
...@@ -322,13 +322,13 @@ static const struct ir_raw_timings_manchester ir_rc6_timings[4] = { ...@@ -322,13 +322,13 @@ static const struct ir_raw_timings_manchester ir_rc6_timings[4] = {
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
* -EINVAL if the scancode is ambiguous or invalid. * -EINVAL if the scancode is ambiguous or invalid.
*/ */
static int ir_rc6_encode(enum rc_type protocol, u32 scancode, static int ir_rc6_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
int ret; int ret;
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
if (protocol == RC_TYPE_RC6_0) { if (protocol == RC_PROTO_RC6_0) {
/* Modulate the preamble */ /* Modulate the preamble */
ret = ir_raw_gen_manchester(&e, max, &ir_rc6_timings[0], 0, 0); ret = ir_raw_gen_manchester(&e, max, &ir_rc6_timings[0], 0, 0);
if (ret < 0) if (ret < 0)
...@@ -358,14 +358,14 @@ static int ir_rc6_encode(enum rc_type protocol, u32 scancode, ...@@ -358,14 +358,14 @@ static int ir_rc6_encode(enum rc_type protocol, u32 scancode,
int bits; int bits;
switch (protocol) { switch (protocol) {
case RC_TYPE_RC6_MCE: case RC_PROTO_RC6_MCE:
case RC_TYPE_RC6_6A_32: case RC_PROTO_RC6_6A_32:
bits = 32; bits = 32;
break; break;
case RC_TYPE_RC6_6A_24: case RC_PROTO_RC6_6A_24:
bits = 24; bits = 24;
break; break;
case RC_TYPE_RC6_6A_20: case RC_PROTO_RC6_6A_20:
bits = 20; bits = 20;
break; break;
default: default:
...@@ -403,9 +403,9 @@ static int ir_rc6_encode(enum rc_type protocol, u32 scancode, ...@@ -403,9 +403,9 @@ static int ir_rc6_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler rc6_handler = { static struct ir_raw_handler rc6_handler = {
.protocols = RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | .protocols = RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 |
RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_PROTO_BIT_RC6_6A_24 | RC_PROTO_BIT_RC6_6A_32 |
RC_BIT_RC6_MCE, RC_PROTO_BIT_RC6_MCE,
.decode = ir_rc6_decode, .decode = ir_rc6_decode,
.encode = ir_rc6_encode, .encode = ir_rc6_encode,
}; };
......
drivers/media/rc/ir-sanyo-decoder.c
View file @ 6d741bfe
...@@ -161,7 +161,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -161,7 +161,7 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
scancode = address << 8 | command; scancode = address << 8 | command;
IR_dprintk(1, "SANYO scancode: 0x%06x\n", scancode); IR_dprintk(1, "SANYO scancode: 0x%06x\n", scancode);
rc_keydown(dev, RC_TYPE_SANYO, scancode, 0); rc_keydown(dev, RC_PROTO_SANYO, scancode, 0);
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -195,7 +195,7 @@ static const struct ir_raw_timings_pd ir_sanyo_timings = { ...@@ -195,7 +195,7 @@ static const struct ir_raw_timings_pd ir_sanyo_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_sanyo_encode(enum rc_type protocol, u32 scancode, static int ir_sanyo_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
...@@ -215,7 +215,7 @@ static int ir_sanyo_encode(enum rc_type protocol, u32 scancode, ...@@ -215,7 +215,7 @@ static int ir_sanyo_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler sanyo_handler = { static struct ir_raw_handler sanyo_handler = {
.protocols = RC_BIT_SANYO, .protocols = RC_PROTO_BIT_SANYO,
.decode = ir_sanyo_decode, .decode = ir_sanyo_decode,
.encode = ir_sanyo_encode, .encode = ir_sanyo_encode,
}; };
......
drivers/media/rc/ir-sharp-decoder.c
View file @ 6d741bfe
...@@ -161,7 +161,7 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -161,7 +161,7 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
scancode = address << 8 | command; scancode = address << 8 | command;
IR_dprintk(1, "Sharp scancode 0x%04x\n", scancode); IR_dprintk(1, "Sharp scancode 0x%04x\n", scancode);
rc_keydown(dev, RC_TYPE_SHARP, scancode, 0); rc_keydown(dev, RC_PROTO_SHARP, scancode, 0);
data->state = STATE_INACTIVE; data->state = STATE_INACTIVE;
return 0; return 0;
} }
...@@ -196,7 +196,7 @@ static const struct ir_raw_timings_pd ir_sharp_timings = { ...@@ -196,7 +196,7 @@ static const struct ir_raw_timings_pd ir_sharp_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_sharp_encode(enum rc_type protocol, u32 scancode, static int ir_sharp_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
...@@ -223,7 +223,7 @@ static int ir_sharp_encode(enum rc_type protocol, u32 scancode, ...@@ -223,7 +223,7 @@ static int ir_sharp_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler sharp_handler = { static struct ir_raw_handler sharp_handler = {
.protocols = RC_BIT_SHARP, .protocols = RC_PROTO_BIT_SHARP,
.decode = ir_sharp_decode, .decode = ir_sharp_decode,
.encode = ir_sharp_encode, .encode = ir_sharp_encode,
}; };
......
drivers/media/rc/ir-sony-decoder.c
View file @ 6d741bfe
...@@ -42,7 +42,7 @@ enum sony_state { ...@@ -42,7 +42,7 @@ enum sony_state {
static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
{ {
struct sony_dec *data = &dev->raw->sony; struct sony_dec *data = &dev->raw->sony;
enum rc_type protocol; enum rc_proto protocol;
u32 scancode; u32 scancode;
u8 device, subdevice, function; u8 device, subdevice, function;
...@@ -121,31 +121,31 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -121,31 +121,31 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
switch (data->count) { switch (data->count) {
case 12: case 12:
if (!(dev->enabled_protocols & RC_BIT_SONY12)) if (!(dev->enabled_protocols & RC_PROTO_BIT_SONY12))
goto finish_state_machine; goto finish_state_machine;
device = bitrev8((data->bits << 3) & 0xF8); device = bitrev8((data->bits << 3) & 0xF8);
subdevice = 0; subdevice = 0;
function = bitrev8((data->bits >> 4) & 0xFE); function = bitrev8((data->bits >> 4) & 0xFE);
protocol = RC_TYPE_SONY12; protocol = RC_PROTO_SONY12;
break; break;
case 15: case 15:
if (!(dev->enabled_protocols & RC_BIT_SONY15)) if (!(dev->enabled_protocols & RC_PROTO_BIT_SONY15))
goto finish_state_machine; goto finish_state_machine;
device = bitrev8((data->bits >> 0) & 0xFF); device = bitrev8((data->bits >> 0) & 0xFF);
subdevice = 0; subdevice = 0;
function = bitrev8((data->bits >> 7) & 0xFE); function = bitrev8((data->bits >> 7) & 0xFE);
protocol = RC_TYPE_SONY15; protocol = RC_PROTO_SONY15;
break; break;
case 20: case 20:
if (!(dev->enabled_protocols & RC_BIT_SONY20)) if (!(dev->enabled_protocols & RC_PROTO_BIT_SONY20))
goto finish_state_machine; goto finish_state_machine;
device = bitrev8((data->bits >> 5) & 0xF8); device = bitrev8((data->bits >> 5) & 0xF8);
subdevice = bitrev8((data->bits >> 0) & 0xFF); subdevice = bitrev8((data->bits >> 0) & 0xFF);
function = bitrev8((data->bits >> 12) & 0xFE); function = bitrev8((data->bits >> 12) & 0xFE);
protocol = RC_TYPE_SONY20; protocol = RC_PROTO_SONY20;
break; break;
default: default:
IR_dprintk(1, "Sony invalid bitcount %u\n", data->count); IR_dprintk(1, "Sony invalid bitcount %u\n", data->count);
...@@ -190,17 +190,17 @@ static const struct ir_raw_timings_pl ir_sony_timings = { ...@@ -190,17 +190,17 @@ static const struct ir_raw_timings_pl ir_sony_timings = {
* -ENOBUFS if there isn't enough space in the array to fit the * -ENOBUFS if there isn't enough space in the array to fit the
* encoding. In this case all @max events will have been written. * encoding. In this case all @max events will have been written.
*/ */
static int ir_sony_encode(enum rc_type protocol, u32 scancode, static int ir_sony_encode(enum rc_proto protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max) struct ir_raw_event *events, unsigned int max)
{ {
struct ir_raw_event *e = events; struct ir_raw_event *e = events;
u32 raw, len; u32 raw, len;
int ret; int ret;
if (protocol == RC_TYPE_SONY12) { if (protocol == RC_PROTO_SONY12) {
raw = (scancode & 0x7f) | ((scancode & 0x1f0000) >> 9); raw = (scancode & 0x7f) | ((scancode & 0x1f0000) >> 9);
len = 12; len = 12;
} else if (protocol == RC_TYPE_SONY15) { } else if (protocol == RC_PROTO_SONY15) {
raw = (scancode & 0x7f) | ((scancode & 0xff0000) >> 9); raw = (scancode & 0x7f) | ((scancode & 0xff0000) >> 9);
len = 15; len = 15;
} else { } else {
...@@ -217,7 +217,8 @@ static int ir_sony_encode(enum rc_type protocol, u32 scancode, ...@@ -217,7 +217,8 @@ static int ir_sony_encode(enum rc_type protocol, u32 scancode,
} }
static struct ir_raw_handler sony_handler = { static struct ir_raw_handler sony_handler = {
.protocols = RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20, .protocols = RC_PROTO_BIT_SONY12 | RC_PROTO_BIT_SONY15 |
RC_PROTO_BIT_SONY20,
.decode = ir_sony_decode, .decode = ir_sony_decode,
.encode = ir_sony_encode, .encode = ir_sony_encode,
}; };
......
drivers/media/rc/ir-xmp-decoder.c
View file @ 6d741bfe
...@@ -141,7 +141,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -141,7 +141,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev)
IR_dprintk(1, "XMP scancode 0x%06x\n", scancode); IR_dprintk(1, "XMP scancode 0x%06x\n", scancode);
if (toggle == 0) { if (toggle == 0) {
rc_keydown(dev, RC_TYPE_XMP, scancode, 0); rc_keydown(dev, RC_PROTO_XMP, scancode, 0);
} else { } else {
rc_repeat(dev); rc_repeat(dev);
IR_dprintk(1, "Repeat last key\n"); IR_dprintk(1, "Repeat last key\n");
...@@ -196,7 +196,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev) ...@@ -196,7 +196,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev)
} }
static struct ir_raw_handler xmp_handler = { static struct ir_raw_handler xmp_handler = {
.protocols = RC_BIT_XMP, .protocols = RC_PROTO_BIT_XMP,
.decode = ir_xmp_decode, .decode = ir_xmp_decode,
}; };
......
drivers/media/rc/ite-cir.c
View file @ 6d741bfe
...@@ -1556,7 +1556,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id ...@@ -1556,7 +1556,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
/* set up ir-core props */ /* set up ir-core props */
rdev->priv = itdev; rdev->priv = itdev;
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER; rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
rdev->open = ite_open; rdev->open = ite_open;
rdev->close = ite_close; rdev->close = ite_close;
rdev->s_idle = ite_s_idle; rdev->s_idle = ite_s_idle;
......
drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
View file @ 6d741bfe
...@@ -66,10 +66,10 @@ static struct rc_map_table adstech_dvb_t_pci[] = { ...@@ -66,10 +66,10 @@ static struct rc_map_table adstech_dvb_t_pci[] = {
static struct rc_map_list adstech_dvb_t_pci_map = { static struct rc_map_list adstech_dvb_t_pci_map = {
.map = { .map = {
.scan = adstech_dvb_t_pci, .scan = adstech_dvb_t_pci,
.size = ARRAY_SIZE(adstech_dvb_t_pci), .size = ARRAY_SIZE(adstech_dvb_t_pci),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ADSTECH_DVB_T_PCI, .name = RC_MAP_ADSTECH_DVB_T_PCI,
} }
}; };
......
drivers/media/rc/keymaps/rc-alink-dtu-m.c
View file @ 6d741bfe
...@@ -45,10 +45,10 @@ static struct rc_map_table alink_dtu_m[] = { ...@@ -45,10 +45,10 @@ static struct rc_map_table alink_dtu_m[] = {
static struct rc_map_list alink_dtu_m_map = { static struct rc_map_list alink_dtu_m_map = {
.map = { .map = {
.scan = alink_dtu_m, .scan = alink_dtu_m,
.size = ARRAY_SIZE(alink_dtu_m), .size = ARRAY_SIZE(alink_dtu_m),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_ALINK_DTU_M, .name = RC_MAP_ALINK_DTU_M,
} }
}; };
......
drivers/media/rc/keymaps/rc-anysee.c
View file @ 6d741bfe
...@@ -70,10 +70,10 @@ static struct rc_map_table anysee[] = { ...@@ -70,10 +70,10 @@ static struct rc_map_table anysee[] = {
static struct rc_map_list anysee_map = { static struct rc_map_list anysee_map = {
.map = { .map = {
.scan = anysee, .scan = anysee,
.size = ARRAY_SIZE(anysee), .size = ARRAY_SIZE(anysee),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_ANYSEE, .name = RC_MAP_ANYSEE,
} }
}; };
......
drivers/media/rc/keymaps/rc-apac-viewcomp.c
View file @ 6d741bfe
...@@ -57,10 +57,10 @@ static struct rc_map_table apac_viewcomp[] = { ...@@ -57,10 +57,10 @@ static struct rc_map_table apac_viewcomp[] = {
static struct rc_map_list apac_viewcomp_map = { static struct rc_map_list apac_viewcomp_map = {
.map = { .map = {
.scan = apac_viewcomp, .scan = apac_viewcomp,
.size = ARRAY_SIZE(apac_viewcomp), .size = ARRAY_SIZE(apac_viewcomp),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_APAC_VIEWCOMP, .name = RC_MAP_APAC_VIEWCOMP,
} }
}; };
......
drivers/media/rc/keymaps/rc-asus-pc39.c
View file @ 6d741bfe
...@@ -68,10 +68,10 @@ static struct rc_map_table asus_pc39[] = { ...@@ -68,10 +68,10 @@ static struct rc_map_table asus_pc39[] = {
static struct rc_map_list asus_pc39_map = { static struct rc_map_list asus_pc39_map = {
.map = { .map = {
.scan = asus_pc39, .scan = asus_pc39,
.size = ARRAY_SIZE(asus_pc39), .size = ARRAY_SIZE(asus_pc39),
.rc_type = RC_TYPE_RC5, .rc_proto = RC_PROTO_RC5,
.name = RC_MAP_ASUS_PC39, .name = RC_MAP_ASUS_PC39,
} }
}; };
......
drivers/media/rc/keymaps/rc-asus-ps3-100.c
View file @ 6d741bfe
...@@ -67,10 +67,10 @@ static struct rc_map_table asus_ps3_100[] = { ...@@ -67,10 +67,10 @@ static struct rc_map_table asus_ps3_100[] = {
static struct rc_map_list asus_ps3_100_map = { static struct rc_map_list asus_ps3_100_map = {
.map = { .map = {
.scan = asus_ps3_100, .scan = asus_ps3_100,
.size = ARRAY_SIZE(asus_ps3_100), .size = ARRAY_SIZE(asus_ps3_100),
.rc_type = RC_TYPE_RC5, .rc_proto = RC_PROTO_RC5,
.name = RC_MAP_ASUS_PS3_100, .name = RC_MAP_ASUS_PS3_100,
} }
}; };
......
drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
View file @ 6d741bfe
...@@ -46,10 +46,10 @@ static struct rc_map_table ati_tv_wonder_hd_600[] = { ...@@ -46,10 +46,10 @@ static struct rc_map_table ati_tv_wonder_hd_600[] = {
static struct rc_map_list ati_tv_wonder_hd_600_map = { static struct rc_map_list ati_tv_wonder_hd_600_map = {
.map = { .map = {
.scan = ati_tv_wonder_hd_600, .scan = ati_tv_wonder_hd_600,
.size = ARRAY_SIZE(ati_tv_wonder_hd_600), .size = ARRAY_SIZE(ati_tv_wonder_hd_600),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ATI_TV_WONDER_HD_600, .name = RC_MAP_ATI_TV_WONDER_HD_600,
} }
}; };
......
drivers/media/rc/keymaps/rc-ati-x10.c
View file @ 6d741bfe
...@@ -114,10 +114,10 @@ static struct rc_map_table ati_x10[] = { ...@@ -114,10 +114,10 @@ static struct rc_map_table ati_x10[] = {
static struct rc_map_list ati_x10_map = { static struct rc_map_list ati_x10_map = {
.map = { .map = {
.scan = ati_x10, .scan = ati_x10,
.size = ARRAY_SIZE(ati_x10), .size = ARRAY_SIZE(ati_x10),
.rc_type = RC_TYPE_OTHER, .rc_proto = RC_PROTO_OTHER,
.name = RC_MAP_ATI_X10, .name = RC_MAP_ATI_X10,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-a16d.c
View file @ 6d741bfe
...@@ -52,10 +52,10 @@ static struct rc_map_table avermedia_a16d[] = { ...@@ -52,10 +52,10 @@ static struct rc_map_table avermedia_a16d[] = {
static struct rc_map_list avermedia_a16d_map = { static struct rc_map_list avermedia_a16d_map = {
.map = { .map = {
.scan = avermedia_a16d, .scan = avermedia_a16d,
.size = ARRAY_SIZE(avermedia_a16d), .size = ARRAY_SIZE(avermedia_a16d),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_A16D, .name = RC_MAP_AVERMEDIA_A16D,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-cardbus.c
View file @ 6d741bfe
...@@ -74,10 +74,10 @@ static struct rc_map_table avermedia_cardbus[] = { ...@@ -74,10 +74,10 @@ static struct rc_map_table avermedia_cardbus[] = {
static struct rc_map_list avermedia_cardbus_map = { static struct rc_map_list avermedia_cardbus_map = {
.map = { .map = {
.scan = avermedia_cardbus, .scan = avermedia_cardbus,
.size = ARRAY_SIZE(avermedia_cardbus), .size = ARRAY_SIZE(avermedia_cardbus),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_CARDBUS, .name = RC_MAP_AVERMEDIA_CARDBUS,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-dvbt.c
View file @ 6d741bfe
...@@ -55,10 +55,10 @@ static struct rc_map_table avermedia_dvbt[] = { ...@@ -55,10 +55,10 @@ static struct rc_map_table avermedia_dvbt[] = {
static struct rc_map_list avermedia_dvbt_map = { static struct rc_map_list avermedia_dvbt_map = {
.map = { .map = {
.scan = avermedia_dvbt, .scan = avermedia_dvbt,
.size = ARRAY_SIZE(avermedia_dvbt), .size = ARRAY_SIZE(avermedia_dvbt),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA_DVBT, .name = RC_MAP_AVERMEDIA_DVBT,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-m135a.c
View file @ 6d741bfe
...@@ -124,10 +124,10 @@ static struct rc_map_table avermedia_m135a[] = { ...@@ -124,10 +124,10 @@ static struct rc_map_table avermedia_m135a[] = {
static struct rc_map_list avermedia_m135a_map = { static struct rc_map_list avermedia_m135a_map = {
.map = { .map = {
.scan = avermedia_m135a, .scan = avermedia_m135a,
.size = ARRAY_SIZE(avermedia_m135a), .size = ARRAY_SIZE(avermedia_m135a),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_AVERMEDIA_M135A, .name = RC_MAP_AVERMEDIA_M135A,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
View file @ 6d741bfe
...@@ -72,10 +72,10 @@ static struct rc_map_table avermedia_m733a_rm_k6[] = { ...@@ -72,10 +72,10 @@ static struct rc_map_table avermedia_m733a_rm_k6[] = {
static struct rc_map_list avermedia_m733a_rm_k6_map = { static struct rc_map_list avermedia_m733a_rm_k6_map = {
.map = { .map = {
.scan = avermedia_m733a_rm_k6, .scan = avermedia_m733a_rm_k6,
.size = ARRAY_SIZE(avermedia_m733a_rm_k6), .size = ARRAY_SIZE(avermedia_m733a_rm_k6),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_AVERMEDIA_M733A_RM_K6, .name = RC_MAP_AVERMEDIA_M733A_RM_K6,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
View file @ 6d741bfe
...@@ -56,10 +56,10 @@ static struct rc_map_table avermedia_rm_ks[] = { ...@@ -56,10 +56,10 @@ static struct rc_map_table avermedia_rm_ks[] = {
static struct rc_map_list avermedia_rm_ks_map = { static struct rc_map_list avermedia_rm_ks_map = {
.map = { .map = {
.scan = avermedia_rm_ks, .scan = avermedia_rm_ks,
.size = ARRAY_SIZE(avermedia_rm_ks), .size = ARRAY_SIZE(avermedia_rm_ks),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_AVERMEDIA_RM_KS, .name = RC_MAP_AVERMEDIA_RM_KS,
} }
}; };
......
drivers/media/rc/keymaps/rc-avermedia.c
View file @ 6d741bfe
...@@ -63,10 +63,10 @@ static struct rc_map_table avermedia[] = { ...@@ -63,10 +63,10 @@ static struct rc_map_table avermedia[] = {
static struct rc_map_list avermedia_map = { static struct rc_map_list avermedia_map = {
.map = { .map = {
.scan = avermedia, .scan = avermedia,
.size = ARRAY_SIZE(avermedia), .size = ARRAY_SIZE(avermedia),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERMEDIA, .name = RC_MAP_AVERMEDIA,
} }
}; };
......
drivers/media/rc/keymaps/rc-avertv-303.c
View file @ 6d741bfe
...@@ -62,10 +62,10 @@ static struct rc_map_table avertv_303[] = { ...@@ -62,10 +62,10 @@ static struct rc_map_table avertv_303[] = {
static struct rc_map_list avertv_303_map = { static struct rc_map_list avertv_303_map = {
.map = { .map = {
.scan = avertv_303, .scan = avertv_303,
.size = ARRAY_SIZE(avertv_303), .size = ARRAY_SIZE(avertv_303),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_AVERTV_303, .name = RC_MAP_AVERTV_303,
} }
}; };
......
drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
View file @ 6d741bfe
...@@ -79,10 +79,10 @@ static struct rc_map_table azurewave_ad_tu700[] = { ...@@ -79,10 +79,10 @@ static struct rc_map_table azurewave_ad_tu700[] = {
static struct rc_map_list azurewave_ad_tu700_map = { static struct rc_map_list azurewave_ad_tu700_map = {
.map = { .map = {
.scan = azurewave_ad_tu700, .scan = azurewave_ad_tu700,
.size = ARRAY_SIZE(azurewave_ad_tu700), .size = ARRAY_SIZE(azurewave_ad_tu700),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_AZUREWAVE_AD_TU700, .name = RC_MAP_AZUREWAVE_AD_TU700,
} }
}; };
......
drivers/media/rc/keymaps/rc-behold-columbus.c
View file @ 6d741bfe
...@@ -85,10 +85,10 @@ static struct rc_map_table behold_columbus[] = { ...@@ -85,10 +85,10 @@ static struct rc_map_table behold_columbus[] = {
static struct rc_map_list behold_columbus_map = { static struct rc_map_list behold_columbus_map = {
.map = { .map = {
.scan = behold_columbus, .scan = behold_columbus,
.size = ARRAY_SIZE(behold_columbus), .size = ARRAY_SIZE(behold_columbus),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_BEHOLD_COLUMBUS, .name = RC_MAP_BEHOLD_COLUMBUS,
} }
}; };
......
drivers/media/rc/keymaps/rc-behold.c
View file @ 6d741bfe
...@@ -118,10 +118,10 @@ static struct rc_map_table behold[] = { ...@@ -118,10 +118,10 @@ static struct rc_map_table behold[] = {
static struct rc_map_list behold_map = { static struct rc_map_list behold_map = {
.map = { .map = {
.scan = behold, .scan = behold,
.size = ARRAY_SIZE(behold), .size = ARRAY_SIZE(behold),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_BEHOLD, .name = RC_MAP_BEHOLD,
} }
}; };
......
drivers/media/rc/keymaps/rc-budget-ci-old.c
View file @ 6d741bfe
...@@ -70,10 +70,10 @@ static struct rc_map_table budget_ci_old[] = { ...@@ -70,10 +70,10 @@ static struct rc_map_table budget_ci_old[] = {
static struct rc_map_list budget_ci_old_map = { static struct rc_map_list budget_ci_old_map = {
.map = { .map = {
.scan = budget_ci_old, .scan = budget_ci_old,
.size = ARRAY_SIZE(budget_ci_old), .size = ARRAY_SIZE(budget_ci_old),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_BUDGET_CI_OLD, .name = RC_MAP_BUDGET_CI_OLD,
} }
}; };
......
drivers/media/rc/keymaps/rc-cec.c
View file @ 6d741bfe
...@@ -160,7 +160,7 @@ static struct rc_map_list cec_map = { ...@@ -160,7 +160,7 @@ static struct rc_map_list cec_map = {
.map = { .map = {
.scan = cec, .scan = cec,
.size = ARRAY_SIZE(cec), .size = ARRAY_SIZE(cec),
.rc_type = RC_TYPE_CEC, .rc_proto = RC_PROTO_CEC,
.name = RC_MAP_CEC, .name = RC_MAP_CEC,
} }
}; };
......
drivers/media/rc/keymaps/rc-cinergy-1400.c
View file @ 6d741bfe
...@@ -61,10 +61,10 @@ static struct rc_map_table cinergy_1400[] = { ...@@ -61,10 +61,10 @@ static struct rc_map_table cinergy_1400[] = {
static struct rc_map_list cinergy_1400_map = { static struct rc_map_list cinergy_1400_map = {
.map = { .map = {
.scan = cinergy_1400, .scan = cinergy_1400,
.size = ARRAY_SIZE(cinergy_1400), .size = ARRAY_SIZE(cinergy_1400),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_CINERGY_1400, .name = RC_MAP_CINERGY_1400,
} }
}; };
......
drivers/media/rc/keymaps/rc-cinergy.c
View file @ 6d741bfe
...@@ -55,10 +55,10 @@ static struct rc_map_table cinergy[] = { ...@@ -55,10 +55,10 @@ static struct rc_map_table cinergy[] = {
static struct rc_map_list cinergy_map = { static struct rc_map_list cinergy_map = {
.map = { .map = {
.scan = cinergy, .scan = cinergy,
.size = ARRAY_SIZE(cinergy), .size = ARRAY_SIZE(cinergy),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_CINERGY, .name = RC_MAP_CINERGY,
} }
}; };
......
drivers/media/rc/keymaps/rc-d680-dmb.c
View file @ 6d741bfe
...@@ -51,10 +51,10 @@ static struct rc_map_table rc_map_d680_dmb_table[] = { ...@@ -51,10 +51,10 @@ static struct rc_map_table rc_map_d680_dmb_table[] = {
static struct rc_map_list d680_dmb_map = { static struct rc_map_list d680_dmb_map = {
.map = { .map = {
.scan = rc_map_d680_dmb_table, .scan = rc_map_d680_dmb_table,
.size = ARRAY_SIZE(rc_map_d680_dmb_table), .size = ARRAY_SIZE(rc_map_d680_dmb_table),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_D680_DMB, .name = RC_MAP_D680_DMB,
} }
}; };
......
drivers/media/rc/keymaps/rc-delock-61959.c
View file @ 6d741bfe
...@@ -58,10 +58,10 @@ static struct rc_map_table delock_61959[] = { ...@@ -58,10 +58,10 @@ static struct rc_map_table delock_61959[] = {
static struct rc_map_list delock_61959_map = { static struct rc_map_list delock_61959_map = {
.map = { .map = {
.scan = delock_61959, .scan = delock_61959,
.size = ARRAY_SIZE(delock_61959), .size = ARRAY_SIZE(delock_61959),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DELOCK_61959, .name = RC_MAP_DELOCK_61959,
} }
}; };
......
drivers/media/rc/keymaps/rc-dib0700-nec.c
View file @ 6d741bfe
...@@ -101,10 +101,10 @@ static struct rc_map_table dib0700_nec_table[] = { ...@@ -101,10 +101,10 @@ static struct rc_map_table dib0700_nec_table[] = {
static struct rc_map_list dib0700_nec_map = { static struct rc_map_list dib0700_nec_map = {
.map = { .map = {
.scan = dib0700_nec_table, .scan = dib0700_nec_table,
.size = ARRAY_SIZE(dib0700_nec_table), .size = ARRAY_SIZE(dib0700_nec_table),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DIB0700_NEC_TABLE, .name = RC_MAP_DIB0700_NEC_TABLE,
} }
}; };
......
drivers/media/rc/keymaps/rc-dib0700-rc5.c
View file @ 6d741bfe
...@@ -212,10 +212,10 @@ static struct rc_map_table dib0700_rc5_table[] = { ...@@ -212,10 +212,10 @@ static struct rc_map_table dib0700_rc5_table[] = {
static struct rc_map_list dib0700_rc5_map = { static struct rc_map_list dib0700_rc5_map = {
.map = { .map = {
.scan = dib0700_rc5_table, .scan = dib0700_rc5_table,
.size = ARRAY_SIZE(dib0700_rc5_table), .size = ARRAY_SIZE(dib0700_rc5_table),
.rc_type = RC_TYPE_RC5, .rc_proto = RC_PROTO_RC5,
.name = RC_MAP_DIB0700_RC5_TABLE, .name = RC_MAP_DIB0700_RC5_TABLE,
} }
}; };
......
drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
View file @ 6d741bfe
...@@ -75,10 +75,10 @@ static struct rc_map_table digitalnow_tinytwin[] = { ...@@ -75,10 +75,10 @@ static struct rc_map_table digitalnow_tinytwin[] = {
static struct rc_map_list digitalnow_tinytwin_map = { static struct rc_map_list digitalnow_tinytwin_map = {
.map = { .map = {
.scan = digitalnow_tinytwin, .scan = digitalnow_tinytwin,
.size = ARRAY_SIZE(digitalnow_tinytwin), .size = ARRAY_SIZE(digitalnow_tinytwin),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DIGITALNOW_TINYTWIN, .name = RC_MAP_DIGITALNOW_TINYTWIN,
} }
}; };
......
drivers/media/rc/keymaps/rc-digittrade.c
View file @ 6d741bfe
...@@ -59,10 +59,10 @@ static struct rc_map_table digittrade[] = { ...@@ -59,10 +59,10 @@ static struct rc_map_table digittrade[] = {
static struct rc_map_list digittrade_map = { static struct rc_map_list digittrade_map = {
.map = { .map = {
.scan = digittrade, .scan = digittrade,
.size = ARRAY_SIZE(digittrade), .size = ARRAY_SIZE(digittrade),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DIGITTRADE, .name = RC_MAP_DIGITTRADE,
} }
}; };
......
drivers/media/rc/keymaps/rc-dm1105-nec.c
View file @ 6d741bfe
...@@ -53,10 +53,10 @@ static struct rc_map_table dm1105_nec[] = { ...@@ -53,10 +53,10 @@ static struct rc_map_table dm1105_nec[] = {
static struct rc_map_list dm1105_nec_map = { static struct rc_map_list dm1105_nec_map = {
.map = { .map = {
.scan = dm1105_nec, .scan = dm1105_nec,
.size = ARRAY_SIZE(dm1105_nec), .size = ARRAY_SIZE(dm1105_nec),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DM1105_NEC, .name = RC_MAP_DM1105_NEC,
} }
}; };
......
drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
View file @ 6d741bfe
...@@ -55,10 +55,10 @@ static struct rc_map_table dntv_live_dvb_t[] = { ...@@ -55,10 +55,10 @@ static struct rc_map_table dntv_live_dvb_t[] = {
static struct rc_map_list dntv_live_dvb_t_map = { static struct rc_map_list dntv_live_dvb_t_map = {
.map = { .map = {
.scan = dntv_live_dvb_t, .scan = dntv_live_dvb_t,
.size = ARRAY_SIZE(dntv_live_dvb_t), .size = ARRAY_SIZE(dntv_live_dvb_t),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DNTV_LIVE_DVB_T, .name = RC_MAP_DNTV_LIVE_DVB_T,
} }
}; };
......
drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
View file @ 6d741bfe
...@@ -74,10 +74,10 @@ static struct rc_map_table dntv_live_dvbt_pro[] = { ...@@ -74,10 +74,10 @@ static struct rc_map_table dntv_live_dvbt_pro[] = {
static struct rc_map_list dntv_live_dvbt_pro_map = { static struct rc_map_list dntv_live_dvbt_pro_map = {
.map = { .map = {
.scan = dntv_live_dvbt_pro, .scan = dntv_live_dvbt_pro,
.size = ARRAY_SIZE(dntv_live_dvbt_pro), .size = ARRAY_SIZE(dntv_live_dvbt_pro),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_DNTV_LIVE_DVBT_PRO, .name = RC_MAP_DNTV_LIVE_DVBT_PRO,
} }
}; };
......
drivers/media/rc/keymaps/rc-dtt200u.c
View file @ 6d741bfe
...@@ -35,10 +35,10 @@ static struct rc_map_table dtt200u_table[] = { ...@@ -35,10 +35,10 @@ static struct rc_map_table dtt200u_table[] = {
static struct rc_map_list dtt200u_map = { static struct rc_map_list dtt200u_map = {
.map = { .map = {
.scan = dtt200u_table, .scan = dtt200u_table,
.size = ARRAY_SIZE(dtt200u_table), .size = ARRAY_SIZE(dtt200u_table),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DTT200U, .name = RC_MAP_DTT200U,
} }
}; };
......
drivers/media/rc/keymaps/rc-dvbsky.c
View file @ 6d741bfe
...@@ -54,10 +54,10 @@ static struct rc_map_table rc5_dvbsky[] = { ...@@ -54,10 +54,10 @@ static struct rc_map_table rc5_dvbsky[] = {
static struct rc_map_list rc5_dvbsky_map = { static struct rc_map_list rc5_dvbsky_map = {
.map = { .map = {
.scan = rc5_dvbsky, .scan = rc5_dvbsky,
.size = ARRAY_SIZE(rc5_dvbsky), .size = ARRAY_SIZE(rc5_dvbsky),
.rc_type = RC_TYPE_RC5, .rc_proto = RC_PROTO_RC5,
.name = RC_MAP_DVBSKY, .name = RC_MAP_DVBSKY,
} }
}; };
......
drivers/media/rc/keymaps/rc-dvico-mce.c
View file @ 6d741bfe
...@@ -61,10 +61,10 @@ static struct rc_map_table rc_map_dvico_mce_table[] = { ...@@ -61,10 +61,10 @@ static struct rc_map_table rc_map_dvico_mce_table[] = {
static struct rc_map_list dvico_mce_map = { static struct rc_map_list dvico_mce_map = {
.map = { .map = {
.scan = rc_map_dvico_mce_table, .scan = rc_map_dvico_mce_table,
.size = ARRAY_SIZE(rc_map_dvico_mce_table), .size = ARRAY_SIZE(rc_map_dvico_mce_table),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DVICO_MCE, .name = RC_MAP_DVICO_MCE,
} }
}; };
......
drivers/media/rc/keymaps/rc-dvico-portable.c
View file @ 6d741bfe
...@@ -52,10 +52,10 @@ static struct rc_map_table rc_map_dvico_portable_table[] = { ...@@ -52,10 +52,10 @@ static struct rc_map_table rc_map_dvico_portable_table[] = {
static struct rc_map_list dvico_portable_map = { static struct rc_map_list dvico_portable_map = {
.map = { .map = {
.scan = rc_map_dvico_portable_table, .scan = rc_map_dvico_portable_table,
.size = ARRAY_SIZE(rc_map_dvico_portable_table), .size = ARRAY_SIZE(rc_map_dvico_portable_table),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_DVICO_PORTABLE, .name = RC_MAP_DVICO_PORTABLE,
} }
}; };
......
drivers/media/rc/keymaps/rc-em-terratec.c
View file @ 6d741bfe
...@@ -46,10 +46,10 @@ static struct rc_map_table em_terratec[] = { ...@@ -46,10 +46,10 @@ static struct rc_map_table em_terratec[] = {
static struct rc_map_list em_terratec_map = { static struct rc_map_list em_terratec_map = {
.map = { .map = {
.scan = em_terratec, .scan = em_terratec,
.size = ARRAY_SIZE(em_terratec), .size = ARRAY_SIZE(em_terratec),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EM_TERRATEC, .name = RC_MAP_EM_TERRATEC,
} }
}; };
......
drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
View file @ 6d741bfe
...@@ -58,10 +58,10 @@ static struct rc_map_table encore_enltv_fm53[] = { ...@@ -58,10 +58,10 @@ static struct rc_map_table encore_enltv_fm53[] = {
static struct rc_map_list encore_enltv_fm53_map = { static struct rc_map_list encore_enltv_fm53_map = {
.map = { .map = {
.scan = encore_enltv_fm53, .scan = encore_enltv_fm53,
.size = ARRAY_SIZE(encore_enltv_fm53), .size = ARRAY_SIZE(encore_enltv_fm53),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV_FM53, .name = RC_MAP_ENCORE_ENLTV_FM53,
} }
}; };
......
drivers/media/rc/keymaps/rc-encore-enltv.c
View file @ 6d741bfe
...@@ -89,10 +89,10 @@ static struct rc_map_table encore_enltv[] = { ...@@ -89,10 +89,10 @@ static struct rc_map_table encore_enltv[] = {
static struct rc_map_list encore_enltv_map = { static struct rc_map_list encore_enltv_map = {
.map = { .map = {
.scan = encore_enltv, .scan = encore_enltv,
.size = ARRAY_SIZE(encore_enltv), .size = ARRAY_SIZE(encore_enltv),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV, .name = RC_MAP_ENCORE_ENLTV,
} }
}; };
......
drivers/media/rc/keymaps/rc-encore-enltv2.c
View file @ 6d741bfe
...@@ -67,10 +67,10 @@ static struct rc_map_table encore_enltv2[] = { ...@@ -67,10 +67,10 @@ static struct rc_map_table encore_enltv2[] = {
static struct rc_map_list encore_enltv2_map = { static struct rc_map_list encore_enltv2_map = {
.map = { .map = {
.scan = encore_enltv2, .scan = encore_enltv2,
.size = ARRAY_SIZE(encore_enltv2), .size = ARRAY_SIZE(encore_enltv2),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_ENCORE_ENLTV2, .name = RC_MAP_ENCORE_ENLTV2,
} }
}; };
......
drivers/media/rc/keymaps/rc-evga-indtube.c
View file @ 6d741bfe
...@@ -38,10 +38,10 @@ static struct rc_map_table evga_indtube[] = { ...@@ -38,10 +38,10 @@ static struct rc_map_table evga_indtube[] = {
static struct rc_map_list evga_indtube_map = { static struct rc_map_list evga_indtube_map = {
.map = { .map = {
.scan = evga_indtube, .scan = evga_indtube,
.size = ARRAY_SIZE(evga_indtube), .size = ARRAY_SIZE(evga_indtube),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EVGA_INDTUBE, .name = RC_MAP_EVGA_INDTUBE,
} }
}; };
......
drivers/media/rc/keymaps/rc-eztv.c
View file @ 6d741bfe
...@@ -73,10 +73,10 @@ static struct rc_map_table eztv[] = { ...@@ -73,10 +73,10 @@ static struct rc_map_table eztv[] = {
static struct rc_map_list eztv_map = { static struct rc_map_list eztv_map = {
.map = { .map = {
.scan = eztv, .scan = eztv,
.size = ARRAY_SIZE(eztv), .size = ARRAY_SIZE(eztv),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_EZTV, .name = RC_MAP_EZTV,
} }
}; };
......
drivers/media/rc/keymaps/rc-flydvb.c
View file @ 6d741bfe
...@@ -54,10 +54,10 @@ static struct rc_map_table flydvb[] = { ...@@ -54,10 +54,10 @@ static struct rc_map_table flydvb[] = {
static struct rc_map_list flydvb_map = { static struct rc_map_list flydvb_map = {
.map = { .map = {
.scan = flydvb, .scan = flydvb,
.size = ARRAY_SIZE(flydvb), .size = ARRAY_SIZE(flydvb),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FLYDVB, .name = RC_MAP_FLYDVB,
} }
}; };
......
drivers/media/rc/keymaps/rc-flyvideo.c
View file @ 6d741bfe
...@@ -47,10 +47,10 @@ static struct rc_map_table flyvideo[] = { ...@@ -47,10 +47,10 @@ static struct rc_map_table flyvideo[] = {
static struct rc_map_list flyvideo_map = { static struct rc_map_list flyvideo_map = {
.map = { .map = {
.scan = flyvideo, .scan = flyvideo,
.size = ARRAY_SIZE(flyvideo), .size = ARRAY_SIZE(flyvideo),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FLYVIDEO, .name = RC_MAP_FLYVIDEO,
} }
}; };
......
drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
View file @ 6d741bfe
...@@ -75,10 +75,10 @@ static struct rc_map_table fusionhdtv_mce[] = { ...@@ -75,10 +75,10 @@ static struct rc_map_table fusionhdtv_mce[] = {
static struct rc_map_list fusionhdtv_mce_map = { static struct rc_map_list fusionhdtv_mce_map = {
.map = { .map = {
.scan = fusionhdtv_mce, .scan = fusionhdtv_mce,
.size = ARRAY_SIZE(fusionhdtv_mce), .size = ARRAY_SIZE(fusionhdtv_mce),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_FUSIONHDTV_MCE, .name = RC_MAP_FUSIONHDTV_MCE,
} }
}; };
......
drivers/media/rc/keymaps/rc-gadmei-rm008z.c
View file @ 6d741bfe
...@@ -58,10 +58,10 @@ static struct rc_map_table gadmei_rm008z[] = { ...@@ -58,10 +58,10 @@ static struct rc_map_table gadmei_rm008z[] = {
static struct rc_map_list gadmei_rm008z_map = { static struct rc_map_list gadmei_rm008z_map = {
.map = { .map = {
.scan = gadmei_rm008z, .scan = gadmei_rm008z,
.size = ARRAY_SIZE(gadmei_rm008z), .size = ARRAY_SIZE(gadmei_rm008z),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GADMEI_RM008Z, .name = RC_MAP_GADMEI_RM008Z,
} }
}; };
......
drivers/media/rc/keymaps/rc-geekbox.c
View file @ 6d741bfe
...@@ -31,10 +31,10 @@ static struct rc_map_table geekbox[] = { ...@@ -31,10 +31,10 @@ static struct rc_map_table geekbox[] = {
static struct rc_map_list geekbox_map = { static struct rc_map_list geekbox_map = {
.map = { .map = {
.scan = geekbox, .scan = geekbox,
.size = ARRAY_SIZE(geekbox), .size = ARRAY_SIZE(geekbox),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_GEEKBOX, .name = RC_MAP_GEEKBOX,
} }
}; };
......
drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
View file @ 6d741bfe
...@@ -61,10 +61,10 @@ static struct rc_map_table genius_tvgo_a11mce[] = { ...@@ -61,10 +61,10 @@ static struct rc_map_table genius_tvgo_a11mce[] = {
static struct rc_map_list genius_tvgo_a11mce_map = { static struct rc_map_list genius_tvgo_a11mce_map = {
.map = { .map = {
.scan = genius_tvgo_a11mce, .scan = genius_tvgo_a11mce,
.size = ARRAY_SIZE(genius_tvgo_a11mce), .size = ARRAY_SIZE(genius_tvgo_a11mce),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GENIUS_TVGO_A11MCE, .name = RC_MAP_GENIUS_TVGO_A11MCE,
} }
}; };
......
drivers/media/rc/keymaps/rc-gotview7135.c
View file @ 6d741bfe
...@@ -56,10 +56,10 @@ static struct rc_map_table gotview7135[] = { ...@@ -56,10 +56,10 @@ static struct rc_map_table gotview7135[] = {
static struct rc_map_list gotview7135_map = { static struct rc_map_list gotview7135_map = {
.map = { .map = {
.scan = gotview7135, .scan = gotview7135,
.size = ARRAY_SIZE(gotview7135), .size = ARRAY_SIZE(gotview7135),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_GOTVIEW7135, .name = RC_MAP_GOTVIEW7135,
} }
}; };
......
drivers/media/rc/keymaps/rc-hauppauge.c
View file @ 6d741bfe
...@@ -269,10 +269,10 @@ static struct rc_map_table rc5_hauppauge_new[] = { ...@@ -269,10 +269,10 @@ static struct rc_map_table rc5_hauppauge_new[] = {
static struct rc_map_list rc5_hauppauge_new_map = { static struct rc_map_list rc5_hauppauge_new_map = {
.map = { .map = {
.scan = rc5_hauppauge_new, .scan = rc5_hauppauge_new,
.size = ARRAY_SIZE(rc5_hauppauge_new), .size = ARRAY_SIZE(rc5_hauppauge_new),
.rc_type = RC_TYPE_RC5, .rc_proto = RC_PROTO_RC5,
.name = RC_MAP_HAUPPAUGE, .name = RC_MAP_HAUPPAUGE,
} }
}; };
......
drivers/media/rc/keymaps/rc-imon-mce.c
View file @ 6d741bfe
...@@ -118,11 +118,11 @@ static struct rc_map_table imon_mce[] = { ...@@ -118,11 +118,11 @@ static struct rc_map_table imon_mce[] = {
static struct rc_map_list imon_mce_map = { static struct rc_map_list imon_mce_map = {
.map = { .map = {
.scan = imon_mce, .scan = imon_mce,
.size = ARRAY_SIZE(imon_mce), .size = ARRAY_SIZE(imon_mce),
/* its RC6, but w/a hardware decoder */ /* its RC6, but w/a hardware decoder */
.rc_type = RC_TYPE_RC6_MCE, .rc_proto = RC_PROTO_RC6_MCE,
.name = RC_MAP_IMON_MCE, .name = RC_MAP_IMON_MCE,
} }
}; };
......
drivers/media/rc/keymaps/rc-imon-pad.c
View file @ 6d741bfe
...@@ -132,11 +132,11 @@ static struct rc_map_table imon_pad[] = { ...@@ -132,11 +132,11 @@ static struct rc_map_table imon_pad[] = {
static struct rc_map_list imon_pad_map = { static struct rc_map_list imon_pad_map = {
.map = { .map = {
.scan = imon_pad, .scan = imon_pad,
.size = ARRAY_SIZE(imon_pad), .size = ARRAY_SIZE(imon_pad),
/* actual protocol details unknown, hardware decoder */ /* actual protocol details unknown, hardware decoder */
.rc_type = RC_TYPE_OTHER, .rc_proto = RC_PROTO_OTHER,
.name = RC_MAP_IMON_PAD, .name = RC_MAP_IMON_PAD,
} }
}; };
......
drivers/media/rc/keymaps/rc-iodata-bctv7e.c
View file @ 6d741bfe
...@@ -65,10 +65,10 @@ static struct rc_map_table iodata_bctv7e[] = { ...@@ -65,10 +65,10 @@ static struct rc_map_table iodata_bctv7e[] = {
static struct rc_map_list iodata_bctv7e_map = { static struct rc_map_list iodata_bctv7e_map = {
.map = { .map = {
.scan = iodata_bctv7e, .scan = iodata_bctv7e,
.size = ARRAY_SIZE(iodata_bctv7e), .size = ARRAY_SIZE(iodata_bctv7e),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_IODATA_BCTV7E, .name = RC_MAP_IODATA_BCTV7E,
} }
}; };
......
drivers/media/rc/keymaps/rc-it913x-v1.c
View file @ 6d741bfe
...@@ -71,10 +71,10 @@ static struct rc_map_table it913x_v1_rc[] = { ...@@ -71,10 +71,10 @@ static struct rc_map_table it913x_v1_rc[] = {
static struct rc_map_list it913x_v1_map = { static struct rc_map_list it913x_v1_map = {
.map = { .map = {
.scan = it913x_v1_rc, .scan = it913x_v1_rc,
.size = ARRAY_SIZE(it913x_v1_rc), .size = ARRAY_SIZE(it913x_v1_rc),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_IT913X_V1, .name = RC_MAP_IT913X_V1,
} }
}; };
......
drivers/media/rc/keymaps/rc-it913x-v2.c
View file @ 6d741bfe
...@@ -70,10 +70,10 @@ static struct rc_map_table it913x_v2_rc[] = { ...@@ -70,10 +70,10 @@ static struct rc_map_table it913x_v2_rc[] = {
static struct rc_map_list it913x_v2_map = { static struct rc_map_list it913x_v2_map = {
.map = { .map = {
.scan = it913x_v2_rc, .scan = it913x_v2_rc,
.size = ARRAY_SIZE(it913x_v2_rc), .size = ARRAY_SIZE(it913x_v2_rc),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_IT913X_V2, .name = RC_MAP_IT913X_V2,
} }
}; };
......
drivers/media/rc/keymaps/rc-kaiomy.c
View file @ 6d741bfe
...@@ -64,10 +64,10 @@ static struct rc_map_table kaiomy[] = { ...@@ -64,10 +64,10 @@ static struct rc_map_table kaiomy[] = {
static struct rc_map_list kaiomy_map = { static struct rc_map_list kaiomy_map = {
.map = { .map = {
.scan = kaiomy, .scan = kaiomy,
.size = ARRAY_SIZE(kaiomy), .size = ARRAY_SIZE(kaiomy),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_KAIOMY, .name = RC_MAP_KAIOMY,
} }
}; };
......
drivers/media/rc/keymaps/rc-kworld-315u.c
View file @ 6d741bfe
...@@ -60,10 +60,10 @@ static struct rc_map_table kworld_315u[] = { ...@@ -60,10 +60,10 @@ static struct rc_map_table kworld_315u[] = {
static struct rc_map_list kworld_315u_map = { static struct rc_map_list kworld_315u_map = {
.map = { .map = {
.scan = kworld_315u, .scan = kworld_315u,
.size = ARRAY_SIZE(kworld_315u), .size = ARRAY_SIZE(kworld_315u),
.rc_type = RC_TYPE_NEC, .rc_proto = RC_PROTO_NEC,
.name = RC_MAP_KWORLD_315U, .name = RC_MAP_KWORLD_315U,
} }
}; };
......
drivers/media/rc/keymaps/rc-kworld-pc150u.c
View file @ 6d741bfe
...@@ -78,10 +78,10 @@ static struct rc_map_table kworld_pc150u[] = { ...@@ -78,10 +78,10 @@ static struct rc_map_table kworld_pc150u[] = {
static struct rc_map_list kworld_pc150u_map = { static struct rc_map_list kworld_pc150u_map = {
.map = { .map = {
.scan = kworld_pc150u, .scan = kworld_pc150u,
.size = ARRAY_SIZE(kworld_pc150u), .size = ARRAY_SIZE(kworld_pc150u),
.rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */
.name = RC_MAP_KWORLD_PC150U, .name = RC_MAP_KWORLD_PC150U,
} }
}; };
......
drivers/media/rc/keymaps/rc-lme2510.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-manli.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-medion-x10.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-nebula.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-norwood.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-npgtech.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-pctv-sedna.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-pinnacle-grey.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-pixelview-new.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-pixelview.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-proteus-2309.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-purpletv.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-pv951.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-rc6-mce.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-reddo.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-streamzap.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-su3000.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-tbs-nec.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-terratec-slim.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-tevii-nec.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-tivo.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-trekstor.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-tt-1500.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-twinhan1027.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-videomate-m1f.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-winfast.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/keymaps/rc-zx-irdec.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/mceusb.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/meson-ir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/mtk-cir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/nuvoton-cir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/rc-core-priv.h
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/rc-ir-raw.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/rc-loopback.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/rc-main.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/redrat3.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/serial_ir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/sir_ir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/st_rc.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/streamzap.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/sunxi-cir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/ttusbir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/winbond-cir.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/rc/zx-irdec.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/au0828/au0828-input.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/cx231xx/cx231xx-input.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/af9015.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/af9035.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/anysee.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/az6007.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/dvb_usb.h
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/dvbsky.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/lmedm04.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/cxusb.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dib0700.h
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dib0700_core.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dib0700_devices.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dtt200u.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dvb-usb.h
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/dw2102.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/m920x.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/pctv452e.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/technisat-usb2.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/dvb-usb/ttusb2.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/em28xx/em28xx-input.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/hdpvr/hdpvr-i2c.c
View file @ 6d741bfe
This diff is collapsed.
drivers/media/usb/tm6000/tm6000-input.c
View file @ 6d741bfe
This diff is collapsed.
include/media/i2c/ir-kbd-i2c.h
View file @ 6d741bfe
This diff is collapsed.
include/media/rc-core.h
View file @ 6d741bfe
This diff is collapsed.
include/media/rc-map.h
View file @ 6d741bfe
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