Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357335
b: refs/heads/master
c: b963c20
h: refs/heads/master
i:
  357333: bbb76a7
  357331: e53c2ab
  357327: 4331bd4
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Jan 6, 2013
1 parent a4bcd8b commit 2985a98
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b75322af1bd3b365ce3a5f2ac6df329bf725656
refs/heads/master: b963c2083ae3ec67052dfc6e2ec8216c479843d8
36 changes: 20 additions & 16 deletions trunk/drivers/media/usb/dvb-usb-v2/it913x.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
};

/* Callbacks for DVB USB */
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
#define IT913X_POLL 250
static int it913x_rc_query(struct dvb_usb_device *d)
{
Expand All @@ -334,6 +335,25 @@ static int it913x_rc_query(struct dvb_usb_device *d)
return ret;
}

static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
{
struct it913x_state *st = d->priv;

if (st->proprietary_ir == false) {
rc->map_name = NULL;
return 0;
}

rc->allowed_protos = RC_BIT_NEC;
rc->query = it913x_rc_query;
rc->interval = 250;

return 0;
}
#else
#define it913x_get_rc_config NULL
#endif

/* Firmware sets raw */
static const char fw_it9135_v1[] = FW_IT9135_V1;
static const char fw_it9135_v2[] = FW_IT9135_V2;
Expand Down Expand Up @@ -696,22 +716,6 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
}

/* DVB USB Driver */
static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
{
struct it913x_state *st = d->priv;

if (st->proprietary_ir == false) {
rc->map_name = NULL;
return 0;
}

rc->allowed_protos = RC_BIT_NEC;
rc->query = it913x_rc_query;
rc->interval = 250;

return 0;
}

static int it913x_get_adapter_count(struct dvb_usb_device *d)
{
struct it913x_state *st = d->priv;
Expand Down

0 comments on commit 2985a98

Please sign in to comment.