From 6139fa33ab823e935471fa71bba4c6f715ad6c56 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 9 Mar 2011 21:57:00 -0500 Subject: [PATCH] DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header For bugs b/4079236, b/4073248 and b/4080288 Change-Id: Id9cdbe95d7dd892bf38e16e7da505ee0eae26b99 Signed-off-by: Mike Lockwood --- libc/kernel/common/linux/usb/f_accessory.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libc/kernel/common/linux/usb/f_accessory.h b/libc/kernel/common/linux/usb/f_accessory.h index 84a89172b..eaf8c4df4 100644 --- a/libc/kernel/common/linux/usb/f_accessory.h +++ b/libc/kernel/common/linux/usb/f_accessory.h @@ -24,15 +24,18 @@ #define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 #define ACCESSORY_STRING_MANUFACTURER 0 #define ACCESSORY_STRING_MODEL 1 -#define ACCESSORY_STRING_TYPE 2 +#define ACCESSORY_STRING_DESCRIPTION 2 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ACCESSORY_STRING_VERSION 3 +#define ACCESSORY_STRING_URI 4 +#define ACCESSORY_GET_PROTOCOL 51 #define ACCESSORY_SEND_STRING 52 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ACCESSORY_START 53 #define ACCESSORY_GET_STRING_MANUFACTURER _IOW('M', 1, char[256]) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ACCESSORY_GET_STRING_MODEL _IOW('M', 2, char[256]) -#define ACCESSORY_GET_STRING_TYPE _IOW('M', 3, char[256]) -#define ACCESSORY_GET_STRING_VERSION _IOW('M', 4, char[256]) -#endif +#define ACCESSORY_GET_STRING_DESCRIPTION _IOW('M', 3, char[256]) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ACCESSORY_GET_STRING_VERSION _IOW('M', 4, char[256]) +#define ACCESSORY_GET_STRING_URI _IOW('M', 5, char[256]) +#endif