commit 148b63e6082d35d9a5ec0f156d76ca40a4278044
author Mike Lockwood <lockwood@android.com> Mon Mar 14 18:28:55 2011 -0400
committer Dima Zavin <dima@android.com> Tue Mar 29 11:25:40 2011 -0700
tree f80819a448046a04ce16ea42e5619d2af0dfcb04
parent 64bef932a63b68eb5a64d07364150ffdfba133c8

USB: gadget: f_accessory: Add string for accessory's unique serial number

Signed-off-by: Mike Lockwood <lockwood@android.com>

drivers/usb/gadget/f_accessory.c

diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index baeae59..38918cd 100644
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -71,6 +71,7 @@
 	char description[ACC_STRING_SIZE];
 	char version[ACC_STRING_SIZE];
 	char uri[ACC_STRING_SIZE];
+	char serial[ACC_STRING_SIZE];
 
 	/* for acc_complete_set_string */
 	int string_index;
@@ -273,6 +274,9 @@
 	case ACCESSORY_STRING_URI:
 		string_dest = dev->uri;
 		break;
+	case ACCESSORY_STRING_SERIAL:
+		string_dest = dev->serial;
+		break;
 	}
 	if (string_dest) {
 		unsigned long flags;
@@ -505,6 +509,9 @@
 	case ACCESSORY_GET_STRING_URI:
 		src = dev->uri;
 		break;
+	case ACCESSORY_GET_STRING_SERIAL:
+		src = dev->serial;
+		break;
 	}
 	if (!src)
 		return -EINVAL;
@@ -658,6 +665,7 @@
 				memset(dev->description, 0, sizeof(dev->description));
 				memset(dev->version, 0, sizeof(dev->version));
 				memset(dev->uri, 0, sizeof(dev->uri));
+				memset(dev->serial, 0, sizeof(dev->serial));
 			}
 		}
 	}

include/linux/usb/f_accessory.h

diff --git a/include/linux/usb/f_accessory.h b/include/linux/usb/f_accessory.h
index 977ad0a..ebcc5f3 100644
--- a/include/linux/usb/f_accessory.h
+++ b/include/linux/usb/f_accessory.h
@@ -34,6 +34,7 @@
 #define ACCESSORY_STRING_DESCRIPTION    2
 #define ACCESSORY_STRING_VERSION        3
 #define ACCESSORY_STRING_URI            4
+#define ACCESSORY_STRING_SERIAL         5
 
 /* Control request for retrieving device's protocol version (currently 1)
  *
@@ -75,5 +76,6 @@
 #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])
+#define ACCESSORY_GET_STRING_SERIAL         _IOW('M', 6, char[256])
 
 #endif /* __LINUX_USB_F_ACCESSORY_H */