Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/hid/hid-picolcd_cir.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report) 
		return -ENOMEM;



	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->close            = picolcd_cir_close;

	rdev->device_name      = data->hdev->name;

drivers/media/cec/cec-adap.c

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg, 
		}



		/* 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 */

		if (adap->rc_repeating)

drivers/media/cec/cec-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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.version = 1;

	adap->rc->driver_name = CEC_NAME;

	adap->rc->allowed_protocols = RC_BIT_CEC;

	adap->rc->enabled_protocols = RC_BIT_CEC;

	adap->rc->allowed_protocols = RC_PROTO_BIT_CEC;

	adap->rc->enabled_protocols = RC_PROTO_BIT_CEC;

	adap->rc->priv = adap;

	adap->rc->map_name = RC_MAP_CEC;

	adap->rc->timeout = MS_TO_NS(100);

drivers/media/common/siano/smsir.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int sms_ir_init(struct smscore_device_t *coredev) 
#endif



	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->driver_name = MODULE_NAME;

drivers/media/i2c/ir-kbd-i2c.c

+29 −28
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 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)

{

	unsigned char buf[6];
@@ -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",

			start, range, toggle, dev, code);



		*protocol = RC_TYPE_RC5;

		*protocol = RC_PROTO_RC5;

		*scancode = RC_SCANCODE_RC5(dev, code);

		*ptoggle = toggle;
@@ -111,13 +111,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, 


		if (vendor == 0x800f) {

			*ptoggle = (dev & 0x80) != 0;

			*protocol = RC_TYPE_RC6_MCE;

			*protocol = RC_PROTO_RC6_MCE;

			dev &= 0x7f;

			dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n",

						*ptoggle, vendor, dev, code);

		} else {

			*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",

							vendor, dev, code);

		}
@@ -130,13 +130,13 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol, 
	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)

{

	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)

{

	int ret;
@@ -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);

}



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)

{

	unsigned char b;
@@ -166,13 +166,13 @@ static int get_key_pixelview(struct IR_i2c *ir, enum rc_type *protocol, 
		return -EIO;

	}



	*protocol = RC_TYPE_OTHER;

	*protocol = RC_PROTO_OTHER;

	*scancode = b;

	*toggle = 0;

	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)

{

	unsigned char buf[4];
@@ -191,13 +191,13 @@ static int get_key_fusionhdtv(struct IR_i2c *ir, enum rc_type *protocol, 
	if(buf[0] != 0x1 ||  buf[1] != 0xfe)

		return 0;



	*protocol = RC_TYPE_UNKNOWN;

	*protocol = RC_PROTO_UNKNOWN;

	*scancode = buf[2];

	*toggle = 0;

	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)

{

	unsigned char b;
@@ -221,13 +221,13 @@ static int get_key_knc1(struct IR_i2c *ir, enum rc_type *protocol, 
		/* keep old data */

		return 1;



	*protocol = RC_TYPE_UNKNOWN;

	*protocol = RC_PROTO_UNKNOWN;

	*scancode = b;

	*toggle = 0;

	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)

{

	unsigned char subaddr, key, keygroup;
@@ -262,7 +262,7 @@ static int get_key_avermedia_cardbus(struct IR_i2c *ir, enum rc_type *protocol, 
	}

	key |= (keygroup & 1) << 6;



	*protocol = RC_TYPE_UNKNOWN;

	*protocol = RC_PROTO_UNKNOWN;

	*scancode = key;

	if (ir->c->addr == 0x41) /* AVerMedia EM78P153 */

		*scancode |= keygroup << 8;
@@ -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)

{

	enum rc_type protocol;

	enum rc_proto protocol;

	u32 scancode;

	u8 toggle;

	int rc;
@@ -315,7 +315,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
{

	char *ir_codes = NULL;

	const char *name = NULL;

	u64 rc_type = RC_BIT_UNKNOWN;

	u64 rc_proto = RC_PROTO_BIT_UNKNOWN;

	struct IR_i2c *ir;

	struct rc_dev *rc = NULL;

	struct i2c_adapter *adap = client->adapter;
@@ -334,7 +334,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	case 0x64:

		name        = "Pixelview";

		ir->get_key = get_key_pixelview;

		rc_type     = RC_BIT_OTHER;

		rc_proto    = RC_PROTO_BIT_OTHER;

		ir_codes    = RC_MAP_EMPTY;

		break;

	case 0x18:
@@ -342,38 +342,39 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	case 0x1a:

		name        = "Hauppauge";

		ir->get_key = get_key_haup;

		rc_type     = RC_BIT_RC5;

		rc_proto    = RC_PROTO_BIT_RC5;

		ir_codes    = RC_MAP_HAUPPAUGE;

		break;

	case 0x30:

		name        = "KNC One";

		ir->get_key = get_key_knc1;

		rc_type     = RC_BIT_OTHER;

		rc_proto    = RC_PROTO_BIT_OTHER;

		ir_codes    = RC_MAP_EMPTY;

		break;

	case 0x6b:

		name        = "FusionHDTV";

		ir->get_key = get_key_fusionhdtv;

		rc_type     = RC_BIT_UNKNOWN;

		rc_proto    = RC_PROTO_BIT_UNKNOWN;

		ir_codes    = RC_MAP_FUSIONHDTV_MCE;

		break;

	case 0x40:

		name        = "AVerMedia Cardbus remote";

		ir->get_key = get_key_avermedia_cardbus;

		rc_type     = RC_BIT_OTHER;

		rc_proto    = RC_PROTO_BIT_OTHER;

		ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;

		break;

	case 0x41:

		name        = "AVerMedia EM78P153";

		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 */

		ir_codes    = RC_MAP_AVERMEDIA_M733A_RM_K6;

		break;

	case 0x71:

		name        = "Hauppauge/Zilog Z8";

		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;

		break;

	}
@@ -388,7 +389,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 


		name = init_data->name;

		if (init_data->type)

			rc_type = init_data->type;

			rc_proto = init_data->type;



		if (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) 
	ir->rc = rc;



	/* 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",

			addr);

		err = -ENODEV;
@@ -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

	 */

	rc->map_name       = ir->ir_codes;

	rc->allowed_protocols = rc_type;

	rc->enabled_protocols = rc_type;

	rc->allowed_protocols = rc_proto;

	rc->enabled_protocols = rc_proto;

	if (!rc->driver_name)

		rc->driver_name = MODULE_NAME;