From 6bd73ed417c52ed57d5f62ea9988b6071a1efbeb Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 15 Feb 2011 09:20:21 -0500 Subject: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE Change-Id: I972d28065ee7e77e93699512310fcd6d5742ed0d Signed-off-by: Mike Lockwood --- libc/kernel/common/linux/usb/f_accessory.h | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 libc/kernel/common/linux/usb/f_accessory.h diff --git a/libc/kernel/common/linux/usb/f_accessory.h b/libc/kernel/common/linux/usb/f_accessory.h new file mode 100644 index 0000000..84a8917 --- /dev/null +++ b/libc/kernel/common/linux/usb/f_accessory.h @@ -0,0 +1,38 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Linux kernel header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to libc. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + *** To edit the content of this header, modify the corresponding + *** source file (e.g. under external/kernel-headers/original/) then + *** run bionic/libc/kernel/tools/update_all.py + *** + *** Any manual change here will be lost the next time this script will + *** be run. You've been warned! + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __LINUX_USB_F_ACCESSORY_H +#define __LINUX_USB_F_ACCESSORY_H +#define USB_ACCESSORY_VENDOR_ID 0x18D1 +#define USB_ACCESSORY_PRODUCT_ID 0x2D00 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 +#define ACCESSORY_STRING_MANUFACTURER 0 +#define ACCESSORY_STRING_MODEL 1 +#define ACCESSORY_STRING_TYPE 2 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ACCESSORY_STRING_VERSION 3 +#define ACCESSORY_SEND_STRING 52 +#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 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -- cgit v1.1 From 6139fa33ab823e935471fa71bba4c6f715ad6c56 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 9 Mar 2011 21:57:00 -0500 Subject: 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libc/kernel/common/linux/usb/f_accessory.h b/libc/kernel/common/linux/usb/f_accessory.h index 84a8917..eaf8c4d 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_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 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -- cgit v1.1 From 3f14ff34dfbd00fcffb18b10a1a3e17e2cc5ebdf Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 14 Mar 2011 17:50:44 -0400 Subject: DO NOT MERGE: Update USB accessory kernel header to include serial number support Change-Id: I61d889b107bd5e052ebac393883b87dac730ea6a Signed-off-by: Mike Lockwood --- libc/kernel/common/linux/usb/f_accessory.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libc/kernel/common/linux/usb/f_accessory.h b/libc/kernel/common/linux/usb/f_accessory.h index eaf8c4d..7ee9b7f 100644 --- a/libc/kernel/common/linux/usb/f_accessory.h +++ b/libc/kernel/common/linux/usb/f_accessory.h @@ -28,6 +28,7 @@ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ACCESSORY_STRING_VERSION 3 #define ACCESSORY_STRING_URI 4 +#define ACCESSORY_STRING_SERIAL 5 #define ACCESSORY_GET_PROTOCOL 51 #define ACCESSORY_SEND_STRING 52 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ @@ -38,4 +39,5 @@ /* 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]) +#define ACCESSORY_GET_STRING_SERIAL _IOW('M', 6, char[256]) #endif -- cgit v1.1