mceusb: buffer parsing and keymap cleanups
v2 cover mceusb: buffer parsing and keymap cleanups
This v2 series is actually one patch light from v1, as the Conexant device support patch has already been merged into the for_v2.6.38 tree, but adds another patch not in v1 which simply cleans up the mce keytable a bit and adds a missing mapping for one of my mce remotes.
The core good done by this patchset is to fix the reporting of trailing spaces, which makes lirc decode work again, and some necessary buffer parsing fixes specific to the first-gen device. v2 of the trailing space fix implements multiple suggestions from David Härdeman that greatly simplify the buffer parsing state machine.
Jarod Wilson (3):
mceusb: fix up reporting of trailing space
mceusb: buffer parsing fixups for 1st-gen device
IR: add tv power scancode to rc6 mce keymap
Signature · 2 lines
Jarod Wilson [email protected]
PATCH v2 1/3 mceusb: fix up reporting of trailing space
We were storing a bunch of spaces at the end of each signal, rather than a single long space. The in-kernel decoders were actually okay with this, but lirc isn't. As suggested by David Härdeman, switch to storing samples using ir_raw_event_store_with_filter, which auto-merges the consecutive space samples for us. This also allows us to bypass having to store rawir samples in our device struct, further simplifying the buffer parsing state machine. Both in-kernel decoders and lirc are happy again with this change.
Also included in this patch is proper parsing of 0x9f 0x01 commands, the removal of some magic number usage and some printk spew fixups.
--- drivers/media/IR/mceusb.c | 45 +++++++++++++-------------------------------- 1 files changed, 13 insertions(+), 32 deletions(-)
drivers/media/IR/mceusb.c +13 -32
@@ -74,6 +74,7 @@#define MCE_PACKET_LENGTH_MASK 0x1f/* Packet length mask */ /* Sub-commands, which follow MCE_COMMAND_HEADER or MCE_HW_CMD_HEADER */ +#define MCE_CMD_SIG_END 0x01/* End of signal */ #define MCE_CMD_PING 0x03/* Ping device */ #define MCE_CMD_UNKNOWN 0x04/* Unknown */ #define MCE_CMD_UNKNOWN2 0x05/* Unknown */
@@ -422,6 +423,7 @@ static int mceusb_cmdsize(u8 cmd, u8 subcmd)case MCE_CMD_G_RXSENSOR : datasize =2 ;break ; +case MCE_CMD_SIG_END :case MCE_CMD_S_TXMASK :case MCE_CMD_S_RXSENSOR : datasize =1 ;
@@ -502,6 +504,9 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,break ;case MCE_COMMAND_HEADER :switch (subcmd) { +case MCE_CMD_SIG_END : +dev_info (dev,"End of signal\n" ); +break ;case MCE_CMD_PING :dev_info (dev,"Ping\n" );break ;
@@ -539,7 +544,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,if (len ==2 )dev_info (dev,"Get receive sensor\n" );else -dev_info (dev,"Received pulse count is %d\n" , +dev_info (dev,"Remaining pulse count is %d\n" , ((data1 <<8 ) | data2));break ;case MCE_RSP_CMD_INVALID :
@@ -763,7 +768,7 @@ static int mceusb_set_tx_carrier(void *priv, u32 carrier)if (carrier ==0 ) { ir->carrier = carrier; - cmdbuf[2 ] =0x01 ; + cmdbuf[2 ] =MCE_CMD_SIG_END ; cmdbuf[3 ] =MCE_IRDATA_TRAILER ;dev_dbg (ir->dev,"%s: disabling carrier " "modulation\n" , __func__);
@@ -816,25 +821,11 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len) rawir.duration = (ir->buf_in[i] &MCE_PULSE_MASK ) *MCE_TIME_UNIT *1000 ; -if ((ir->buf_in[i] &MCE_PULSE_MASK ) ==0x7f ) { -if (ir->rawir.pulse == rawir.pulse) { - ir->rawir.duration += rawir.duration; - }else { - ir->rawir.duration = rawir.duration; - ir->rawir.pulse = rawir.pulse; - } -if (ir->rem) -break ; - } - rawir.duration += ir->rawir.duration; - ir->rawir.duration =0 ; - ir->rawir.pulse = rawir.pulse; -dev_dbg (ir->dev,"Storing %s with duration %d\n" , rawir.pulse ?"pulse" :"space" , rawir.duration); -ir_raw_event_store (ir->idev, &rawir); +ir_raw_event_store_with_filter (ir->idev, &rawir);break ;case CMD_DATA : ir->rem--;
@@ -851,16 +842,8 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len) } ir->rem = (ir->cmd &MCE_PACKET_LENGTH_MASK );mceusb_dev_printdata (ir, ir->buf_in, i, ir->rem +1 , false); -if (ir->rem) { +if (ir->rem) ir->parser_state =PARSE_IRDATA ; -break ; - } -/* -* a package with len=0 (e. g. 0x80) means end of -* data. We could use it to do the call to -* ir_raw_event_handle(). For now, we don't need to -* use it. -*/ break ; }
@@ -1092,7 +1075,7 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,bool tx_mask_inverted;bool is_polaris; -dev_dbg (&intf->dev,": %s called\n" , __func__); +dev_dbg (&intf->dev,"%s called\n" , __func__); idesc = intf->cur_altsetting;
@@ -1122,7 +1105,7 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, ep_in = ep; ep_in->bmAttributes =USB_ENDPOINT_XFER_INT ; ep_in->bInterval =1 ; -dev_dbg (&intf->dev,": acceptable inbound endpoint " +dev_dbg (&intf->dev,"acceptable inbound endpoint " "found\n" ); }
@@ -1137,12 +1120,12 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, ep_out = ep; ep_out->bmAttributes =USB_ENDPOINT_XFER_INT ; ep_out->bInterval =1 ; -dev_dbg (&intf->dev,": acceptable outbound endpoint " +dev_dbg (&intf->dev,"acceptable outbound endpoint " "found\n" ); } }if (ep_in ==NULL ) { -dev_dbg (&intf->dev,": inbound and/or endpoint not found\n" ); +dev_dbg (&intf->dev,"inbound and/or endpoint not found\n" );return -ENODEV ; }
@@ -1169,8 +1152,6 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf, ir->flags.no_tx = mceusb_model[model].no_tx; ir->model = model; -init_ir_raw_event (&ir->rawir); -/* Saving usb interface data for use by the transmitter routine */ ir->usb_ep_in = ep_in; ir->usb_ep_out = ep_out;
Signature · 6 lines
1.7.1 -- Jarod Wilson [email protected]
PATCH v2 2/3 mceusb: buffer parsing fixups for 1st-gen device
In reply to Jarod WilsonIf we pass in an offset, we shouldn't skip 2 bytes. And the first-gen hardware generates a constant stream of interrupts, always with two header bytes, and if there's been no IR, with nothing else. Bail from ir processing without calling ir_handle_raw_event when we get such a buffer delivered to us.
--- drivers/media/IR/mceusb.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/media/IR/mceusb.c +5 -1
@@ -446,7 +446,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,return ;/* skip meaningless 0xb1 0x60 header bytes on orig receiver */ -if (ir->flags.microsoft_gen1 && !out) +if (ir->flags.microsoft_gen1 && !out && !offset) skip =2 ;if (len <= skip)
@@ -807,6 +807,10 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)if (ir->flags.microsoft_gen1) i =2 ; +/* if there's no data, just return now */ +if (buf_len <= i) +return ; +for (; i < buf_len; i++) {switch (ir->parser_state) {case SUBCMD :
Signature · 6 lines
1.7.1 -- Jarod Wilson [email protected]
PATCH v2 3/3 IR: add tv power scancode to rc6 mce keymap
In reply to Jarod WilsonAnd clean up some stray spaces.
--- drivers/media/IR/keymaps/rc-rc6-mce.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)
drivers/media/IR/keymaps/rc-rc6-mce.c +11 -10
@@ -26,8 +26,8 @@ static struct ir_scancode rc6_mce[] = { { 0x800f040a, KEY_DELETE }, { 0x800f040b, KEY_ENTER }, - { 0x800f040c, KEY_POWER }, - { 0x800f040d, KEY_PROG1 }, /* Windows MCE button */ + { 0x800f040c, KEY_POWER }, /* PC Power */ + { 0x800f040d, KEY_PROG1 }, /* Windows MCE button */ { 0x800f040e, KEY_MUTE }, { 0x800f040f, KEY_INFO },
@@ -56,31 +56,32 @@ static struct ir_scancode rc6_mce[] = { { 0x800f0422, KEY_OK }, { 0x800f0423, KEY_EXIT }, { 0x800f0424, KEY_DVD }, - { 0x800f0425, KEY_TUNER }, /* LiveTV */ - { 0x800f0426, KEY_EPG }, /* Guide */ - { 0x800f0427, KEY_ZOOM }, /* Aspect */ + { 0x800f0425, KEY_TUNER }, /* LiveTV */ + { 0x800f0426, KEY_EPG }, /* Guide */ + { 0x800f0427, KEY_ZOOM }, /* Aspect */ { 0x800f043a, KEY_BRIGHTNESSUP }, { 0x800f0446, KEY_TV }, - { 0x800f0447, KEY_AUDIO }, /* My Music */ - { 0x800f0448, KEY_PVR }, /* RecordedTV */ + { 0x800f0447, KEY_AUDIO }, /* My Music */ + { 0x800f0448, KEY_PVR }, /* RecordedTV */ { 0x800f0449, KEY_CAMERA }, { 0x800f044a, KEY_VIDEO }, { 0x800f044c, KEY_LANGUAGE }, { 0x800f044d, KEY_TITLE }, - { 0x800f044e, KEY_PRINT }, /* Print - HP OEM version of remote */ + { 0x800f044e, KEY_PRINT }, /* Print - HP OEM version of remote */ { 0x800f0450, KEY_RADIO }, - { 0x800f045a, KEY_SUBTITLE }, /* Caption/Teletext */ + { 0x800f045a, KEY_SUBTITLE }, /* Caption/Teletext */ { 0x800f045b, KEY_RED }, { 0x800f045c, KEY_GREEN }, { 0x800f045d, KEY_YELLOW }, { 0x800f045e, KEY_BLUE }, + { 0x800f0465, KEY_POWER2 }, /* TV Power */ { 0x800f046e, KEY_PLAYPAUSE }, - { 0x800f046f, KEY_MEDIA }, /* Start media application (NEW) */ + { 0x800f046f, KEY_MEDIA }, /* Start media application (NEW) */ { 0x800f0480, KEY_BRIGHTNESSDOWN }, { 0x800f0481, KEY_PLAYPAUSE },
Signature · 6 lines
1.7.1 -- Jarod Wilson [email protected]