From e7cf9509a401e45acbc6bc8411edaeaf07efaf3a Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 9 Mar 2011 21:48:20 -0500 Subject: USB: gadget: f_accessory: Misc improvements and cleanup: - Add URI string - Replace type string with a description string - Add a control call to retrieve accessory protocol version (currently 1) - Driver read() and write() calls now fail after USB disconnect until driver file is closed and reopened. - Misc cleanup work Signed-off-by: Mike Lockwood (cherry picked from commit 5dcd55b2e98ffdaf54a5cdd67a3101e1e5dd3aa1) Change-Id: I5b45ee76d5f83b626555e42d34f450db9b69f47b Reviewed-on: http://git-master/r/32887 Reviewed-by: Suresh Mangipudi Tested-by: Suresh Mangipudi Reviewed-by: Bharat Nihalani --- include/linux/usb/f_accessory.h | 42 ++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'include/linux') diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h index 474f12eb0181..977ad0a69c7e 100644 --- a/include/linux/usb/f_accessory.h +++ b/include/linux/usb/f_accessory.h @@ -28,9 +28,24 @@ /* Product ID to use when in accessory mode and adb is enabled */ #define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 -/* - * Indexes for strings sent by the host to identify the accessory. - * The host sends these as vendor requests: +/* Indexes for strings sent by the host via ACCESSORY_SEND_STRING */ +#define ACCESSORY_STRING_MANUFACTURER 0 +#define ACCESSORY_STRING_MODEL 1 +#define ACCESSORY_STRING_DESCRIPTION 2 +#define ACCESSORY_STRING_VERSION 3 +#define ACCESSORY_STRING_URI 4 + +/* Control request for retrieving device's protocol version (currently 1) + * + * requestType: USB_DIR_IN | USB_TYPE_VENDOR + * request: ACCESSORY_GET_PROTOCOL + * value: 0 + * index: 0 + * data version number (16 bits little endian) + */ +#define ACCESSORY_GET_PROTOCOL 51 + +/* Control request for host to send a string to the device * * requestType: USB_DIR_OUT | USB_TYPE_VENDOR * request: ACCESSORY_SEND_STRING @@ -41,19 +56,24 @@ * The device can later retrieve these strings via the * ACCESSORY_GET_STRING_* ioctls */ -#define ACCESSORY_STRING_MANUFACTURER 0 -#define ACCESSORY_STRING_MODEL 1 -#define ACCESSORY_STRING_TYPE 2 -#define ACCESSORY_STRING_VERSION 3 - -/* control requests */ #define ACCESSORY_SEND_STRING 52 + +/* Control request for starting device in accessory mode. + * The host sends this after setting all its strings to the device. + * + * requestType: USB_DIR_OUT | USB_TYPE_VENDOR + * request: ACCESSORY_START + * value: 0 + * index: 0 + * data none + */ #define ACCESSORY_START 53 -/* Sends an event to the accessory via the interrupt endpoint */ +/* ioctls for retrieving strings set by the host */ #define ACCESSORY_GET_STRING_MANUFACTURER _IOW('M', 1, char[256]) #define ACCESSORY_GET_STRING_MODEL _IOW('M', 2, char[256]) -#define ACCESSORY_GET_STRING_TYPE _IOW('M', 3, char[256]) +#define ACCESSORY_GET_STRING_DESCRIPTION _IOW('M', 3, char[256]) #define ACCESSORY_GET_STRING_VERSION _IOW('M', 4, char[256]) +#define ACCESSORY_GET_STRING_URI _IOW('M', 5, char[256]) #endif /* __LINUX_USB_F_ACCESSORY_H */ -- cgit v1.2.3