nfc: Add support RC-S380P to port100
Subsystems (2)
PATCH RESEND 1/3 nfc: Add support RC-S380P to port100
Signed-off-by OGAWA Hirofumi <[email protected]>
---
drivers/nfc/port100.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-add-rcs380p +5 -3
@@ -21,8 +21,9 @@#define VERSION "0.1" -#define SONY_VENDOR_ID 0x054c -#define RCS380_PRODUCT_ID 0x06c1 +#define SONY_VENDOR_ID 0x054c +#define RCS380S_PRODUCT_ID 0x06c1 +#define RCS380P_PRODUCT_ID 0x06c3#define PORT100_PROTOCOLS (NFC_PROTO_JEWEL_MASK | \ NFC_PROTO_MIFARE_MASK | \
@@ -1477,7 +1478,8 @@ static struct nfc_digital_ops port100_di };static const struct usb_device_id port100_table[] = { - {USB_DEVICE (SONY_VENDOR_ID ,RCS380_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380S_PRODUCT_ID ), }, + {USB_DEVICE (SONY_VENDOR_ID ,RCS380P_PRODUCT_ID ), }, { } };MODULE_DEVICE_TABLE (usb, port100_table);
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH RESEND 2/3 nfc: Send same info for both of NFC_CMD_GET_DEVICE and NFC_EVENT_DEVICE_ADDED
Now, NFC_EVENT_DEVICE_ADDED doesn't send NFC_ATTR_RF_MODE. But NFC_CMD_GET_DEVICE send.
To get NFC_ATTR_RF_MODE, we have to call NFC_CMD_GET_DEVICE just for NFC_ATTR_RF_MODE when get NFC_EVENT_DEVICE_ADDED.
This fixes those inconsistent.
Signed-off-by OGAWA Hirofumi <[email protected]>
---
net/nfc/netlink.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
net/nfc/netlink.c renamed from net/nfc/netlink.c~nfc-send-same-info +13 -9
@@ -311,6 +311,17 @@ free_msg:return -EMSGSIZE ; } +static int nfc_genl_setup_device_added (struct nfc_dev *dev,struct sk_buff *msg) +{ +if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || +nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || +nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || +nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up) || +nla_put_u8 (msg,NFC_ATTR_RF_MODE , dev->rf_mode)) +return -1 ; +return 0 ; +} +int nfc_genl_device_added (struct nfc_dev *dev) {struct sk_buff *msg;
@@ -325,10 +336,7 @@ int nfc_genl_device_added(struct nfc_devif (!hdr) goto free_msg; -if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || -nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || -nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || -nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up)) +if (nfc_genl_setup_device_added (dev, msg)) goto nla_put_failure;genlmsg_end (msg, hdr);
@@ -604,11 +612,7 @@ static int nfc_genl_send_device(struct sif (cb)genl_dump_check_consistent (cb, hdr, &nfc_genl_family); -if (nla_put_string (msg,NFC_ATTR_DEVICE_NAME ,nfc_device_name (dev)) || -nla_put_u32 (msg,NFC_ATTR_DEVICE_INDEX , dev->idx) || -nla_put_u32 (msg,NFC_ATTR_PROTOCOLS , dev->supported_protocols) || -nla_put_u8 (msg,NFC_ATTR_DEVICE_POWERED , dev->dev_up) || -nla_put_u8 (msg,NFC_ATTR_RF_MODE , dev->rf_mode)) +if (nfc_genl_setup_device_added (dev, msg)) goto nla_put_failure;genlmsg_end (msg, hdr);
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>
PATCH 3/3 nfc: Fix RC-S380* needs zero-length packet
If sent packet size is wMaxPacketSize boundary, this device doesn't answer. To fix this, we have to send zero-length packet in usb spec.
Signed-off-by OGAWA Hirofumi <[email protected]>
---
drivers/nfc/port100.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/port100.c renamed from drivers/nfc/port100.c~nfc-need-zero-packet +1 -0
@@ -1540,6 +1540,7 @@ static int port100_probe(struct usb_inteusb_fill_bulk_urb (dev->out_urb, dev->udev,usb_sndbulkpipe (dev->udev, out_endpoint),NULL ,0 , port100_send_complete, dev); + dev->out_urb->transfer_flags =URB_ZERO_PACKET ; dev->skb_headroom =PORT100_FRAME_HEADER_LEN +PORT100_COMM_RF_HEAD_MAX_LEN ;
_
Signature · 1 line
OGAWA Hirofumi <[email protected]>