2010-06-02 00:32:08 +04:00
|
|
|
/*
|
|
|
|
* Driver for USB Windows Media Center Ed. eHome Infrared Transceivers
|
|
|
|
*
|
2011-07-18 23:54:29 +04:00
|
|
|
* Copyright (c) 2010-2011, Jarod Wilson <jarod@redhat.com>
|
2010-06-02 00:32:08 +04:00
|
|
|
*
|
|
|
|
* Based on the original lirc_mceusb and lirc_mceusb2 drivers, by Dan
|
|
|
|
* Conti, Martin Blatter and Daniel Melander, the latter of which was
|
|
|
|
* in turn also based on the lirc_atiusb driver by Paul Miller. The
|
|
|
|
* two mce drivers were merged into one by Jarod Wilson, with transmit
|
|
|
|
* support for the 1st-gen device added primarily by Patrick Calhoun,
|
|
|
|
* with a bit of tweaks by Jarod. Debugging improvements and proper
|
|
|
|
* support for what appears to be 3rd-gen hardware added by Jarod.
|
|
|
|
* Initial port from lirc driver to ir-core drivery by Jarod, based
|
|
|
|
* partially on a port to an earlier proposed IR infrastructure by
|
|
|
|
* Jon Smirl, which included enhancements and simplifications to the
|
|
|
|
* incoming IR buffer parsing routines.
|
|
|
|
*
|
2011-07-18 23:54:29 +04:00
|
|
|
* Updated in July of 2011 with the aid of Microsoft's official
|
|
|
|
* remote/transceiver requirements and specification document, found at
|
|
|
|
* download.microsoft.com, title
|
|
|
|
* Windows-Media-Center-RC-IR-Collection-Green-Button-Specification-03-08-2011-V2.pdf
|
|
|
|
*
|
2010-06-02 00:32:08 +04:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/slab.h>
|
2010-12-16 19:23:07 +03:00
|
|
|
#include <linux/usb.h>
|
|
|
|
#include <linux/usb/input.h>
|
2011-07-18 23:54:23 +04:00
|
|
|
#include <linux/pm_wakeup.h>
|
2010-11-17 19:28:38 +03:00
|
|
|
#include <media/rc-core.h>
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2011-07-18 23:54:29 +04:00
|
|
|
#define DRIVER_VERSION "1.92"
|
|
|
|
#define DRIVER_AUTHOR "Jarod Wilson <jarod@redhat.com>"
|
2010-06-02 00:32:08 +04:00
|
|
|
#define DRIVER_DESC "Windows Media Center Ed. eHome Infrared Transceiver " \
|
|
|
|
"device driver"
|
|
|
|
#define DRIVER_NAME "mceusb"
|
|
|
|
|
2010-10-22 21:42:54 +04:00
|
|
|
#define USB_BUFLEN 32 /* USB reception buffer length */
|
|
|
|
#define USB_CTRL_MSG_SZ 2 /* Size of usb ctrl msg on gen1 hw */
|
|
|
|
#define MCE_G1_INIT_MSGS 40 /* Init messages on gen1 hw to throw out */
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* MCE constants */
|
2010-10-22 21:42:54 +04:00
|
|
|
#define MCE_CMDBUF_SIZE 384 /* MCE Command buffer length */
|
|
|
|
#define MCE_TIME_UNIT 50 /* Approx 50us resolution */
|
|
|
|
#define MCE_CODE_LENGTH 5 /* Normal length of packet (with header) */
|
|
|
|
#define MCE_PACKET_SIZE 4 /* Normal length of packet (without header) */
|
|
|
|
#define MCE_IRDATA_HEADER 0x84 /* Actual header format is 0x80 + num_bytes */
|
|
|
|
#define MCE_IRDATA_TRAILER 0x80 /* End of IR data */
|
|
|
|
#define MCE_TX_HEADER_LENGTH 3 /* # of bytes in the initializing tx header */
|
|
|
|
#define MCE_MAX_CHANNELS 2 /* Two transmitters, hardware dependent? */
|
|
|
|
#define MCE_DEFAULT_TX_MASK 0x03 /* Vals: TX1=0x01, TX2=0x02, ALL=0x03 */
|
|
|
|
#define MCE_PULSE_BIT 0x80 /* Pulse bit, MSB set == PULSE else SPACE */
|
|
|
|
#define MCE_PULSE_MASK 0x7f /* Pulse mask */
|
|
|
|
#define MCE_MAX_PULSE_LENGTH 0x7f /* Longest transmittable pulse symbol */
|
|
|
|
|
2011-07-18 23:54:21 +04:00
|
|
|
/*
|
|
|
|
* The interface between the host and the IR hardware is command-response
|
|
|
|
* based. All commands and responses have a consistent format, where a lead
|
|
|
|
* byte always identifies the type of data following it. The lead byte has
|
|
|
|
* a port value in the 3 highest bits and a length value in the 5 lowest
|
|
|
|
* bits.
|
|
|
|
*
|
|
|
|
* The length field is overloaded, with a value of 11111 indicating that the
|
|
|
|
* following byte is a command or response code, and the length of the entire
|
|
|
|
* message is determined by the code. If the length field is not 11111, then
|
|
|
|
* it specifies the number of bytes of port data that follow.
|
|
|
|
*/
|
|
|
|
#define MCE_CMD 0x1f
|
|
|
|
#define MCE_PORT_IR 0x4 /* (0x4 << 5) | MCE_CMD = 0x9f */
|
|
|
|
#define MCE_PORT_SYS 0x7 /* (0x7 << 5) | MCE_CMD = 0xff */
|
|
|
|
#define MCE_PORT_SER 0x6 /* 0xc0 thru 0xdf flush & 0x1f bytes */
|
|
|
|
#define MCE_PORT_MASK 0xe0 /* Mask out command bits */
|
|
|
|
|
|
|
|
/* Command port headers */
|
|
|
|
#define MCE_CMD_PORT_IR 0x9f /* IR-related cmd/rsp */
|
|
|
|
#define MCE_CMD_PORT_SYS 0xff /* System (non-IR) device cmd/rsp */
|
|
|
|
|
|
|
|
/* Commands that set device state (2-4 bytes in length) */
|
|
|
|
#define MCE_CMD_RESET 0xfe /* Reset device, 2 bytes */
|
|
|
|
#define MCE_CMD_RESUME 0xaa /* Resume device after error, 2 bytes */
|
|
|
|
#define MCE_CMD_SETIRCFS 0x06 /* Set tx carrier, 4 bytes */
|
|
|
|
#define MCE_CMD_SETIRTIMEOUT 0x0c /* Set timeout, 4 bytes */
|
|
|
|
#define MCE_CMD_SETIRTXPORTS 0x08 /* Set tx ports, 3 bytes */
|
|
|
|
#define MCE_CMD_SETIRRXPORTEN 0x14 /* Set rx ports, 3 bytes */
|
|
|
|
#define MCE_CMD_FLASHLED 0x23 /* Flash receiver LED, 2 bytes */
|
|
|
|
|
|
|
|
/* Commands that query device state (all 2 bytes, unless noted) */
|
|
|
|
#define MCE_CMD_GETIRCFS 0x07 /* Get carrier */
|
|
|
|
#define MCE_CMD_GETIRTIMEOUT 0x0d /* Get timeout */
|
|
|
|
#define MCE_CMD_GETIRTXPORTS 0x13 /* Get tx ports */
|
|
|
|
#define MCE_CMD_GETIRRXPORTEN 0x15 /* Get rx ports */
|
|
|
|
#define MCE_CMD_GETPORTSTATUS 0x11 /* Get tx port status, 3 bytes */
|
|
|
|
#define MCE_CMD_GETIRNUMPORTS 0x16 /* Get number of ports */
|
|
|
|
#define MCE_CMD_GETWAKESOURCE 0x17 /* Get wake source */
|
|
|
|
#define MCE_CMD_GETEMVER 0x22 /* Get emulator interface version */
|
|
|
|
#define MCE_CMD_GETDEVDETAILS 0x21 /* Get device details (em ver2 only) */
|
|
|
|
#define MCE_CMD_GETWAKESUPPORT 0x20 /* Get wake details (em ver2 only) */
|
|
|
|
#define MCE_CMD_GETWAKEVERSION 0x18 /* Get wake pattern (em ver2 only) */
|
|
|
|
|
|
|
|
/* Misc commands */
|
|
|
|
#define MCE_CMD_NOP 0xff /* No operation */
|
|
|
|
|
|
|
|
/* Responses to commands (non-error cases) */
|
|
|
|
#define MCE_RSP_EQIRCFS 0x06 /* tx carrier, 4 bytes */
|
|
|
|
#define MCE_RSP_EQIRTIMEOUT 0x0c /* rx timeout, 4 bytes */
|
|
|
|
#define MCE_RSP_GETWAKESOURCE 0x17 /* wake source, 3 bytes */
|
|
|
|
#define MCE_RSP_EQIRTXPORTS 0x08 /* tx port mask, 3 bytes */
|
|
|
|
#define MCE_RSP_EQIRRXPORTEN 0x14 /* rx port mask, 3 bytes */
|
|
|
|
#define MCE_RSP_GETPORTSTATUS 0x11 /* tx port status, 7 bytes */
|
|
|
|
#define MCE_RSP_EQIRRXCFCNT 0x15 /* rx carrier count, 4 bytes */
|
|
|
|
#define MCE_RSP_EQIRNUMPORTS 0x16 /* number of ports, 4 bytes */
|
|
|
|
#define MCE_RSP_EQWAKESUPPORT 0x20 /* wake capabilities, 3 bytes */
|
|
|
|
#define MCE_RSP_EQWAKEVERSION 0x18 /* wake pattern details, 6 bytes */
|
|
|
|
#define MCE_RSP_EQDEVDETAILS 0x21 /* device capabilities, 3 bytes */
|
|
|
|
#define MCE_RSP_EQEMVER 0x22 /* emulator interface ver, 3 bytes */
|
|
|
|
#define MCE_RSP_FLASHLED 0x23 /* success flashing LED, 2 bytes */
|
|
|
|
|
|
|
|
/* Responses to error cases, must send MCE_CMD_RESUME to clear them */
|
|
|
|
#define MCE_RSP_CMD_ILLEGAL 0xfe /* illegal command for port, 2 bytes */
|
|
|
|
#define MCE_RSP_TX_TIMEOUT 0x81 /* tx timed out, 2 bytes */
|
|
|
|
|
|
|
|
/* Misc commands/responses not defined in the MCE remote/transceiver spec */
|
2010-11-10 00:41:03 +03:00
|
|
|
#define MCE_CMD_SIG_END 0x01 /* End of signal */
|
2010-10-22 21:42:54 +04:00
|
|
|
#define MCE_CMD_PING 0x03 /* Ping device */
|
|
|
|
#define MCE_CMD_UNKNOWN 0x04 /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN2 0x05 /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN3 0x09 /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN4 0x0a /* Unknown */
|
|
|
|
#define MCE_CMD_G_REVISION 0x0b /* Get hw/sw revision */
|
|
|
|
#define MCE_CMD_UNKNOWN5 0x0e /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN6 0x0f /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN8 0x19 /* Unknown */
|
|
|
|
#define MCE_CMD_UNKNOWN9 0x1b /* Unknown */
|
2011-07-18 23:54:21 +04:00
|
|
|
#define MCE_CMD_NULL 0x00 /* These show up various places... */
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2011-07-18 23:54:21 +04:00
|
|
|
/* if buf[i] & MCE_PORT_MASK == 0x80 and buf[i] != MCE_CMD_PORT_IR,
|
|
|
|
* then we're looking at a raw IR data sample */
|
|
|
|
#define MCE_COMMAND_IRDATA 0x80
|
|
|
|
#define MCE_PACKET_LENGTH_MASK 0x1f /* Packet length mask */
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* module parameters */
|
|
|
|
#ifdef CONFIG_USB_DEBUG
|
2012-01-13 03:02:20 +04:00
|
|
|
static bool debug = 1;
|
2010-06-02 00:32:08 +04:00
|
|
|
#else
|
2012-01-13 03:02:20 +04:00
|
|
|
static bool debug;
|
2010-06-02 00:32:08 +04:00
|
|
|
#endif
|
|
|
|
|
2011-05-26 22:51:11 +04:00
|
|
|
#define mce_dbg(dev, fmt, ...) \
|
|
|
|
do { \
|
|
|
|
if (debug) \
|
|
|
|
dev_info(dev, fmt, ## __VA_ARGS__); \
|
|
|
|
} while (0)
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
/* general constants */
|
|
|
|
#define SEND_FLAG_IN_PROGRESS 1
|
|
|
|
#define SEND_FLAG_COMPLETE 2
|
|
|
|
#define RECV_FLAG_IN_PROGRESS 3
|
|
|
|
#define RECV_FLAG_COMPLETE 4
|
|
|
|
|
|
|
|
#define MCEUSB_RX 1
|
|
|
|
#define MCEUSB_TX 2
|
|
|
|
|
|
|
|
#define VENDOR_PHILIPS 0x0471
|
|
|
|
#define VENDOR_SMK 0x0609
|
|
|
|
#define VENDOR_TATUNG 0x1460
|
|
|
|
#define VENDOR_GATEWAY 0x107b
|
|
|
|
#define VENDOR_SHUTTLE 0x1308
|
|
|
|
#define VENDOR_SHUTTLE2 0x051c
|
|
|
|
#define VENDOR_MITSUMI 0x03ee
|
|
|
|
#define VENDOR_TOPSEED 0x1784
|
|
|
|
#define VENDOR_RICAVISION 0x179d
|
|
|
|
#define VENDOR_ITRON 0x195d
|
|
|
|
#define VENDOR_FIC 0x1509
|
|
|
|
#define VENDOR_LG 0x043e
|
|
|
|
#define VENDOR_MICROSOFT 0x045e
|
|
|
|
#define VENDOR_FORMOSA 0x147a
|
|
|
|
#define VENDOR_FINTEK 0x1934
|
|
|
|
#define VENDOR_PINNACLE 0x2304
|
|
|
|
#define VENDOR_ECS 0x1019
|
|
|
|
#define VENDOR_WISTRON 0x0fb8
|
|
|
|
#define VENDOR_COMPRO 0x185b
|
|
|
|
#define VENDOR_NORTHSTAR 0x04eb
|
|
|
|
#define VENDOR_REALTEK 0x0bda
|
|
|
|
#define VENDOR_TIVO 0x105a
|
2010-10-18 23:32:50 +04:00
|
|
|
#define VENDOR_CONEXANT 0x0572
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-22 18:50:37 +04:00
|
|
|
enum mceusb_model_type {
|
|
|
|
MCE_GEN2 = 0, /* Most boards */
|
|
|
|
MCE_GEN1,
|
|
|
|
MCE_GEN3,
|
|
|
|
MCE_GEN2_TX_INV,
|
|
|
|
POLARIS_EVK,
|
2010-10-29 07:07:39 +04:00
|
|
|
CX_HYBRID_TV,
|
2011-03-01 18:38:28 +03:00
|
|
|
MULTIFUNCTION,
|
2011-03-24 18:59:10 +03:00
|
|
|
TIVO_KIT,
|
2011-04-19 23:47:34 +04:00
|
|
|
MCE_GEN2_NO_TX,
|
2010-10-22 18:50:37 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct mceusb_model {
|
|
|
|
u32 mce_gen1:1;
|
|
|
|
u32 mce_gen2:1;
|
|
|
|
u32 mce_gen3:1;
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
u32 tx_mask_normal:1;
|
2010-10-29 07:07:39 +04:00
|
|
|
u32 no_tx:1;
|
2010-10-22 18:50:37 +04:00
|
|
|
|
2011-03-01 18:38:28 +03:00
|
|
|
int ir_intfnum;
|
|
|
|
|
2010-10-22 18:51:50 +04:00
|
|
|
const char *rc_map; /* Allow specify a per-board map */
|
2010-10-22 18:52:53 +04:00
|
|
|
const char *name; /* per-board name */
|
2010-10-22 18:50:37 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct mceusb_model mceusb_model[] = {
|
|
|
|
[MCE_GEN1] = {
|
|
|
|
.mce_gen1 = 1,
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
.tx_mask_normal = 1,
|
2010-10-22 18:50:37 +04:00
|
|
|
},
|
|
|
|
[MCE_GEN2] = {
|
|
|
|
.mce_gen2 = 1,
|
|
|
|
},
|
2011-04-19 23:47:34 +04:00
|
|
|
[MCE_GEN2_NO_TX] = {
|
|
|
|
.mce_gen2 = 1,
|
|
|
|
.no_tx = 1,
|
|
|
|
},
|
2010-10-22 18:50:37 +04:00
|
|
|
[MCE_GEN2_TX_INV] = {
|
|
|
|
.mce_gen2 = 1,
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
.tx_mask_normal = 1,
|
2010-10-22 18:50:37 +04:00
|
|
|
},
|
|
|
|
[MCE_GEN3] = {
|
|
|
|
.mce_gen3 = 1,
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
.tx_mask_normal = 1,
|
2010-10-22 18:50:37 +04:00
|
|
|
},
|
|
|
|
[POLARIS_EVK] = {
|
2010-10-22 18:51:50 +04:00
|
|
|
/*
|
|
|
|
* In fact, the EVK is shipped without
|
|
|
|
* remotes, but we should have something handy,
|
|
|
|
* to allow testing it
|
|
|
|
*/
|
2011-01-24 18:18:47 +03:00
|
|
|
.rc_map = RC_MAP_HAUPPAUGE,
|
2010-10-29 07:07:39 +04:00
|
|
|
.name = "Conexant Hybrid TV (cx231xx) MCE IR",
|
|
|
|
},
|
|
|
|
[CX_HYBRID_TV] = {
|
|
|
|
.no_tx = 1, /* tx isn't wired up at all */
|
|
|
|
.name = "Conexant Hybrid TV (cx231xx) MCE IR",
|
2010-10-22 18:50:37 +04:00
|
|
|
},
|
2011-03-01 18:38:28 +03:00
|
|
|
[MULTIFUNCTION] = {
|
|
|
|
.mce_gen2 = 1,
|
|
|
|
.ir_intfnum = 2,
|
|
|
|
},
|
2011-03-24 18:59:10 +03:00
|
|
|
[TIVO_KIT] = {
|
|
|
|
.mce_gen2 = 1,
|
|
|
|
.rc_map = RC_MAP_TIVO,
|
|
|
|
},
|
2010-10-22 18:50:37 +04:00
|
|
|
};
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
static struct usb_device_id mceusb_dev_table[] = {
|
|
|
|
/* Original Microsoft MCE IR Transceiver (often HP-branded) */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_MICROSOFT, 0x006d),
|
|
|
|
.driver_info = MCE_GEN1 },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Philips Infrared Transceiver - Sahara branded */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x0608) },
|
|
|
|
/* Philips Infrared Transceiver - HP branded */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x060c),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Philips SRM5100 */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x060d) },
|
|
|
|
/* Philips Infrared Transceiver - Omaura */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x060f) },
|
|
|
|
/* Philips Infrared Transceiver - Spinel plus */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x0613) },
|
|
|
|
/* Philips eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x0815) },
|
2010-08-28 01:21:14 +04:00
|
|
|
/* Philips/Spinel plus IR transceiver for ASUS */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x206c) },
|
|
|
|
/* Philips/Spinel plus IR transceiver for ASUS */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x2088) },
|
2011-04-25 21:48:18 +04:00
|
|
|
/* Philips IR transceiver (Dell branded) */
|
|
|
|
{ USB_DEVICE(VENDOR_PHILIPS, 0x2093) },
|
2011-03-01 18:38:28 +03:00
|
|
|
/* Realtek MCE IR Receiver and card reader */
|
|
|
|
{ USB_DEVICE(VENDOR_REALTEK, 0x0161),
|
|
|
|
.driver_info = MULTIFUNCTION },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* SMK/Toshiba G83C0004D410 */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_SMK, 0x031d),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* SMK eHome Infrared Transceiver (Sony VAIO) */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_SMK, 0x0322),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* bundled with Hauppauge PVR-150 */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_SMK, 0x0334),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* SMK eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_SMK, 0x0338) },
|
2011-05-26 23:03:17 +04:00
|
|
|
/* SMK/I-O Data GV-MC7/RCKIT Receiver */
|
|
|
|
{ USB_DEVICE(VENDOR_SMK, 0x0353),
|
|
|
|
.driver_info = MCE_GEN2_NO_TX },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Tatung eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_TATUNG, 0x9150) },
|
|
|
|
/* Shuttle eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_SHUTTLE, 0xc001) },
|
|
|
|
/* Shuttle eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) },
|
|
|
|
/* Gateway eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_GATEWAY, 0x3009) },
|
|
|
|
/* Mitsumi */
|
|
|
|
{ USB_DEVICE(VENDOR_MITSUMI, 0x2501) },
|
|
|
|
/* Topseed eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x0001),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Topseed HP eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x0006),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Topseed eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x0007),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Topseed eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x0008),
|
|
|
|
.driver_info = MCE_GEN3 },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Topseed eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x000a),
|
|
|
|
.driver_info = MCE_GEN2_TX_INV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Topseed eHome Infrared Transceiver */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_TOPSEED, 0x0011),
|
2011-03-05 02:20:47 +03:00
|
|
|
.driver_info = MCE_GEN3 },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Ricavision internal Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_RICAVISION, 0x0010) },
|
|
|
|
/* Itron ione Libra Q-11 */
|
|
|
|
{ USB_DEVICE(VENDOR_ITRON, 0x7002) },
|
|
|
|
/* FIC eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_FIC, 0x9242) },
|
|
|
|
/* LG eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_LG, 0x9803) },
|
|
|
|
/* Microsoft MCE Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_MICROSOFT, 0x00a0) },
|
|
|
|
/* Formosa eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe015) },
|
|
|
|
/* Formosa21 / eHome Infrared Receiver */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe016) },
|
|
|
|
/* Formosa aim / Trust MCE Infrared Receiver */
|
2011-04-19 23:47:34 +04:00
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe017),
|
|
|
|
.driver_info = MCE_GEN2_NO_TX },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Formosa Industrial Computing / Beanbag Emulation Device */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
|
|
|
|
/* Formosa21 / eHome Infrared Receiver */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe03a) },
|
|
|
|
/* Formosa Industrial Computing AIM IR605/A */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe03c) },
|
|
|
|
/* Formosa Industrial Computing */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe03e) },
|
2012-03-12 20:27:03 +04:00
|
|
|
/* Formosa Industrial Computing */
|
|
|
|
{ USB_DEVICE(VENDOR_FORMOSA, 0xe042) },
|
2010-12-16 19:27:11 +03:00
|
|
|
/* Fintek eHome Infrared Transceiver (HP branded) */
|
|
|
|
{ USB_DEVICE(VENDOR_FINTEK, 0x5168) },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Fintek eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_FINTEK, 0x0602) },
|
|
|
|
/* Fintek eHome Infrared Transceiver (in the AOpen MP45) */
|
|
|
|
{ USB_DEVICE(VENDOR_FINTEK, 0x0702) },
|
|
|
|
/* Pinnacle Remote Kit */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_PINNACLE, 0x0225),
|
|
|
|
.driver_info = MCE_GEN3 },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Elitegroup Computer Systems IR */
|
|
|
|
{ USB_DEVICE(VENDOR_ECS, 0x0f38) },
|
|
|
|
/* Wistron Corp. eHome Infrared Receiver */
|
|
|
|
{ USB_DEVICE(VENDOR_WISTRON, 0x0002) },
|
|
|
|
/* Compro K100 */
|
|
|
|
{ USB_DEVICE(VENDOR_COMPRO, 0x3020) },
|
|
|
|
/* Compro K100 v2 */
|
|
|
|
{ USB_DEVICE(VENDOR_COMPRO, 0x3082) },
|
|
|
|
/* Northstar Systems, Inc. eHome Infrared Transceiver */
|
|
|
|
{ USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },
|
|
|
|
/* TiVo PC IR Receiver */
|
2011-03-24 18:59:10 +03:00
|
|
|
{ USB_DEVICE(VENDOR_TIVO, 0x2000),
|
|
|
|
.driver_info = TIVO_KIT },
|
2010-10-29 07:07:39 +04:00
|
|
|
/* Conexant Hybrid TV "Shelby" Polaris SDK */
|
2010-10-22 18:50:37 +04:00
|
|
|
{ USB_DEVICE(VENDOR_CONEXANT, 0x58a1),
|
|
|
|
.driver_info = POLARIS_EVK },
|
2010-10-29 07:07:39 +04:00
|
|
|
/* Conexant Hybrid TV RDU253S Polaris */
|
|
|
|
{ USB_DEVICE(VENDOR_CONEXANT, 0x58a5),
|
|
|
|
.driver_info = CX_HYBRID_TV },
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Terminating entry */
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* data structure for each usb transceiver */
|
|
|
|
struct mceusb_dev {
|
|
|
|
/* ir-core bits */
|
2010-10-29 23:08:23 +04:00
|
|
|
struct rc_dev *rc;
|
2010-11-13 01:49:04 +03:00
|
|
|
|
|
|
|
/* optional features we can enable */
|
|
|
|
bool carrier_report_enabled;
|
|
|
|
bool learning_enabled;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* core device bits */
|
|
|
|
struct device *dev;
|
|
|
|
|
|
|
|
/* usb */
|
|
|
|
struct usb_device *usbdev;
|
|
|
|
struct urb *urb_in;
|
|
|
|
struct usb_endpoint_descriptor *usb_ep_in;
|
|
|
|
struct usb_endpoint_descriptor *usb_ep_out;
|
|
|
|
|
|
|
|
/* buffers and dma */
|
|
|
|
unsigned char *buf_in;
|
|
|
|
unsigned int len_in;
|
2010-11-13 01:49:04 +03:00
|
|
|
dma_addr_t dma_in;
|
|
|
|
dma_addr_t dma_out;
|
2010-10-22 08:35:44 +04:00
|
|
|
|
|
|
|
enum {
|
|
|
|
CMD_HEADER = 0,
|
|
|
|
SUBCMD,
|
|
|
|
CMD_DATA,
|
|
|
|
PARSE_IRDATA,
|
|
|
|
} parser_state;
|
|
|
|
|
2010-11-13 01:49:04 +03:00
|
|
|
u8 cmd, rem; /* Remaining IR data bytes in packet */
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
struct {
|
|
|
|
u32 connected:1;
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
u32 tx_mask_normal:1;
|
2010-06-02 00:32:08 +04:00
|
|
|
u32 microsoft_gen1:1;
|
2010-10-29 07:07:39 +04:00
|
|
|
u32 no_tx:1;
|
2010-06-02 00:32:08 +04:00
|
|
|
} flags;
|
|
|
|
|
2010-06-17 00:55:52 +04:00
|
|
|
/* transmit support */
|
2010-06-02 00:32:08 +04:00
|
|
|
int send_flags;
|
2010-06-17 00:55:52 +04:00
|
|
|
u32 carrier;
|
|
|
|
unsigned char tx_mask;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
char name[128];
|
|
|
|
char phys[64];
|
2010-10-22 18:50:37 +04:00
|
|
|
enum mceusb_model_type model;
|
2011-07-18 23:54:24 +04:00
|
|
|
|
|
|
|
bool need_reset; /* flag to issue a device resume cmd */
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
u8 emver; /* emulator interface version */
|
2011-07-18 23:54:26 +04:00
|
|
|
u8 num_txports; /* number of transmit ports */
|
|
|
|
u8 num_rxports; /* number of receive sensors */
|
|
|
|
u8 txports_cabled; /* bitmask of transmitters with cable */
|
|
|
|
u8 rxports_active; /* bitmask of active receive sensors */
|
2010-06-02 00:32:08 +04:00
|
|
|
};
|
|
|
|
|
2011-07-18 23:54:21 +04:00
|
|
|
/* MCE Device Command Strings, generally a port and command pair */
|
|
|
|
static char DEVICE_RESUME[] = {MCE_CMD_NULL, MCE_CMD_PORT_SYS,
|
|
|
|
MCE_CMD_RESUME};
|
|
|
|
static char GET_REVISION[] = {MCE_CMD_PORT_SYS, MCE_CMD_G_REVISION};
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
static char GET_EMVER[] = {MCE_CMD_PORT_SYS, MCE_CMD_GETEMVER};
|
2011-07-18 23:54:21 +04:00
|
|
|
static char GET_WAKEVERSION[] = {MCE_CMD_PORT_SYS, MCE_CMD_GETWAKEVERSION};
|
2011-07-18 23:54:27 +04:00
|
|
|
static char FLASH_LED[] = {MCE_CMD_PORT_SYS, MCE_CMD_FLASHLED};
|
2011-07-18 23:54:21 +04:00
|
|
|
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};
|
2011-07-18 23:54:26 +04:00
|
|
|
static char GET_NUM_PORTS[] = {MCE_CMD_PORT_IR, MCE_CMD_GETIRNUMPORTS};
|
2011-07-18 23:54:21 +04:00
|
|
|
static char GET_TX_BITMASK[] = {MCE_CMD_PORT_IR, MCE_CMD_GETIRTXPORTS};
|
|
|
|
static char GET_RX_SENSOR[] = {MCE_CMD_PORT_IR, MCE_CMD_GETIRRXPORTEN};
|
2010-06-02 00:32:08 +04:00
|
|
|
/* sub in desired values in lower byte or bytes for full command */
|
|
|
|
/* FIXME: make use of these for transmit.
|
2011-07-18 23:54:21 +04:00
|
|
|
static char SET_CARRIER_FREQ[] = {MCE_CMD_PORT_IR,
|
|
|
|
MCE_CMD_SETIRCFS, 0x00, 0x00};
|
|
|
|
static char SET_TX_BITMASK[] = {MCE_CMD_PORT_IR, MCE_CMD_SETIRTXPORTS, 0x00};
|
|
|
|
static char SET_RX_TIMEOUT[] = {MCE_CMD_PORT_IR,
|
|
|
|
MCE_CMD_SETIRTIMEOUT, 0x00, 0x00};
|
|
|
|
static char SET_RX_SENSOR[] = {MCE_CMD_PORT_IR,
|
|
|
|
MCE_RSP_EQIRRXPORTEN, 0x00};
|
2010-06-02 00:32:08 +04:00
|
|
|
*/
|
|
|
|
|
2010-10-22 08:35:44 +04:00
|
|
|
static int mceusb_cmdsize(u8 cmd, u8 subcmd)
|
|
|
|
{
|
|
|
|
int datasize = 0;
|
|
|
|
|
|
|
|
switch (cmd) {
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_NULL:
|
|
|
|
if (subcmd == MCE_CMD_PORT_SYS)
|
2010-10-22 08:35:44 +04:00
|
|
|
datasize = 1;
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_PORT_SYS:
|
2010-10-22 08:35:44 +04:00
|
|
|
switch (subcmd) {
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQWAKEVERSION:
|
|
|
|
datasize = 4;
|
|
|
|
break;
|
2010-10-22 21:42:54 +04:00
|
|
|
case MCE_CMD_G_REVISION:
|
2010-10-22 08:35:44 +04:00
|
|
|
datasize = 2;
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQWAKESUPPORT:
|
|
|
|
datasize = 1;
|
|
|
|
break;
|
2010-10-22 08:35:44 +04:00
|
|
|
}
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_PORT_IR:
|
2010-10-22 08:35:44 +04:00
|
|
|
switch (subcmd) {
|
2010-10-22 21:42:54 +04:00
|
|
|
case MCE_CMD_UNKNOWN:
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRCFS:
|
|
|
|
case MCE_RSP_EQIRTIMEOUT:
|
|
|
|
case MCE_RSP_EQIRRXCFCNT:
|
2010-10-22 08:35:44 +04:00
|
|
|
datasize = 2;
|
|
|
|
break;
|
2010-11-10 00:41:03 +03:00
|
|
|
case MCE_CMD_SIG_END:
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRTXPORTS:
|
|
|
|
case MCE_RSP_EQIRRXPORTEN:
|
2010-10-22 08:35:44 +04:00
|
|
|
datasize = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return datasize;
|
|
|
|
}
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf,
|
2010-10-22 23:49:35 +04:00
|
|
|
int offset, int len, bool out)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
|
|
|
char codes[USB_BUFLEN * 3 + 1];
|
|
|
|
char inout[9];
|
2012-05-14 17:22:58 +04:00
|
|
|
u8 cmd, subcmd, data1, data2, data3, data4;
|
2010-06-02 00:32:08 +04:00
|
|
|
struct device *dev = ir->dev;
|
2010-10-22 23:49:35 +04:00
|
|
|
int i, start, skip = 0;
|
2011-07-18 23:54:28 +04:00
|
|
|
u32 carrier, period;
|
2010-10-22 23:49:35 +04:00
|
|
|
|
|
|
|
if (!debug)
|
|
|
|
return;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-06-17 00:10:05 +04:00
|
|
|
/* skip meaningless 0xb1 0x60 header bytes on orig receiver */
|
2010-11-10 00:41:46 +03:00
|
|
|
if (ir->flags.microsoft_gen1 && !out && !offset)
|
2010-10-22 23:49:35 +04:00
|
|
|
skip = 2;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-22 23:49:35 +04:00
|
|
|
if (len <= skip)
|
2010-06-02 00:32:08 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < len && i < USB_BUFLEN; i++)
|
2010-10-22 23:49:35 +04:00
|
|
|
snprintf(codes + i * 3, 4, "%02x ", buf[i + offset] & 0xff);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-22 23:49:35 +04:00
|
|
|
dev_info(dev, "%sx data: %s(length=%d)\n",
|
2010-06-02 00:32:08 +04:00
|
|
|
(out ? "t" : "r"), codes, len);
|
|
|
|
|
|
|
|
if (out)
|
|
|
|
strcpy(inout, "Request\0");
|
|
|
|
else
|
|
|
|
strcpy(inout, "Got\0");
|
|
|
|
|
2010-10-22 23:49:35 +04:00
|
|
|
start = offset + skip;
|
|
|
|
cmd = buf[start] & 0xff;
|
|
|
|
subcmd = buf[start + 1] & 0xff;
|
|
|
|
data1 = buf[start + 2] & 0xff;
|
|
|
|
data2 = buf[start + 3] & 0xff;
|
2011-07-18 23:54:21 +04:00
|
|
|
data3 = buf[start + 4] & 0xff;
|
|
|
|
data4 = buf[start + 5] & 0xff;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
switch (cmd) {
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_NULL:
|
2011-07-18 23:54:26 +04:00
|
|
|
if (subcmd == MCE_CMD_NULL)
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
if ((subcmd == MCE_CMD_PORT_SYS) &&
|
|
|
|
(data1 == MCE_CMD_RESUME))
|
|
|
|
dev_info(dev, "Device resume requested\n");
|
2010-06-02 00:32:08 +04:00
|
|
|
else
|
|
|
|
dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
|
|
|
|
cmd, subcmd);
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_PORT_SYS:
|
2010-06-02 00:32:08 +04:00
|
|
|
switch (subcmd) {
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQEMVER:
|
|
|
|
if (!out)
|
|
|
|
dev_info(dev, "Emulator interface version %x\n",
|
|
|
|
data1);
|
|
|
|
break;
|
2010-10-22 21:42:54 +04:00
|
|
|
case MCE_CMD_G_REVISION:
|
2010-06-02 00:32:08 +04:00
|
|
|
if (len == 2)
|
|
|
|
dev_info(dev, "Get hw/sw rev?\n");
|
|
|
|
else
|
|
|
|
dev_info(dev, "hw/sw rev 0x%02x 0x%02x "
|
|
|
|
"0x%02x 0x%02x\n", data1, data2,
|
2010-10-22 23:49:35 +04:00
|
|
|
buf[start + 4], buf[start + 5]);
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_RESUME:
|
|
|
|
dev_info(dev, "Device resume requested\n");
|
|
|
|
break;
|
|
|
|
case MCE_RSP_CMD_ILLEGAL:
|
|
|
|
dev_info(dev, "Illegal PORT_SYS command\n");
|
|
|
|
break;
|
|
|
|
case MCE_RSP_EQWAKEVERSION:
|
|
|
|
if (!out)
|
|
|
|
dev_info(dev, "Wake version, proto: 0x%02x, "
|
|
|
|
"payload: 0x%02x, address: 0x%02x, "
|
|
|
|
"version: 0x%02x\n",
|
|
|
|
data1, data2, data3, data4);
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_GETPORTSTATUS:
|
|
|
|
if (!out)
|
|
|
|
/* We use data1 + 1 here, to match hw labels */
|
|
|
|
dev_info(dev, "TX port %d: blaster is%s connected\n",
|
|
|
|
data1 + 1, data4 ? " not" : "");
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
2011-07-18 23:54:27 +04:00
|
|
|
case MCE_CMD_FLASHLED:
|
|
|
|
dev_info(dev, "Attempting to flash LED\n");
|
|
|
|
break;
|
2010-06-02 00:32:08 +04:00
|
|
|
default:
|
|
|
|
dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
|
|
|
|
cmd, subcmd);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_PORT_IR:
|
2010-06-02 00:32:08 +04:00
|
|
|
switch (subcmd) {
|
2010-11-10 00:41:03 +03:00
|
|
|
case MCE_CMD_SIG_END:
|
|
|
|
dev_info(dev, "End of signal\n");
|
|
|
|
break;
|
2010-10-22 21:42:54 +04:00
|
|
|
case MCE_CMD_PING:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Ping\n");
|
|
|
|
break;
|
2010-10-22 21:42:54 +04:00
|
|
|
case MCE_CMD_UNKNOWN:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Resp to 9f 05 of 0x%02x 0x%02x\n",
|
|
|
|
data1, data2);
|
|
|
|
break;
|
2011-07-18 23:54:28 +04:00
|
|
|
case MCE_RSP_EQIRCFS:
|
|
|
|
period = DIV_ROUND_CLOSEST(
|
|
|
|
(1 << data1 * 2) * (data2 + 1), 10);
|
|
|
|
if (!period)
|
|
|
|
break;
|
|
|
|
carrier = (1000 * 1000) / period;
|
|
|
|
dev_info(dev, "%s carrier of %u Hz (period %uus)\n",
|
|
|
|
inout, carrier, period);
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_GETIRCFS:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Get carrier mode and freq\n");
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRTXPORTS:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "%s transmit blaster mask of 0x%02x\n",
|
|
|
|
inout, data1);
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRTIMEOUT:
|
2011-07-04 00:13:52 +04:00
|
|
|
/* value is in units of 50us, so x*50/1000 ms */
|
2011-07-18 23:54:28 +04:00
|
|
|
period = ((data1 << 8) | data2) * MCE_TIME_UNIT / 1000;
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "%s receive timeout of %d ms\n",
|
2011-07-18 23:54:28 +04:00
|
|
|
inout, period);
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_GETIRTIMEOUT:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Get receive timeout\n");
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_GETIRTXPORTS:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Get transmit blaster mask\n");
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRRXPORTEN:
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "%s %s-range receive sensor in use\n",
|
|
|
|
inout, data1 == 0x02 ? "short" : "long");
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_CMD_GETIRRXPORTEN:
|
|
|
|
/* aka MCE_RSP_EQIRRXCFCNT */
|
2010-11-13 01:49:04 +03:00
|
|
|
if (out)
|
2010-06-02 00:32:08 +04:00
|
|
|
dev_info(dev, "Get receive sensor\n");
|
2010-11-13 01:49:04 +03:00
|
|
|
else if (ir->learning_enabled)
|
|
|
|
dev_info(dev, "RX pulse count: %d\n",
|
2010-06-02 00:32:08 +04:00
|
|
|
((data1 << 8) | data2));
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRNUMPORTS:
|
|
|
|
if (out)
|
|
|
|
break;
|
|
|
|
dev_info(dev, "Num TX ports: %x, num RX ports: %x\n",
|
|
|
|
data1, data2);
|
|
|
|
break;
|
|
|
|
case MCE_RSP_CMD_ILLEGAL:
|
|
|
|
dev_info(dev, "Illegal PORT_IR command\n");
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
dev_info(dev, "Unknown command 0x%02x 0x%02x\n",
|
|
|
|
cmd, subcmd);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2010-10-22 23:49:35 +04:00
|
|
|
|
|
|
|
if (cmd == MCE_IRDATA_TRAILER)
|
|
|
|
dev_info(dev, "End of raw IR data\n");
|
2011-07-18 23:54:21 +04:00
|
|
|
else if ((cmd != MCE_CMD_PORT_IR) &&
|
|
|
|
((cmd & MCE_PORT_MASK) == MCE_COMMAND_IRDATA))
|
2010-10-22 23:49:35 +04:00
|
|
|
dev_info(dev, "Raw IR data, %d pulse/space samples\n", ir->rem);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2010-08-03 01:21:06 +04:00
|
|
|
static void mce_async_callback(struct urb *urb, struct pt_regs *regs)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
|
|
|
struct mceusb_dev *ir;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (!urb)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ir = urb->context;
|
|
|
|
if (ir) {
|
|
|
|
len = urb->actual_length;
|
|
|
|
|
2010-10-22 23:49:35 +04:00
|
|
|
mceusb_dev_printdata(ir, urb->transfer_buffer, 0, len, true);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2011-05-24 23:44:54 +04:00
|
|
|
/* the transfer buffer and urb were allocated in mce_request_packet */
|
|
|
|
kfree(urb->transfer_buffer);
|
|
|
|
usb_free_urb(urb);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* request incoming or send outgoing usb packet - used to initialize remote */
|
2011-05-10 21:09:59 +04:00
|
|
|
static void mce_request_packet(struct mceusb_dev *ir, unsigned char *data,
|
|
|
|
int size, int urb_type)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
2011-05-10 21:09:59 +04:00
|
|
|
int res, pipe;
|
2010-06-02 00:32:08 +04:00
|
|
|
struct urb *async_urb;
|
|
|
|
struct device *dev = ir->dev;
|
|
|
|
unsigned char *async_buf;
|
|
|
|
|
|
|
|
if (urb_type == MCEUSB_TX) {
|
|
|
|
async_urb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
if (unlikely(!async_urb)) {
|
|
|
|
dev_err(dev, "Error, couldn't allocate urb!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
async_buf = kzalloc(size, GFP_KERNEL);
|
|
|
|
if (!async_buf) {
|
|
|
|
dev_err(dev, "Error, couldn't allocate buf!\n");
|
|
|
|
usb_free_urb(async_urb);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* outbound data */
|
2011-05-10 21:09:59 +04:00
|
|
|
pipe = usb_sndintpipe(ir->usbdev,
|
|
|
|
ir->usb_ep_out->bEndpointAddress);
|
|
|
|
usb_fill_int_urb(async_urb, ir->usbdev, pipe,
|
2010-08-03 01:21:06 +04:00
|
|
|
async_buf, size, (usb_complete_t)mce_async_callback,
|
2011-05-10 21:09:59 +04:00
|
|
|
ir, ir->usb_ep_out->bInterval);
|
2010-06-02 00:32:08 +04:00
|
|
|
memcpy(async_buf, data, size);
|
|
|
|
|
|
|
|
} else if (urb_type == MCEUSB_RX) {
|
|
|
|
/* standard request */
|
|
|
|
async_urb = ir->urb_in;
|
|
|
|
ir->send_flags = RECV_FLAG_IN_PROGRESS;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
dev_err(dev, "Error! Unknown urb type %d\n", urb_type);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "receive request called (size=%#x)\n", size);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
async_urb->transfer_buffer_length = size;
|
|
|
|
async_urb->dev = ir->usbdev;
|
|
|
|
|
|
|
|
res = usb_submit_urb(async_urb, GFP_ATOMIC);
|
|
|
|
if (res) {
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "receive request FAILED! (res=%d)\n", res);
|
2010-06-02 00:32:08 +04:00
|
|
|
return;
|
|
|
|
}
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "receive request complete (res=%d)\n", res);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mce_async_out(struct mceusb_dev *ir, unsigned char *data, int size)
|
|
|
|
{
|
2011-07-18 23:54:24 +04:00
|
|
|
int rsize = sizeof(DEVICE_RESUME);
|
|
|
|
|
|
|
|
if (ir->need_reset) {
|
|
|
|
ir->need_reset = false;
|
|
|
|
mce_request_packet(ir, DEVICE_RESUME, rsize, MCEUSB_TX);
|
|
|
|
msleep(10);
|
|
|
|
}
|
|
|
|
|
2011-05-10 21:09:59 +04:00
|
|
|
mce_request_packet(ir, data, size, MCEUSB_TX);
|
2011-07-18 23:54:22 +04:00
|
|
|
msleep(10);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
[media] mceusb: mce_sync_in is brain-dead
Aside from the initial "hey, lets make sure we've flushed any
pre-existing data on the device" call to mce_sync_in, every other one of
the calls was entirely superfluous. Ergo, remove them all, and rename
the one and only (questionably) useful one to reflect what it really
does. Verified on both gen2 and gen3 hardware to make zero difference.
Well, except that you no longer get a bunch of urb submit failures from
the unneeded mce_sync_in calls. Oh. And move that flush to a point
*after* we've wired up the inbound urb, or it won't do squat. I have
half a mind to just remove it entirely, but someone thought it was
necessary at some point, and it doesn't seem to hurt, so lets leave it
for the time being.
This excercise took place due to insightful questions asked by Hans
Petter Selasky, about the possible reuse of the inbound urb before it
was actually availble by mce_sync_in, so thanks to him for motivating
this cleanup.
Reported-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-05-26 21:23:18 +04:00
|
|
|
static void mce_flush_rx_buffer(struct mceusb_dev *ir, int size)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
[media] mceusb: mce_sync_in is brain-dead
Aside from the initial "hey, lets make sure we've flushed any
pre-existing data on the device" call to mce_sync_in, every other one of
the calls was entirely superfluous. Ergo, remove them all, and rename
the one and only (questionably) useful one to reflect what it really
does. Verified on both gen2 and gen3 hardware to make zero difference.
Well, except that you no longer get a bunch of urb submit failures from
the unneeded mce_sync_in calls. Oh. And move that flush to a point
*after* we've wired up the inbound urb, or it won't do squat. I have
half a mind to just remove it entirely, but someone thought it was
necessary at some point, and it doesn't seem to hurt, so lets leave it
for the time being.
This excercise took place due to insightful questions asked by Hans
Petter Selasky, about the possible reuse of the inbound urb before it
was actually availble by mce_sync_in, so thanks to him for motivating
this cleanup.
Reported-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-05-26 21:23:18 +04:00
|
|
|
mce_request_packet(ir, NULL, size, MCEUSB_RX);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2010-06-17 00:55:52 +04:00
|
|
|
/* Send data out the IR blaster port(s) */
|
2011-04-28 19:13:58 +04:00
|
|
|
static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
|
2010-06-17 00:55:52 +04:00
|
|
|
{
|
2010-10-29 23:08:23 +04:00
|
|
|
struct mceusb_dev *ir = dev->priv;
|
2010-06-17 00:55:52 +04:00
|
|
|
int i, ret = 0;
|
2011-04-28 19:13:58 +04:00
|
|
|
int cmdcount = 0;
|
2010-06-17 00:55:52 +04:00
|
|
|
unsigned char *cmdbuf; /* MCE command buffer */
|
|
|
|
long signal_duration = 0; /* Singnal length in us */
|
|
|
|
struct timeval start_time, end_time;
|
|
|
|
|
|
|
|
do_gettimeofday(&start_time);
|
|
|
|
|
2011-04-28 19:13:58 +04:00
|
|
|
cmdbuf = kzalloc(sizeof(unsigned) * MCE_CMDBUF_SIZE, GFP_KERNEL);
|
2010-06-17 00:55:52 +04:00
|
|
|
if (!cmdbuf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
/* MCE tx init header */
|
2011-07-18 23:54:21 +04:00
|
|
|
cmdbuf[cmdcount++] = MCE_CMD_PORT_IR;
|
|
|
|
cmdbuf[cmdcount++] = MCE_CMD_SETIRTXPORTS;
|
2010-06-17 00:55:52 +04:00
|
|
|
cmdbuf[cmdcount++] = ir->tx_mask;
|
|
|
|
|
|
|
|
/* Generate mce packet data */
|
|
|
|
for (i = 0; (i < count) && (cmdcount < MCE_CMDBUF_SIZE); i++) {
|
|
|
|
signal_duration += txbuf[i];
|
|
|
|
txbuf[i] = txbuf[i] / MCE_TIME_UNIT;
|
|
|
|
|
|
|
|
do { /* loop to support long pulses/spaces > 127*50us=6.35ms */
|
|
|
|
|
|
|
|
/* Insert mce packet header every 4th entry */
|
|
|
|
if ((cmdcount < MCE_CMDBUF_SIZE) &&
|
|
|
|
(cmdcount - MCE_TX_HEADER_LENGTH) %
|
|
|
|
MCE_CODE_LENGTH == 0)
|
2010-10-22 21:42:54 +04:00
|
|
|
cmdbuf[cmdcount++] = MCE_IRDATA_HEADER;
|
2010-06-17 00:55:52 +04:00
|
|
|
|
|
|
|
/* Insert mce packet data */
|
|
|
|
if (cmdcount < MCE_CMDBUF_SIZE)
|
|
|
|
cmdbuf[cmdcount++] =
|
|
|
|
(txbuf[i] < MCE_PULSE_BIT ?
|
|
|
|
txbuf[i] : MCE_MAX_PULSE_LENGTH) |
|
|
|
|
(i & 1 ? 0x00 : MCE_PULSE_BIT);
|
|
|
|
else {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
} while ((txbuf[i] > MCE_MAX_PULSE_LENGTH) &&
|
|
|
|
(txbuf[i] -= MCE_MAX_PULSE_LENGTH));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix packet length in last header */
|
|
|
|
cmdbuf[cmdcount - (cmdcount - MCE_TX_HEADER_LENGTH) % MCE_CODE_LENGTH] =
|
2010-10-22 21:42:54 +04:00
|
|
|
MCE_COMMAND_IRDATA + (cmdcount - MCE_TX_HEADER_LENGTH) %
|
|
|
|
MCE_CODE_LENGTH - 1;
|
2010-06-17 00:55:52 +04:00
|
|
|
|
|
|
|
/* Check if we have room for the empty packet at the end */
|
|
|
|
if (cmdcount >= MCE_CMDBUF_SIZE) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All mce commands end with an empty packet (0x80) */
|
2010-10-22 21:42:54 +04:00
|
|
|
cmdbuf[cmdcount++] = MCE_IRDATA_TRAILER;
|
2010-06-17 00:55:52 +04:00
|
|
|
|
|
|
|
/* Transmit the command to the mce device */
|
|
|
|
mce_async_out(ir, cmdbuf, cmdcount);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The lircd gap calculation expects the write function to
|
|
|
|
* wait the time it takes for the ircommand to be sent before
|
|
|
|
* it returns.
|
|
|
|
*/
|
|
|
|
do_gettimeofday(&end_time);
|
|
|
|
signal_duration -= (end_time.tv_usec - start_time.tv_usec) +
|
|
|
|
(end_time.tv_sec - start_time.tv_sec) * 1000000;
|
|
|
|
|
|
|
|
/* delay with the closest number of ticks */
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
schedule_timeout(usecs_to_jiffies(signal_duration));
|
|
|
|
|
|
|
|
out:
|
|
|
|
kfree(cmdbuf);
|
2011-04-28 19:13:58 +04:00
|
|
|
return ret ? ret : count;
|
2010-06-17 00:55:52 +04:00
|
|
|
}
|
|
|
|
|
2010-10-29 07:07:39 +04:00
|
|
|
/* Sets active IR outputs -- mce devices typically have two */
|
2010-10-29 23:08:23 +04:00
|
|
|
static int mceusb_set_tx_mask(struct rc_dev *dev, u32 mask)
|
2010-06-17 00:10:05 +04:00
|
|
|
{
|
2010-10-29 23:08:23 +04:00
|
|
|
struct mceusb_dev *ir = dev->priv;
|
2010-06-17 00:10:05 +04:00
|
|
|
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
if (ir->flags.tx_mask_normal)
|
|
|
|
ir->tx_mask = mask;
|
|
|
|
else
|
2010-10-22 21:42:54 +04:00
|
|
|
ir->tx_mask = (mask != MCE_DEFAULT_TX_MASK ?
|
|
|
|
mask ^ MCE_DEFAULT_TX_MASK : mask) << 1;
|
2010-06-17 00:10:05 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-17 00:55:52 +04:00
|
|
|
/* Sets the send carrier frequency and mode */
|
2010-10-29 23:08:23 +04:00
|
|
|
static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier)
|
2010-06-17 00:55:52 +04:00
|
|
|
{
|
2010-10-29 23:08:23 +04:00
|
|
|
struct mceusb_dev *ir = dev->priv;
|
2010-06-17 00:55:52 +04:00
|
|
|
int clk = 10000000;
|
|
|
|
int prescaler = 0, divisor = 0;
|
2011-07-18 23:54:21 +04:00
|
|
|
unsigned char cmdbuf[4] = { MCE_CMD_PORT_IR,
|
|
|
|
MCE_CMD_SETIRCFS, 0x00, 0x00 };
|
2010-06-17 00:55:52 +04:00
|
|
|
|
|
|
|
/* Carrier has changed */
|
|
|
|
if (ir->carrier != carrier) {
|
|
|
|
|
|
|
|
if (carrier == 0) {
|
|
|
|
ir->carrier = carrier;
|
2010-11-10 00:41:03 +03:00
|
|
|
cmdbuf[2] = MCE_CMD_SIG_END;
|
2010-10-22 21:42:54 +04:00
|
|
|
cmdbuf[3] = MCE_IRDATA_TRAILER;
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "%s: disabling carrier "
|
2010-06-17 00:55:52 +04:00
|
|
|
"modulation\n", __func__);
|
|
|
|
mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
|
|
|
|
return carrier;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (prescaler = 0; prescaler < 4; ++prescaler) {
|
|
|
|
divisor = (clk >> (2 * prescaler)) / carrier;
|
2010-10-22 21:42:54 +04:00
|
|
|
if (divisor <= 0xff) {
|
2010-06-17 00:55:52 +04:00
|
|
|
ir->carrier = carrier;
|
|
|
|
cmdbuf[2] = prescaler;
|
|
|
|
cmdbuf[3] = divisor;
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "%s: requesting %u HZ "
|
2010-06-17 00:55:52 +04:00
|
|
|
"carrier\n", __func__, carrier);
|
|
|
|
|
|
|
|
/* Transmit new carrier to mce device */
|
|
|
|
mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
|
|
|
|
return carrier;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return carrier;
|
|
|
|
}
|
|
|
|
|
2010-11-13 01:49:04 +03:00
|
|
|
/*
|
|
|
|
* We don't do anything but print debug spew for many of the command bits
|
|
|
|
* we receive from the hardware, but some of them are useful information
|
|
|
|
* we want to store so that we can use them.
|
|
|
|
*/
|
|
|
|
static void mceusb_handle_command(struct mceusb_dev *ir, int index)
|
|
|
|
{
|
|
|
|
u8 hi = ir->buf_in[index + 1] & 0xff;
|
|
|
|
u8 lo = ir->buf_in[index + 2] & 0xff;
|
|
|
|
|
|
|
|
switch (ir->buf_in[index]) {
|
2011-07-18 23:54:26 +04:00
|
|
|
/* the one and only 5-byte return value command */
|
|
|
|
case MCE_RSP_GETPORTSTATUS:
|
|
|
|
if ((ir->buf_in[index + 4] & 0xff) == 0x00)
|
|
|
|
ir->txports_cabled |= 1 << hi;
|
|
|
|
break;
|
|
|
|
|
2010-11-13 01:49:04 +03:00
|
|
|
/* 2-byte return value commands */
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRTIMEOUT:
|
2011-07-04 00:13:52 +04:00
|
|
|
ir->rc->timeout = US_TO_NS((hi << 8 | lo) * MCE_TIME_UNIT);
|
2010-11-13 01:49:04 +03:00
|
|
|
break;
|
2011-07-18 23:54:26 +04:00
|
|
|
case MCE_RSP_EQIRNUMPORTS:
|
|
|
|
ir->num_txports = hi;
|
|
|
|
ir->num_rxports = lo;
|
|
|
|
break;
|
2010-11-13 01:49:04 +03:00
|
|
|
|
|
|
|
/* 1-byte return value commands */
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
case MCE_RSP_EQEMVER:
|
|
|
|
ir->emver = hi;
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRTXPORTS:
|
2010-11-13 01:49:04 +03:00
|
|
|
ir->tx_mask = hi;
|
|
|
|
break;
|
2011-07-18 23:54:21 +04:00
|
|
|
case MCE_RSP_EQIRRXPORTEN:
|
|
|
|
ir->learning_enabled = ((hi & 0x02) == 0x02);
|
2011-07-18 23:54:26 +04:00
|
|
|
ir->rxports_active = hi;
|
2010-11-13 01:49:04 +03:00
|
|
|
break;
|
2011-07-18 23:54:24 +04:00
|
|
|
case MCE_RSP_CMD_ILLEGAL:
|
|
|
|
ir->need_reset = true;
|
|
|
|
break;
|
2010-11-13 01:49:04 +03:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
|
|
|
|
{
|
2010-10-17 02:56:28 +04:00
|
|
|
DEFINE_IR_RAW_EVENT(rawir);
|
2010-10-22 08:35:44 +04:00
|
|
|
int i = 0;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* skip meaningless 0xb1 0x60 header bytes on orig receiver */
|
|
|
|
if (ir->flags.microsoft_gen1)
|
2010-10-22 08:35:44 +04:00
|
|
|
i = 2;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-11-10 00:41:46 +03:00
|
|
|
/* if there's no data, just return now */
|
|
|
|
if (buf_len <= i)
|
|
|
|
return;
|
|
|
|
|
2010-10-22 08:35:44 +04:00
|
|
|
for (; i < buf_len; i++) {
|
|
|
|
switch (ir->parser_state) {
|
|
|
|
case SUBCMD:
|
|
|
|
ir->rem = mceusb_cmdsize(ir->cmd, ir->buf_in[i]);
|
2010-10-22 23:49:35 +04:00
|
|
|
mceusb_dev_printdata(ir, ir->buf_in, i - 1,
|
|
|
|
ir->rem + 2, false);
|
2010-11-13 01:49:04 +03:00
|
|
|
mceusb_handle_command(ir, i);
|
2010-10-22 08:35:44 +04:00
|
|
|
ir->parser_state = CMD_DATA;
|
|
|
|
break;
|
|
|
|
case PARSE_IRDATA:
|
2010-06-02 00:32:08 +04:00
|
|
|
ir->rem--;
|
2011-01-26 18:20:09 +03:00
|
|
|
init_ir_raw_event(&rawir);
|
2010-06-02 00:32:08 +04:00
|
|
|
rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0);
|
|
|
|
rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK)
|
2011-01-18 23:31:24 +03:00
|
|
|
* US_TO_NS(MCE_TIME_UNIT);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "Storing %s with duration %d\n",
|
2010-06-02 00:32:08 +04:00
|
|
|
rawir.pulse ? "pulse" : "space",
|
|
|
|
rawir.duration);
|
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
ir_raw_event_store_with_filter(ir->rc, &rawir);
|
2010-10-22 08:35:44 +04:00
|
|
|
break;
|
|
|
|
case CMD_DATA:
|
|
|
|
ir->rem--;
|
|
|
|
break;
|
|
|
|
case CMD_HEADER:
|
|
|
|
/* decode mce packets of the form (84),AA,BB,CC,DD */
|
|
|
|
/* IR data packets can span USB messages - rem */
|
|
|
|
ir->cmd = ir->buf_in[i];
|
2011-07-18 23:54:21 +04:00
|
|
|
if ((ir->cmd == MCE_CMD_PORT_IR) ||
|
|
|
|
((ir->cmd & MCE_PORT_MASK) !=
|
2010-10-22 21:42:54 +04:00
|
|
|
MCE_COMMAND_IRDATA)) {
|
2010-10-22 08:35:44 +04:00
|
|
|
ir->parser_state = SUBCMD;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ir->rem = (ir->cmd & MCE_PACKET_LENGTH_MASK);
|
2010-11-13 01:49:04 +03:00
|
|
|
mceusb_dev_printdata(ir, ir->buf_in,
|
|
|
|
i, ir->rem + 1, false);
|
2010-11-10 00:41:03 +03:00
|
|
|
if (ir->rem)
|
2010-10-22 08:35:44 +04:00
|
|
|
ir->parser_state = PARSE_IRDATA;
|
2011-01-26 18:20:09 +03:00
|
|
|
else
|
|
|
|
ir_raw_event_reset(ir->rc);
|
2010-10-22 08:35:44 +04:00
|
|
|
break;
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2010-10-22 08:35:44 +04:00
|
|
|
if (ir->parser_state != CMD_HEADER && !ir->rem)
|
|
|
|
ir->parser_state = CMD_HEADER;
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "processed IR data, calling ir_raw_event_handle\n");
|
2010-10-29 23:08:23 +04:00
|
|
|
ir_raw_event_handle(ir->rc);
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mceusb_dev_recv(struct urb *urb, struct pt_regs *regs)
|
|
|
|
{
|
|
|
|
struct mceusb_dev *ir;
|
|
|
|
int buf_len;
|
|
|
|
|
|
|
|
if (!urb)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ir = urb->context;
|
|
|
|
if (!ir) {
|
|
|
|
usb_unlink_urb(urb);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf_len = urb->actual_length;
|
|
|
|
|
|
|
|
if (ir->send_flags == RECV_FLAG_IN_PROGRESS) {
|
|
|
|
ir->send_flags = SEND_FLAG_COMPLETE;
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "setup answer received %d bytes\n",
|
2010-06-02 00:32:08 +04:00
|
|
|
buf_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (urb->status) {
|
|
|
|
/* success */
|
|
|
|
case 0:
|
|
|
|
mceusb_process_ir_data(ir, buf_len);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case -ECONNRESET:
|
|
|
|
case -ENOENT:
|
|
|
|
case -ESHUTDOWN:
|
|
|
|
usb_unlink_urb(urb);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case -EPIPE:
|
|
|
|
default:
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(ir->dev, "Error: urb status = %d\n", urb->status);
|
2010-06-02 00:32:08 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
}
|
|
|
|
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
static void mceusb_get_emulator_version(struct mceusb_dev *ir)
|
|
|
|
{
|
|
|
|
/* If we get no reply or an illegal command reply, its ver 1, says MS */
|
|
|
|
ir->emver = 1;
|
|
|
|
mce_async_out(ir, GET_EMVER, sizeof(GET_EMVER));
|
|
|
|
}
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
static void mceusb_gen1_init(struct mceusb_dev *ir)
|
|
|
|
{
|
2010-07-10 18:19:42 +04:00
|
|
|
int ret;
|
2010-06-02 00:32:08 +04:00
|
|
|
struct device *dev = ir->dev;
|
2010-07-04 05:42:14 +04:00
|
|
|
char *data;
|
2010-06-17 00:10:05 +04:00
|
|
|
|
|
|
|
data = kzalloc(USB_CTRL_MSG_SZ, GFP_KERNEL);
|
|
|
|
if (!data) {
|
|
|
|
dev_err(dev, "%s: memory allocation failed!\n", __func__);
|
|
|
|
return;
|
|
|
|
}
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/*
|
2010-07-04 05:42:14 +04:00
|
|
|
* This is a strange one. Windows issues a set address to the device
|
2010-06-02 00:32:08 +04:00
|
|
|
* on the receive control pipe and expect a certain value pair back
|
|
|
|
*/
|
|
|
|
ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
|
|
|
|
USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
|
2010-06-17 00:10:05 +04:00
|
|
|
data, USB_CTRL_MSG_SZ, HZ * 3);
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "%s - ret = %d\n", __func__, ret);
|
|
|
|
mce_dbg(dev, "%s - data[0] = %d, data[1] = %d\n",
|
2010-06-02 00:32:08 +04:00
|
|
|
__func__, data[0], data[1]);
|
|
|
|
|
|
|
|
/* set feature: bit rate 38400 bps */
|
|
|
|
ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
|
|
|
|
USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,
|
|
|
|
0xc04e, 0x0000, NULL, 0, HZ * 3);
|
|
|
|
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "%s - ret = %d\n", __func__, ret);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* bRequest 4: set char length to 8 bits */
|
|
|
|
ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
|
|
|
|
4, USB_TYPE_VENDOR,
|
|
|
|
0x0808, 0x0000, NULL, 0, HZ * 3);
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "%s - retB = %d\n", __func__, ret);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* bRequest 2: set handshaking to use DTR/DSR */
|
|
|
|
ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
|
|
|
|
2, USB_TYPE_VENDOR,
|
|
|
|
0x0000, 0x0100, NULL, 0, HZ * 3);
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(dev, "%s - retC = %d\n", __func__, ret);
|
2010-06-17 00:10:05 +04:00
|
|
|
|
2011-07-18 23:54:21 +04:00
|
|
|
/* device resume */
|
|
|
|
mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME));
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
|
|
|
|
/* get hw/sw revision? */
|
|
|
|
mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
|
|
|
|
|
2010-06-17 00:10:05 +04:00
|
|
|
kfree(data);
|
2010-06-02 00:32:08 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static void mceusb_gen2_init(struct mceusb_dev *ir)
|
|
|
|
{
|
2011-07-18 23:54:21 +04:00
|
|
|
/* device resume */
|
|
|
|
mce_async_out(ir, DEVICE_RESUME, sizeof(DEVICE_RESUME));
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* get hw/sw revision? */
|
|
|
|
mce_async_out(ir, GET_REVISION, sizeof(GET_REVISION));
|
|
|
|
|
2011-07-18 23:54:21 +04:00
|
|
|
/* get wake version (protocol, key, address) */
|
|
|
|
mce_async_out(ir, GET_WAKEVERSION, sizeof(GET_WAKEVERSION));
|
|
|
|
|
|
|
|
/* unknown what this one actually returns... */
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
mce_async_out(ir, GET_UNKNOWN2, sizeof(GET_UNKNOWN2));
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
static void mceusb_get_parameters(struct mceusb_dev *ir)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
2011-07-18 23:54:26 +04:00
|
|
|
int i;
|
|
|
|
unsigned char cmdbuf[3] = { MCE_CMD_PORT_SYS,
|
|
|
|
MCE_CMD_GETPORTSTATUS, 0x00 };
|
|
|
|
|
|
|
|
/* defaults, if the hardware doesn't support querying */
|
|
|
|
ir->num_txports = 2;
|
|
|
|
ir->num_rxports = 2;
|
|
|
|
|
|
|
|
/* get number of tx and rx ports */
|
|
|
|
mce_async_out(ir, GET_NUM_PORTS, sizeof(GET_NUM_PORTS));
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
/* get the carrier and frequency */
|
|
|
|
mce_async_out(ir, GET_CARRIER_FREQ, sizeof(GET_CARRIER_FREQ));
|
|
|
|
|
2011-07-18 23:54:26 +04:00
|
|
|
if (ir->num_txports && !ir->flags.no_tx)
|
2010-10-29 07:07:39 +04:00
|
|
|
/* get the transmitter bitmask */
|
|
|
|
mce_async_out(ir, GET_TX_BITMASK, sizeof(GET_TX_BITMASK));
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* get receiver timeout value */
|
|
|
|
mce_async_out(ir, GET_RX_TIMEOUT, sizeof(GET_RX_TIMEOUT));
|
|
|
|
|
|
|
|
/* get receiver sensor setting */
|
|
|
|
mce_async_out(ir, GET_RX_SENSOR, sizeof(GET_RX_SENSOR));
|
2011-07-18 23:54:26 +04:00
|
|
|
|
|
|
|
for (i = 0; i < ir->num_txports; i++) {
|
|
|
|
cmdbuf[2] = i;
|
|
|
|
mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
|
|
|
|
}
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2011-07-18 23:54:27 +04:00
|
|
|
static void mceusb_flash_led(struct mceusb_dev *ir)
|
|
|
|
{
|
|
|
|
if (ir->emver < 2)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mce_async_out(ir, FLASH_LED, sizeof(FLASH_LED));
|
|
|
|
}
|
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
|
2010-06-02 00:32:08 +04:00
|
|
|
{
|
|
|
|
struct device *dev = ir->dev;
|
2010-10-29 23:08:23 +04:00
|
|
|
struct rc_dev *rc;
|
|
|
|
int ret;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
rc = rc_allocate_device();
|
|
|
|
if (!rc) {
|
|
|
|
dev_err(dev, "remote dev allocation failed\n");
|
|
|
|
goto out;
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2010-10-22 18:52:53 +04:00
|
|
|
snprintf(ir->name, sizeof(ir->name), "%s (%04x:%04x)",
|
2010-10-29 23:08:23 +04:00
|
|
|
mceusb_model[ir->model].name ?
|
2010-11-17 22:56:17 +03:00
|
|
|
mceusb_model[ir->model].name :
|
2010-10-29 23:08:23 +04:00
|
|
|
"Media Center Ed. eHome Infrared Remote Transceiver",
|
2010-06-02 00:32:08 +04:00
|
|
|
le16_to_cpu(ir->usbdev->descriptor.idVendor),
|
|
|
|
le16_to_cpu(ir->usbdev->descriptor.idProduct));
|
|
|
|
|
|
|
|
usb_make_path(ir->usbdev, ir->phys, sizeof(ir->phys));
|
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
rc->input_name = ir->name;
|
|
|
|
rc->input_phys = ir->phys;
|
|
|
|
usb_to_input_id(ir->usbdev, &rc->input_id);
|
|
|
|
rc->dev.parent = dev;
|
|
|
|
rc->priv = ir;
|
|
|
|
rc->driver_type = RC_DRIVER_IR_RAW;
|
2010-11-17 20:20:52 +03:00
|
|
|
rc->allowed_protos = RC_TYPE_ALL;
|
2011-07-04 00:13:53 +04:00
|
|
|
rc->timeout = MS_TO_NS(100);
|
2010-10-29 07:07:39 +04:00
|
|
|
if (!ir->flags.no_tx) {
|
2010-10-29 23:08:23 +04:00
|
|
|
rc->s_tx_mask = mceusb_set_tx_mask;
|
|
|
|
rc->s_tx_carrier = mceusb_set_tx_carrier;
|
|
|
|
rc->tx_ir = mceusb_tx_ir;
|
2010-10-29 07:07:39 +04:00
|
|
|
}
|
2010-10-29 23:08:23 +04:00
|
|
|
rc->driver_name = DRIVER_NAME;
|
|
|
|
rc->map_name = mceusb_model[ir->model].rc_map ?
|
|
|
|
mceusb_model[ir->model].rc_map : RC_MAP_RC6_MCE;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
ret = rc_register_device(rc);
|
2010-06-02 00:32:08 +04:00
|
|
|
if (ret < 0) {
|
2010-10-29 23:08:23 +04:00
|
|
|
dev_err(dev, "remote dev registration failed\n");
|
|
|
|
goto out;
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
return rc;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
out:
|
|
|
|
rc_free_device(rc);
|
2010-06-02 00:32:08 +04:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __devinit mceusb_dev_probe(struct usb_interface *intf,
|
|
|
|
const struct usb_device_id *id)
|
|
|
|
{
|
|
|
|
struct usb_device *dev = interface_to_usbdev(intf);
|
|
|
|
struct usb_host_interface *idesc;
|
|
|
|
struct usb_endpoint_descriptor *ep = NULL;
|
|
|
|
struct usb_endpoint_descriptor *ep_in = NULL;
|
|
|
|
struct usb_endpoint_descriptor *ep_out = NULL;
|
|
|
|
struct mceusb_dev *ir = NULL;
|
2010-06-17 00:10:46 +04:00
|
|
|
int pipe, maxp, i;
|
2010-06-02 00:32:08 +04:00
|
|
|
char buf[63], name[128] = "";
|
2010-10-22 18:50:37 +04:00
|
|
|
enum mceusb_model_type model = id->driver_info;
|
2010-06-02 00:32:08 +04:00
|
|
|
bool is_gen3;
|
|
|
|
bool is_microsoft_gen1;
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
bool tx_mask_normal;
|
2011-03-01 18:38:28 +03:00
|
|
|
int ir_intfnum;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(&intf->dev, "%s called\n", __func__);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
idesc = intf->cur_altsetting;
|
|
|
|
|
2010-10-22 18:50:37 +04:00
|
|
|
is_gen3 = mceusb_model[model].mce_gen3;
|
|
|
|
is_microsoft_gen1 = mceusb_model[model].mce_gen1;
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
tx_mask_normal = mceusb_model[model].tx_mask_normal;
|
2011-03-01 18:38:28 +03:00
|
|
|
ir_intfnum = mceusb_model[model].ir_intfnum;
|
2010-10-18 23:32:50 +04:00
|
|
|
|
2011-03-01 18:38:28 +03:00
|
|
|
/* There are multi-function devices with non-IR interfaces */
|
|
|
|
if (idesc->desc.bInterfaceNumber != ir_intfnum)
|
|
|
|
return -ENODEV;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
/* step through the endpoints to find first bulk in and out endpoint */
|
|
|
|
for (i = 0; i < idesc->desc.bNumEndpoints; ++i) {
|
|
|
|
ep = &idesc->endpoint[i].desc;
|
|
|
|
|
|
|
|
if ((ep_in == NULL)
|
|
|
|
&& ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
|
|
|
|
== USB_DIR_IN)
|
|
|
|
&& (((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
|
|
|
|
== USB_ENDPOINT_XFER_BULK)
|
|
|
|
|| ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
|
|
|
|
== USB_ENDPOINT_XFER_INT))) {
|
|
|
|
|
|
|
|
ep_in = ep;
|
|
|
|
ep_in->bmAttributes = USB_ENDPOINT_XFER_INT;
|
2010-06-17 00:10:46 +04:00
|
|
|
ep_in->bInterval = 1;
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(&intf->dev, "acceptable inbound endpoint "
|
2010-06-17 00:10:46 +04:00
|
|
|
"found\n");
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((ep_out == NULL)
|
|
|
|
&& ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
|
|
|
|
== USB_DIR_OUT)
|
|
|
|
&& (((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
|
|
|
|
== USB_ENDPOINT_XFER_BULK)
|
|
|
|
|| ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
|
|
|
|
== USB_ENDPOINT_XFER_INT))) {
|
|
|
|
|
|
|
|
ep_out = ep;
|
|
|
|
ep_out->bmAttributes = USB_ENDPOINT_XFER_INT;
|
2010-06-17 00:10:46 +04:00
|
|
|
ep_out->bInterval = 1;
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(&intf->dev, "acceptable outbound endpoint "
|
2010-06-17 00:10:46 +04:00
|
|
|
"found\n");
|
2010-06-02 00:32:08 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ep_in == NULL) {
|
2011-05-26 22:51:11 +04:00
|
|
|
mce_dbg(&intf->dev, "inbound and/or endpoint not found\n");
|
2010-06-02 00:32:08 +04:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
pipe = usb_rcvintpipe(dev, ep_in->bEndpointAddress);
|
|
|
|
maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
|
|
|
|
|
|
|
|
ir = kzalloc(sizeof(struct mceusb_dev), GFP_KERNEL);
|
|
|
|
if (!ir)
|
|
|
|
goto mem_alloc_fail;
|
|
|
|
|
|
|
|
ir->buf_in = usb_alloc_coherent(dev, maxp, GFP_ATOMIC, &ir->dma_in);
|
|
|
|
if (!ir->buf_in)
|
|
|
|
goto buf_in_alloc_fail;
|
|
|
|
|
|
|
|
ir->urb_in = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
if (!ir->urb_in)
|
|
|
|
goto urb_in_alloc_fail;
|
|
|
|
|
|
|
|
ir->usbdev = dev;
|
|
|
|
ir->dev = &intf->dev;
|
|
|
|
ir->len_in = maxp;
|
|
|
|
ir->flags.microsoft_gen1 = is_microsoft_gen1;
|
[media] mceusb: fix inverted mask inversion logic
As it turns out, somewhere along the way, we managed to invert the
meaning of the tx_mask_inverted flag. Looking back over the old lirc
driver, tx_mask_inverted was set to 0 if the device was in tx_mask_list.
Now we have a tx_mask_inverted flag set to 1 for all the devices that
were in the list, and set tx_mask_inverted to that flag value, which is
actually the opposite of what we used to set, causing set_tx_mask to use
the wrong mask setting option. Since there seem to be more devices with
inverted masks than not (using the original device as the baseline for
inverted vs. normal), lets just call the ones currently marked as
inverted normal instead, and flip the if/else actions that key off of
the inverted flag.
Note: the problem only cropped up if a call to set_tx_mask was made, if
no mask was set, the device would work just fine, which is why this
managed to slip though w/o getting noticed until now.
Tested successfully by myself and Dennis Gilmore.
Reported-by: Dennis Gilmore <dgilmore@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-16 01:20:55 +03:00
|
|
|
ir->flags.tx_mask_normal = tx_mask_normal;
|
2010-10-29 07:07:39 +04:00
|
|
|
ir->flags.no_tx = mceusb_model[model].no_tx;
|
2010-10-22 18:50:37 +04:00
|
|
|
ir->model = model;
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
/* Saving usb interface data for use by the transmitter routine */
|
|
|
|
ir->usb_ep_in = ep_in;
|
|
|
|
ir->usb_ep_out = ep_out;
|
|
|
|
|
|
|
|
if (dev->descriptor.iManufacturer
|
|
|
|
&& usb_string(dev, dev->descriptor.iManufacturer,
|
|
|
|
buf, sizeof(buf)) > 0)
|
|
|
|
strlcpy(name, buf, sizeof(name));
|
|
|
|
if (dev->descriptor.iProduct
|
|
|
|
&& usb_string(dev, dev->descriptor.iProduct,
|
|
|
|
buf, sizeof(buf)) > 0)
|
|
|
|
snprintf(name + strlen(name), sizeof(name) - strlen(name),
|
|
|
|
" %s", buf);
|
|
|
|
|
2010-10-29 23:08:23 +04:00
|
|
|
ir->rc = mceusb_init_rc_dev(ir);
|
|
|
|
if (!ir->rc)
|
|
|
|
goto rc_dev_fail;
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2010-07-04 05:42:14 +04:00
|
|
|
/* wire up inbound data handler */
|
2010-06-02 00:32:08 +04:00
|
|
|
usb_fill_int_urb(ir->urb_in, dev, pipe, ir->buf_in,
|
|
|
|
maxp, (usb_complete_t) mceusb_dev_recv, ir, ep_in->bInterval);
|
|
|
|
ir->urb_in->transfer_dma = ir->dma_in;
|
|
|
|
ir->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
|
|
|
|
|
[media] mceusb: mce_sync_in is brain-dead
Aside from the initial "hey, lets make sure we've flushed any
pre-existing data on the device" call to mce_sync_in, every other one of
the calls was entirely superfluous. Ergo, remove them all, and rename
the one and only (questionably) useful one to reflect what it really
does. Verified on both gen2 and gen3 hardware to make zero difference.
Well, except that you no longer get a bunch of urb submit failures from
the unneeded mce_sync_in calls. Oh. And move that flush to a point
*after* we've wired up the inbound urb, or it won't do squat. I have
half a mind to just remove it entirely, but someone thought it was
necessary at some point, and it doesn't seem to hurt, so lets leave it
for the time being.
This excercise took place due to insightful questions asked by Hans
Petter Selasky, about the possible reuse of the inbound urb before it
was actually availble by mce_sync_in, so thanks to him for motivating
this cleanup.
Reported-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-05-26 21:23:18 +04:00
|
|
|
/* flush buffers on the device */
|
|
|
|
mce_dbg(&intf->dev, "Flushing receive buffers\n");
|
|
|
|
mce_flush_rx_buffer(ir, maxp);
|
|
|
|
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
/* figure out which firmware/emulator version this hardware has */
|
|
|
|
mceusb_get_emulator_version(ir);
|
|
|
|
|
2010-06-02 00:32:08 +04:00
|
|
|
/* initialize device */
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
if (ir->flags.microsoft_gen1)
|
2010-06-02 00:32:08 +04:00
|
|
|
mceusb_gen1_init(ir);
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
else if (!is_gen3)
|
2010-06-02 00:32:08 +04:00
|
|
|
mceusb_gen2_init(ir);
|
|
|
|
|
V4L/DVB: IR/mceusb: more streamlining of device init
Spent a while last night getting device initialization packet captures
under Windows for all generations of devices. There are a few places
where we were doing things differently, and few things we were doing
that we don't need to do, particularly on gen3 hardware, and I *think*
one of those things is what was locking up my pinnacle hw from time to
time -- at least, its been perfectly well behaved every time its been
plugged in since making this change.
First up, we're adding a bit more to the gen1 init routine here. Its
not absolutely necessary, the hardware works the same both with and
without it, but I'd like to be consistent w/Windows here.
Second, DEVICE_RESET is never called when initializing either of my
gen3 devices, its only called for gen1 and gen2. The bits in the gen3
init after removing that, are safe (and interesting) to run on all
hardware, so there's no more gen3-specific init done, there's instead
a generic mceusb_get_parameters() that is run for all hardware.
Third, the gen3 flag isn't needed. We only care if hardware is gen3
during probe, so I've dropped that from the device flags struct.
Successfully tested on all three generations of mceusb hardware.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-07-08 19:38:57 +04:00
|
|
|
mceusb_get_parameters(ir);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
2011-07-18 23:54:27 +04:00
|
|
|
mceusb_flash_led(ir);
|
|
|
|
|
2010-10-29 07:07:39 +04:00
|
|
|
if (!ir->flags.no_tx)
|
2010-10-29 23:08:23 +04:00
|
|
|
mceusb_set_tx_mask(ir->rc, MCE_DEFAULT_TX_MASK);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
usb_set_intfdata(intf, ir);
|
|
|
|
|
2011-07-18 23:54:23 +04:00
|
|
|
/* enable wake via this device */
|
|
|
|
device_set_wakeup_capable(ir->dev, true);
|
|
|
|
device_set_wakeup_enable(ir->dev, true);
|
|
|
|
|
[media] mceusb: query device for firmware emulator version
Supposedly, there are essentially three different classes of devices
that are compatible with Microsoft's specs. First are the "legacy"
devices, which are built using Microsoft-provided hardware specs and
firmware. Second are "emulator" devices, which are built using custom
hardware and firmware, written to emulate Microsoft's firmware. Third
are "port" devices, which have their own device driver and firmware,
which provides compatible data to higher levels of the stack.
>From what I can tell, things like nuvoton-cir and fintek-cir are
essentially "port" devices -- their raw IR buffer format is very similar
to that of the mceusb devices. Now, within the mceusb driver, we have
three different "generations", which at first, seemed like maybe they
mapped to emulator versions. Unfortuantely, every single device I have
responds "illegal command" to the query to get firmware emulator version
from the hardware, which means they're either all emulator version 1, or
they're legacy devices, and our different "generations" aren't at all
related here. Though in theory, its possible the gen1 devices are
"legacy" devices and the rest are emulator v1. There are some useful
features of the v2 interface I was hoping to play with, but alas...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-18 23:54:25 +04:00
|
|
|
dev_info(&intf->dev, "Registered %s with mce emulator interface "
|
|
|
|
"version %x\n", name, ir->emver);
|
2011-07-18 23:54:26 +04:00
|
|
|
dev_info(&intf->dev, "%x tx ports (0x%x cabled) and "
|
|
|
|
"%x rx sensors (0x%x active)\n",
|
|
|
|
ir->num_txports, ir->txports_cabled,
|
|
|
|
ir->num_rxports, ir->rxports_active);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Error-handling path */
|
2010-10-29 23:08:23 +04:00
|
|
|
rc_dev_fail:
|
2010-06-02 00:32:08 +04:00
|
|
|
usb_free_urb(ir->urb_in);
|
|
|
|
urb_in_alloc_fail:
|
|
|
|
usb_free_coherent(dev, maxp, ir->buf_in, ir->dma_in);
|
|
|
|
buf_in_alloc_fail:
|
|
|
|
kfree(ir);
|
|
|
|
mem_alloc_fail:
|
|
|
|
dev_err(&intf->dev, "%s: device setup failed!\n", __func__);
|
|
|
|
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void __devexit mceusb_dev_disconnect(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
struct usb_device *dev = interface_to_usbdev(intf);
|
|
|
|
struct mceusb_dev *ir = usb_get_intfdata(intf);
|
|
|
|
|
|
|
|
usb_set_intfdata(intf, NULL);
|
|
|
|
|
|
|
|
if (!ir)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ir->usbdev = NULL;
|
2010-10-29 23:08:23 +04:00
|
|
|
rc_unregister_device(ir->rc);
|
2010-06-02 00:32:08 +04:00
|
|
|
usb_kill_urb(ir->urb_in);
|
|
|
|
usb_free_urb(ir->urb_in);
|
|
|
|
usb_free_coherent(dev, ir->len_in, ir->buf_in, ir->dma_in);
|
|
|
|
|
|
|
|
kfree(ir);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mceusb_dev_suspend(struct usb_interface *intf, pm_message_t message)
|
|
|
|
{
|
|
|
|
struct mceusb_dev *ir = usb_get_intfdata(intf);
|
|
|
|
dev_info(ir->dev, "suspend\n");
|
|
|
|
usb_kill_urb(ir->urb_in);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mceusb_dev_resume(struct usb_interface *intf)
|
|
|
|
{
|
|
|
|
struct mceusb_dev *ir = usb_get_intfdata(intf);
|
|
|
|
dev_info(ir->dev, "resume\n");
|
|
|
|
if (usb_submit_urb(ir->urb_in, GFP_ATOMIC))
|
|
|
|
return -EIO;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct usb_driver mceusb_dev_driver = {
|
|
|
|
.name = DRIVER_NAME,
|
|
|
|
.probe = mceusb_dev_probe,
|
2012-05-04 01:22:22 +04:00
|
|
|
.disconnect = __devexit_p(mceusb_dev_disconnect),
|
2010-06-02 00:32:08 +04:00
|
|
|
.suspend = mceusb_dev_suspend,
|
|
|
|
.resume = mceusb_dev_resume,
|
|
|
|
.reset_resume = mceusb_dev_resume,
|
|
|
|
.id_table = mceusb_dev_table
|
|
|
|
};
|
|
|
|
|
2011-11-18 21:46:12 +04:00
|
|
|
module_usb_driver(mceusb_dev_driver);
|
2010-06-02 00:32:08 +04:00
|
|
|
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_DEVICE_TABLE(usb, mceusb_dev_table);
|
|
|
|
|
|
|
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
MODULE_PARM_DESC(debug, "Debug enabled or not");
|