Minor documentation improvements.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / AndroidAccessoryClassHost.h

diff --git a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h
index a6d024a..678feda 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h
+++ b/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2011.\r
+     Copyright (C) Dean Camera, 2012.\r
 \r
   dean [at] fourwalledcubicle [dot] com\r
            www.lufa-lib.org\r
 */\r
 \r
 /*\r
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r
@@ -83,24 +83,13 @@
                         */\r
                        typedef struct\r
                        {\r
-                               const struct\r
+                               struct\r
                                {\r
-                                       uint8_t  DataINPipeNumber; /**< Pipe number of the AOA interface's IN data pipe. */\r
-                                       bool     DataINPipeDoubleBank; /**< Indicates if the AOA interface's IN data pipe should use double banking. */\r
-\r
-                                       uint8_t  DataOUTPipeNumber; /**< Pipe number of the AOA interface's OUT data pipe. */\r
-                                       bool     DataOUTPipeDoubleBank; /**< Indicates if the AOA interface's OUT data pipe should use double banking. */\r
+                                       USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */\r
+                                       USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */\r
                                        \r
-                                       struct\r
-                                       {\r
-                                               char* Manufacturer; /**< Device manufacturer string. */\r
-                                               char* Model; /**< Device model name string. */\r
-                                               char* Description; /**< Device description string. */\r
-                                               char* Version; /**< Device version string. */\r
-                                               char* URI; /**< Device URI information string. */\r
-                                               char* Serial; /**< Device serial number string. */\r
-                                       } ATTR_PACKED PropertyStrings; /**< Android Accessory property strings, sent to identify the accessory when the\r
-                                                                       *   Android device is switched into Open Accessory mode. */\r
+                                       char*    PropertyStrings[AOA_STRING_TOTAL_STRINGS]; /**< Android Accessory property strings, sent to identify the accessory when the\r
+                                                                                            *   Android device is switched into Open Accessory mode. */\r
                                } Config; /**< Config data for the USB class interface within the device. All elements in this section\r
                                           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.\r
                                           */\r
@@ -111,9 +100,6 @@
                                                        *   Configured state.\r
                                                        */\r
                                        uint8_t  InterfaceNumber; /**< Interface index of the AOA interface within the attached device. */\r
-\r
-                                       uint16_t DataINPipeSize; /**< Size in bytes of the AOA interface's IN data pipe. */\r
-                                       uint16_t DataOUTPipeSize;  /**< Size in bytes of the AOA interface's OUT data pipe. */\r
                                } State; /**< State data for the USB class interface within the device. All elements in this section\r
                                                  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when\r
                                                  *   the interface is enumerated.\r
@@ -271,7 +257,7 @@
                         *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own\r
                         *  line buffering.\r
                         *\r
-                        *  \note The created stream can be given as stdout if desired to direct the standard output from all \c <stdio.h> functions\r
+                        *  \note The created stream can be given as \c stdout if desired to direct the standard output from all \c <stdio.h> functions\r
                         *        to the given AOA interface.\r
                         *        \n\n\r
                         *\r