Add checks to the endpoint and pipe configure functions and fail if the requested...

[pub/USBasp.git] / Demos / Host / ClassDriver / AndroidAccessoryHost / AndroidAccessoryHost.c

diff --git a/Demos/Host/ClassDriver/AndroidAccessoryHost/AndroidAccessoryHost.c b/Demos/Host/ClassDriver/AndroidAccessoryHost/AndroidAccessoryHost.c
index 7ee1b03..4c53cc2 100644 (file)
--- a/Demos/Host/ClassDriver/AndroidAccessoryHost/AndroidAccessoryHost.c
+++ b/Demos/Host/ClassDriver/AndroidAccessoryHost/AndroidAccessoryHost.c
@@ -7,7 +7,7 @@
 */\r
 \r
 /*\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
 \r
   Permission to use, copy, modify, distribute, and sell this\r
   software and its documentation for any purpose is hereby granted\r


@@ -44,20 +44,24 @@ USB_ClassInfo_AOA_Host_t AndroidDevice_AOA_Interface =
        {\r
                .Config =\r
                        {\r
        {\r
                .Config =\r
                        {\r

-                               .DataINPipeNumber           = 1,\r
-                               .DataINPipeDoubleBank       = false,\r
-\r
-                               .DataOUTPipeNumber          = 2,\r
-                               .DataOUTPipeDoubleBank      = false,\r
-                               \r
+                               .DataINPipe             =\r
+                                       {\r
+                                               .Address        = (PIPE_DIR_IN  | 1),\r
+                                               .Banks          = 1,\r
+                                       },\r
+                               .DataOUTPipe            =\r
+                                       {\r
+                                               .Address        = (PIPE_DIR_OUT | 2),\r
+                                               .Banks          = 1,\r
+                                       },                              \r

                                .PropertyStrings =\r
                                        {\r
                                .PropertyStrings =\r
                                        {\r

-                                               .Manufacturer       = "Dean Camera",\r
-                                               .Model              = "LUFA Android Demo",\r
-                                               .Description        = "LUFA Android Demo",\r
-                                               .Version            = "1.0",\r
-                                               .URI                = "http://www.lufa-lib.org",\r
-                                               .Serial             = "0000000012345678",\r
+                                               [AOA_STRING_Manufacturer] = "Dean Camera",\r
+                                               [AOA_STRING_Model]        = "LUFA Android Demo",\r
+                                               [AOA_STRING_Description]  = "LUFA Android Demo",\r
+                                               [AOA_STRING_Version]      = "1.0",\r
+                                               [AOA_STRING_URI]          = "http://www.lufa-lib.org",\r
+                                               [AOA_STRING_Serial]       = "0000000012345678",\r

                                        },\r
                        },\r
        };\r
                                        },\r
                        },\r
        };\r