Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271662
b: refs/heads/master
c: b71969b
h: refs/heads/master
v: v3
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed Aug 27, 2011
1 parent f02eeec commit d474bc3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a411e83944bc48ce274b1bafdb6929846815856c
refs/heads/master: b71969bee23ea0c44c594e5027ba26029d27afea
14 changes: 14 additions & 0 deletions trunk/drivers/media/rc/mceusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ static char DEVICE_RESUME[] = {MCE_CMD_NULL, MCE_CMD_PORT_SYS,
static char GET_REVISION[] = {MCE_CMD_PORT_SYS, MCE_CMD_G_REVISION};
static char GET_EMVER[] = {MCE_CMD_PORT_SYS, MCE_CMD_GETEMVER};
static char GET_WAKEVERSION[] = {MCE_CMD_PORT_SYS, MCE_CMD_GETWAKEVERSION};
static char FLASH_LED[] = {MCE_CMD_PORT_SYS, MCE_CMD_FLASHLED};
static char GET_UNKNOWN2[] = {MCE_CMD_PORT_IR, MCE_CMD_UNKNOWN2};
static char GET_CARRIER_FREQ[] = {MCE_CMD_PORT_IR, MCE_CMD_GETIRCFS};
static char GET_RX_TIMEOUT[] = {MCE_CMD_PORT_IR, MCE_CMD_GETIRTIMEOUT};
Expand Down Expand Up @@ -591,6 +592,9 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
dev_info(dev, "TX port %d: blaster is%s connected\n",
data1 + 1, data4 ? " not" : "");
break;
case MCE_CMD_FLASHLED:
dev_info(dev, "Attempting to flash LED\n");
break;
default:
dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
cmd, subcmd);
Expand Down Expand Up @@ -1163,6 +1167,14 @@ static void mceusb_get_parameters(struct mceusb_dev *ir)
}
}

static void mceusb_flash_led(struct mceusb_dev *ir)
{
if (ir->emver < 2)
return;

mce_async_out(ir, FLASH_LED, sizeof(FLASH_LED));
}

static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
{
struct device *dev = ir->dev;
Expand Down Expand Up @@ -1345,6 +1357,8 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,

mceusb_get_parameters(ir);

mceusb_flash_led(ir);

if (!ir->flags.no_tx)
mceusb_set_tx_mask(ir->rc, MCE_DEFAULT_TX_MASK);

Expand Down

0 comments on commit d474bc3

Please sign in to comment.