diff --git a/Doxyfile b/Doxyfile index cc11cf0d..7cdc79b6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.3.1 +# Doxyfile 1.8.4 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -70,9 +70,9 @@ CREATE_SUBDIRS = NO # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian, +# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, +# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English @@ -262,10 +262,10 @@ EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES -# When enabled doxygen tries to link words that correspond to documented classes, -# or namespaces to their corresponding documentation. Such a link can be -# prevented in individual cases by by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. AUTOLINK_SUPPORT = YES @@ -321,11 +321,11 @@ SUBGROUPING = YES INLINE_GROUPED_CLASSES = NO # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields will be shown inline in the documentation -# of the scope in which they are defined (i.e. file, namespace, or group -# documentation), provided this scope is documented. If set to NO (the default), -# structs, classes, and unions are shown on a separate page (for HTML and Man -# pages) or section (for LaTeX and RTF). +# unions with only public data fields or simple typedef fields will be shown +# inline in the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO (the default), structs, classes, and unions are shown on a separate +# page (for HTML and Man pages) or section (for LaTeX and RTF). INLINE_SIMPLE_STRUCTS = NO @@ -339,30 +339,14 @@ INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. - -SYMBOL_CACHE_SIZE = 0 - -# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be -# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given -# their name and scope. Since this can be an expensive process and often the -# same symbol appear multiple times in the code, doxygen keeps a cache of -# pre-resolved symbols. If the cache is too small doxygen will become slower. -# If the cache is too large, memory is wasted. The cache size is given by this -# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can +# be an expensive process and often the same symbol appear multiple times in +# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too +# small doxygen will become slower. If the cache is too large, memory is wasted. +# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid +# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536 +# symbols. LOOKUP_CACHE_SIZE = 0 @@ -373,7 +357,7 @@ LOOKUP_CACHE_SIZE = 0 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in # documentation are documented, even if no documentation was available. # Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES @@ -797,8 +781,10 @@ IMAGE_PATH = # by executing (via popen()) the command , where # is the value of the INPUT_FILTER tag, and is the name of an # input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. +# to standard output. If FILTER_PATTERNS is specified, this tag will be ignored. +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. INPUT_FILTER = @@ -826,9 +812,9 @@ FILTER_SOURCE_FILES = NO FILTER_SOURCE_PATTERNS = # If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page (index.html). -# This can be useful if you have a project on for instance GitHub and want reuse -# the introduction page also for the doxygen output. +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want reuse the introduction page also for the doxygen output. USE_MDFILE_AS_MAINPAGE = README.md @@ -887,6 +873,20 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES +# If CLANG_ASSISTED_PARSING is set to YES, then doxygen will use the clang parser +# for more acurate parsing at the cost of reduced performance. This can be +# particularly helpful with template rich C++ code for which doxygen's built-in +# parser lacks the necessairy type information. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified at INPUT and INCLUDE_PATH. + +CLANG_OPTIONS = + #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -972,7 +972,7 @@ HTML_EXTRA_STYLESHEET = imageStyle.css # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the -# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these # files. In the HTML_STYLESHEET file, use the file name only. Also note that # the files will be copied as-is; there are no commands or markers available. @@ -1241,7 +1241,7 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = NO # When MathJax is enabled you can set the default output format to be used for -# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and +# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and # SVG. The default value is HTML-CSS, which is slower, but has the best # compatibility. @@ -1263,6 +1263,11 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest MATHJAX_EXTENSIONS = +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript +# pieces of code that will be used on startup of the MathJax code. + +MATHJAX_CODEFILE = + # When the SEARCHENGINE tag is enabled doxygen will generate a search box # for the HTML output. The underlying search engine uses javascript # and DHTML and should work on any modern browser. Note that when using @@ -1288,8 +1293,8 @@ SERVER_BASED_SEARCH = NO # which needs to be processed by an external indexer. Doxygen will invoke an # external search engine pointed to by the SEARCHENGINE_URL option to obtain # the search results. Doxygen ships with an example indexer (doxyindexer) and -# search engine (doxysearch.cgi) which are based on the open source search engine -# library Xapian. See the manual for configuration details. +# search engine (doxysearch.cgi) which are based on the open source search +# engine library Xapian. See the manual for configuration details. EXTERNAL_SEARCH = NO @@ -1360,7 +1365,7 @@ COMPACT_LATEX = NO # The PAPER_TYPE tag can be used to set the paper type that is used # by the printer. Possible values are: a4, letter, legal and -# executive. If left blank a4wide will be used. +# executive. If left blank a4 will be used. PAPER_TYPE = a4 @@ -1383,6 +1388,13 @@ LATEX_HEADER = LATEX_FOOTER = +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images +# or other source files which should be copied to the LaTeX output directory. +# Note that the files will be copied as-is; there are no commands or markers +# available. + +LATEX_EXTRA_FILES = + # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will # contain links (just like the HTML output) instead of page references @@ -1527,6 +1539,21 @@ XML_DTD = XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files +# that can be used to generate PDF. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. If left blank docbook will be used as the default path. + +DOCBOOK_OUTPUT = docbook + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- @@ -1675,6 +1702,12 @@ ALLEXTERNALS = NO EXTERNAL_GROUPS = YES +# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed +# in the related pages index. If set to NO, only the current project's +# pages will be listed. + +EXTERNAL_PAGES = YES + # The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). @@ -1771,7 +1804,7 @@ UML_LOOK = NO # the class node. If there are many fields or methods and many nodes the # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS # threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# manageable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 diff --git a/_b_t_d_8cpp_source.html b/_b_t_d_8cpp_source.html index b6a74956..7c23735f 100644 --- a/_b_t_d_8cpp_source.html +++ b/_b_t_d_8cpp_source.html @@ -145,12 +145,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
54  // get memory address of USB device address pool
55  AddressPool &addrPool = pUsb->GetAddressPool();
56 #ifdef EXTRADEBUG
-
57  Notify(PSTR("\r\nBTD Init"), 0x80);
+
57  Notify(PSTR("\r\nBTD Init"), 0x80);
58 #endif
59  // check if address has already been assigned to an instance
60  if (bAddress) {
61 #ifdef DEBUG_USB_HOST
-
62  Notify(PSTR("\r\nAddress in use"), 0x80);
+
62  Notify(PSTR("\r\nAddress in use"), 0x80);
63 #endif
64  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
65  }
@@ -160,14 +160,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
69 
70  if (!p) {
71 #ifdef DEBUG_USB_HOST
-
72  Notify(PSTR("\r\nAddress not found"), 0x80);
+
72  Notify(PSTR("\r\nAddress not found"), 0x80);
73 #endif
74  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
75  }
76 
77  if (!p->epinfo) {
78 #ifdef DEBUG_USB_HOST
-
79  Notify(PSTR("\r\nepinfo is null"), 0x80);
+
79  Notify(PSTR("\r\nepinfo is null"), 0x80);
80 #endif
81  return USB_ERROR_EPINFO_IS_NULL;
82  }
@@ -205,14 +205,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
114  addrPool.FreeAddress(bAddress);
115  bAddress = 0;
116 #ifdef DEBUG_USB_HOST
-
117  Notify(PSTR("\r\nsetAddr: "), 0x80);
+
117  Notify(PSTR("\r\nsetAddr: "), 0x80);
118 #endif
-
119  PrintHex<uint8_t > (rcode, 0x80);
+
119  D_PrintHex<uint8_t > (rcode, 0x80);
120  return rcode;
121  }
122 #ifdef EXTRADEBUG
-
123  Notify(PSTR("\r\nAddr: "), 0x80);
-
124  PrintHex<uint8_t > (bAddress, 0x80);
+
123  Notify(PSTR("\r\nAddr: "), 0x80);
+
124  D_PrintHex<uint8_t > (bAddress, 0x80);
125 #endif
126  p->lowspeed = false;
127 
@@ -239,16 +239,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
148 #ifdef DEBUG_USB_HOST
149  if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
150  if (PID == PS3_PID)
-
151  Notify(PSTR("\r\nDualshock 3 Controller Connected"), 0x80);
+
151  Notify(PSTR("\r\nDualshock 3 Controller Connected"), 0x80);
152  else // It must be a navigation controller
-
153  Notify(PSTR("\r\nNavigation Controller Connected"), 0x80);
+
153  Notify(PSTR("\r\nNavigation Controller Connected"), 0x80);
154  } else // It must be a Motion controller
-
155  Notify(PSTR("\r\nMotion Controller Connected"), 0x80);
+
155  Notify(PSTR("\r\nMotion Controller Connected"), 0x80);
156 #endif
157 
158  if (my_bdaddr[0] == 0x00 && my_bdaddr[1] == 0x00 && my_bdaddr[2] == 0x00 && my_bdaddr[3] == 0x00 && my_bdaddr[4] == 0x00 && my_bdaddr[5] == 0x00) {
159 #ifdef DEBUG_USB_HOST
-
160  Notify(PSTR("\r\nPlease plug in the dongle before trying to pair with the PS3 Controller\n\rOr set the Bluetooth address in the constructor of the PS3BT class"), 0x80);
+
160  Notify(PSTR("\r\nPlease plug in the dongle before trying to pair with the PS3 Controller\n\rOr set the Bluetooth address in the constructor of the PS3BT class"), 0x80);
161 #endif
162  } else {
163  if (PID == PS3_PID || PID == PS3NAVIGATION_PID)
@@ -256,12 +256,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
165  else
166  setMoveBdaddr(my_bdaddr); // Set internal Bluetooth address
167 #ifdef DEBUG_USB_HOST
-
168  Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
+
168  Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
169  for (int8_t i = 5; i > 0; i--) {
-
170  PrintHex<uint8_t > (my_bdaddr[i], 0x80);
-
171  Notify(PSTR(":"), 0x80);
+
170  D_PrintHex<uint8_t > (my_bdaddr[i], 0x80);
+
171  Notify(PSTR(":"), 0x80);
172  }
-
173  PrintHex<uint8_t > (my_bdaddr[0], 0x80);
+
173  D_PrintHex<uint8_t > (my_bdaddr[0], 0x80);
174 #endif
175  }
176 
@@ -306,7 +306,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
215  bPollEnable = true;
216 
217 #ifdef DEBUG_USB_HOST
-
218  Notify(PSTR("\r\nBluetooth Dongle Initialized"), 0x80);
+
218  Notify(PSTR("\r\nBluetooth Dongle Initialized"), 0x80);
219 #endif
220  }
221  return 0; // Successful configuration
@@ -314,38 +314,38 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
223  /* diagnostic messages */
224 FailGetDevDescr:
225 #ifdef DEBUG_USB_HOST
-
226  NotifyFailGetDevDescr();
+
226  NotifyFailGetDevDescr();
227  goto Fail;
228 #endif
229 
230 FailSetDevTblEntry:
231 #ifdef DEBUG_USB_HOST
-
232  NotifyFailSetDevTblEntry();
+
232  NotifyFailSetDevTblEntry();
233  goto Fail;
234 #endif
235 
236 FailGetConfDescr:
237 #ifdef DEBUG_USB_HOST
-
238  NotifyFailGetConfDescr();
+
238  NotifyFailGetConfDescr();
239  goto Fail;
240 #endif
241 
242 FailSetConfDescr:
243 #ifdef DEBUG_USB_HOST
-
244  NotifyFailSetConfDescr();
+
244  NotifyFailSetConfDescr();
245 #endif
246  goto Fail;
247 
248 FailUnknownDevice:
249 #ifdef DEBUG_USB_HOST
-
250  NotifyFailUnknownDevice(VID, PID);
+
250  NotifyFailUnknownDevice(VID, PID);
251 #endif
252  pUsb->setAddr(bAddress, 0, 0); // Reset address
253  rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
254 Fail:
255 #ifdef DEBUG_USB_HOST
-
256  Notify(PSTR("\r\nBTD Init Failed, error code: "), 0x80);
-
257  NotifyFail(rcode);
+
256  Notify(PSTR("\r\nBTD Init Failed, error code: "), 0x80);
+
257  NotifyFail(rcode);
258 #endif
259  Release();
260  return rcode;
@@ -386,19 +386,19 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
295 
296 void BTD::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
297 #ifdef EXTRADEBUG
-
298  Notify(PSTR("\r\nEndpoint descriptor:"), 0x80);
-
299  Notify(PSTR("\r\nLength:\t\t"), 0x80);
-
300  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
-
301  Notify(PSTR("\r\nType:\t\t"), 0x80);
-
302  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
-
303  Notify(PSTR("\r\nAddress:\t"), 0x80);
-
304  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
-
305  Notify(PSTR("\r\nAttributes:\t"), 0x80);
-
306  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
-
307  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
-
308  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
-
309  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
-
310  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
+
298  Notify(PSTR("\r\nEndpoint descriptor:"), 0x80);
+
299  Notify(PSTR("\r\nLength:\t\t"), 0x80);
+
300  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
+
301  Notify(PSTR("\r\nType:\t\t"), 0x80);
+
302  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
+
303  Notify(PSTR("\r\nAddress:\t"), 0x80);
+
304  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
+
305  Notify(PSTR("\r\nAttributes:\t"), 0x80);
+
306  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
+
307  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
+
308  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
+
309  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
+
310  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
311 #endif
312 }
313 
@@ -452,12 +452,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
361  case EV_COMMAND_STATUS:
362  if (hcibuf[2]) { // show status on serial if not OK
363 #ifdef DEBUG_USB_HOST
-
364  Notify(PSTR("\r\nHCI Command Failed: "), 0x80);
-
365  PrintHex<uint8_t > (hcibuf[2], 0x80);
-
366  Notify(PSTR(" "), 0x80);
-
367  PrintHex<uint8_t > (hcibuf[4], 0x80);
-
368  Notify(PSTR(" "), 0x80);
-
369  PrintHex<uint8_t > (hcibuf[5], 0x80);
+
364  Notify(PSTR("\r\nHCI Command Failed: "), 0x80);
+
365  D_PrintHex<uint8_t > (hcibuf[2], 0x80);
+
366  Notify(PSTR(" "), 0x80);
+
367  D_PrintHex<uint8_t > (hcibuf[4], 0x80);
+
368  Notify(PSTR(" "), 0x80);
+
369  D_PrintHex<uint8_t > (hcibuf[5], 0x80);
370 #endif
371  }
372  break;
@@ -466,7 +466,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
375  if (inquiry_counter >= 5) {
376  inquiry_counter = 0;
377 #ifdef DEBUG_USB_HOST
-
378  Notify(PSTR("\r\nCouldn't find Wiimote"), 0x80);
+
378  Notify(PSTR("\r\nCouldn't find Wiimote"), 0x80);
379 #endif
380  connectToWii = false;
381  pairWithWii = false;
@@ -478,8 +478,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
387  case EV_INQUIRY_RESULT:
388  if (hcibuf[2]) { // Check that there is more than zero responses
389 #ifdef EXTRADEBUG
-
390  Notify(PSTR("\r\nNumber of responses: "), 0x80);
-
391  Notify(hcibuf[2], 0x80);
+
390  Notify(PSTR("\r\nNumber of responses: "), 0x80);
+
391  Notify(hcibuf[2], 0x80);
392 #endif
393  for (uint8_t i = 0; i < hcibuf[2]; i++) {
394  if ((hcibuf[4 + 8 * hcibuf[2] + 3 * i] == 0x04 && hcibuf[5 + 8 * hcibuf[2] + 3 * i] == 0x25 && hcibuf[6 + 8 * hcibuf[2] + 3 * i] == 0x00) || (hcibuf[4 + 8 * hcibuf[2] + 3 * i] == 0x08 && hcibuf[5 + 8 * hcibuf[2] + 3 * i] == 0x05 && hcibuf[6 + 8 * hcibuf[2] + 3 * i] == 0x00)) { // See http://bluetooth-pentest.narod.ru/software/bluetooth_class_of_device-service_generator.html and http://wiibrew.org/wiki/Wiimote#SDP_information
@@ -498,12 +498,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
407  }
408 #ifdef EXTRADEBUG
409  else {
-
410  Notify(PSTR("\r\nClass of device: "), 0x80);
-
411  PrintHex<uint8_t > (hcibuf[6 + 8 * hcibuf[2] + 3 * i], 0x80);
-
412  Notify(PSTR(" "), 0x80);
-
413  PrintHex<uint8_t > (hcibuf[5 + 8 * hcibuf[2] + 3 * i], 0x80);
-
414  Notify(PSTR(" "), 0x80);
-
415  PrintHex<uint8_t > (hcibuf[4 + 8 * hcibuf[2] + 3 * i], 0x80);
+
410  Notify(PSTR("\r\nClass of device: "), 0x80);
+
411  D_PrintHex<uint8_t > (hcibuf[6 + 8 * hcibuf[2] + 3 * i], 0x80);
+
412  Notify(PSTR(" "), 0x80);
+
413  D_PrintHex<uint8_t > (hcibuf[5 + 8 * hcibuf[2] + 3 * i], 0x80);
+
414  Notify(PSTR(" "), 0x80);
+
415  D_PrintHex<uint8_t > (hcibuf[4 + 8 * hcibuf[2] + 3 * i], 0x80);
416  }
417 #endif
418  }
@@ -518,7 +518,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
427  }
428 #ifdef EXTRADEBUG
429  else {
-
430  Notify(PSTR("\r\nConnection Failed"), 0x80);
+
430  Notify(PSTR("\r\nConnection Failed"), 0x80);
431  hci_state = HCI_CHECK_WII_SERVICE;
432  }
433 #endif
@@ -547,12 +547,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
456  disc_bdaddr[4] = hcibuf[6];
457  disc_bdaddr[5] = hcibuf[7];
458 #ifdef EXTRADEBUG
-
459  Notify(PSTR("\r\nClass of device: "), 0x80);
-
460  PrintHex<uint8_t > (hcibuf[10], 0x80);
-
461  Notify(PSTR(" "), 0x80);
-
462  PrintHex<uint8_t > (hcibuf[9], 0x80);
-
463  Notify(PSTR(" "), 0x80);
-
464  PrintHex<uint8_t > (hcibuf[8], 0x80);
+
459  Notify(PSTR("\r\nClass of device: "), 0x80);
+
460  D_PrintHex<uint8_t > (hcibuf[10], 0x80);
+
461  Notify(PSTR(" "), 0x80);
+
462  D_PrintHex<uint8_t > (hcibuf[9], 0x80);
+
463  Notify(PSTR(" "), 0x80);
+
464  D_PrintHex<uint8_t > (hcibuf[8], 0x80);
465 #endif
466  hci_event_flag |= HCI_FLAG_INCOMING_REQUEST;
467  break;
@@ -560,18 +560,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
469  case EV_PIN_CODE_REQUEST:
470  if (pairWithWii) {
471 #ifdef DEBUG_USB_HOST
-
472  Notify(PSTR("\r\nPairing with wiimote"), 0x80);
+
472  Notify(PSTR("\r\nPairing with wiimote"), 0x80);
473 #endif
474  hci_pin_code_request_reply();
475  } else if (btdPin != NULL) {
476 #ifdef DEBUG_USB_HOST
-
477  Notify(PSTR("\r\nBluetooth pin is set too: "), 0x80);
-
478  NotifyStr(btdPin, 0x80);
+
477  Notify(PSTR("\r\nBluetooth pin is set too: "), 0x80);
+
478  NotifyStr(btdPin, 0x80);
479 #endif
480  hci_pin_code_request_reply();
481  } else {
482 #ifdef DEBUG_USB_HOST
-
483  Notify(PSTR("\r\nNo pin was set"), 0x80);
+
483  Notify(PSTR("\r\nNo pin was set"), 0x80);
484 #endif
485  hci_pin_code_negative_request_reply();
486  }
@@ -579,7 +579,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
488 
489  case EV_LINK_KEY_REQUEST:
490 #ifdef DEBUG_USB_HOST
-
491  Notify(PSTR("\r\nReceived Key Request"), 0x80);
+
491  Notify(PSTR("\r\nReceived Key Request"), 0x80);
492 #endif
493  hci_link_key_request_negative_reply();
494  break;
@@ -587,7 +587,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
496  case EV_AUTHENTICATION_COMPLETE:
497  if (pairWithWii && !connectToWii) {
498 #ifdef DEBUG_USB_HOST
-
499  Notify(PSTR("\r\nPairing successful"), 0x80);
+
499  Notify(PSTR("\r\nPairing successful"), 0x80);
500 #endif
501  connectToWii = true; // Only send the ACL data to the Wii service
502  }
@@ -608,8 +608,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
517 #ifdef EXTRADEBUG
518  default:
519  if (hcibuf[0] != 0x00) {
-
520  Notify(PSTR("\r\nUnmanaged HCI Event: "), 0x80);
-
521  PrintHex<uint8_t > (hcibuf[0], 0x80);
+
520  Notify(PSTR("\r\nUnmanaged HCI Event: "), 0x80);
+
521  D_PrintHex<uint8_t > (hcibuf[0], 0x80);
522  }
523  break;
524 #endif
@@ -617,8 +617,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
526  }
527 #ifdef EXTRADEBUG
528  else if (rcode != hrNAK) {
-
529  Notify(PSTR("\r\nHCI event error: "), 0x80);
-
530  PrintHex<uint8_t > (rcode, 0x80);
+
529  Notify(PSTR("\r\nHCI event error: "), 0x80);
+
530  D_PrintHex<uint8_t > (rcode, 0x80);
531  }
532 #endif
533  HCI_task();
@@ -641,7 +641,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
550  if (hci_cmd_complete) {
551  hci_counter = 0;
552 #ifdef DEBUG_USB_HOST
-
553  Notify(PSTR("\r\nHCI Reset complete"), 0x80);
+
553  Notify(PSTR("\r\nHCI Reset complete"), 0x80);
554 #endif
555  hci_state = HCI_CLASS_STATE;
556  hci_write_class_of_device();
@@ -650,7 +650,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
559  if (hci_num_reset_loops > 2000)
560  hci_num_reset_loops = 2000;
561 #ifdef DEBUG_USB_HOST
-
562  Notify(PSTR("\r\nNo response to HCI Reset"), 0x80);
+
562  Notify(PSTR("\r\nNo response to HCI Reset"), 0x80);
563 #endif
564  hci_state = HCI_INIT_STATE;
565  hci_counter = 0;
@@ -660,7 +660,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
569  case HCI_CLASS_STATE:
570  if (hci_cmd_complete) {
571 #ifdef DEBUG_USB_HOST
-
572  Notify(PSTR("\r\nWrite class of device"), 0x80);
+
572  Notify(PSTR("\r\nWrite class of device"), 0x80);
573 #endif
574  hci_state = HCI_BDADDR_STATE;
575  hci_read_bdaddr();
@@ -670,12 +670,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
579  case HCI_BDADDR_STATE:
580  if (hci_read_bdaddr_complete) {
581 #ifdef DEBUG_USB_HOST
-
582  Notify(PSTR("\r\nLocal Bluetooth Address: "), 0x80);
+
582  Notify(PSTR("\r\nLocal Bluetooth Address: "), 0x80);
583  for (int8_t i = 5; i > 0; i--) {
-
584  PrintHex<uint8_t > (my_bdaddr[i], 0x80);
-
585  Notify(PSTR(":"), 0x80);
+
584  D_PrintHex<uint8_t > (my_bdaddr[i], 0x80);
+
585  Notify(PSTR(":"), 0x80);
586  }
-
587  PrintHex<uint8_t > (my_bdaddr[0], 0x80);
+
587  D_PrintHex<uint8_t > (my_bdaddr[0], 0x80);
588 #endif
589  hci_read_local_version_information();
590  hci_state = HCI_LOCAL_VERSION_STATE;
@@ -695,8 +695,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
604  case HCI_SET_NAME_STATE:
605  if (hci_cmd_complete) {
606 #ifdef DEBUG_USB_HOST
-
607  Notify(PSTR("\r\nThe name is set to: "), 0x80);
-
608  NotifyStr(btdName, 0x80);
+
607  Notify(PSTR("\r\nThe name is set to: "), 0x80);
+
608  NotifyStr(btdName, 0x80);
609 #endif
610  hci_state = HCI_CHECK_WII_SERVICE;
611  }
@@ -705,7 +705,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
614  case HCI_CHECK_WII_SERVICE:
615  if (pairWithWii) { // Check if it should try to connect to a wiimote
616 #ifdef DEBUG_USB_HOST
-
617  Notify(PSTR("\r\nStarting inquiry\r\nPress 1 & 2 on the Wiimote\r\nOr press sync if you are using a Wii U Pro Controller"), 0x80);
+
617  Notify(PSTR("\r\nStarting inquiry\r\nPress 1 & 2 on the Wiimote\r\nOr press sync if you are using a Wii U Pro Controller"), 0x80);
618 #endif
619  hci_inquiry();
620  hci_state = HCI_INQUIRY_STATE;
@@ -717,10 +717,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
626  if (hci_wii_found) {
627  hci_inquiry_cancel(); // Stop inquiry
628 #ifdef DEBUG_USB_HOST
-
629  Notify(PSTR("\r\nWiimote found"), 0x80);
-
630  Notify(PSTR("\r\nNow just create the instance like so:"), 0x80);
-
631  Notify(PSTR("\r\nWII Wii(&Btd);"), 0x80);
-
632  Notify(PSTR("\r\nAnd then press any button on the Wiimote"), 0x80);
+
629  Notify(PSTR("\r\nWiimote found"), 0x80);
+
630  Notify(PSTR("\r\nNow just create the instance like so:"), 0x80);
+
631  Notify(PSTR("\r\nWII Wii(&Btd);"), 0x80);
+
632  Notify(PSTR("\r\nAnd then press any button on the Wiimote"), 0x80);
633 #endif
634  if (motionPlusInside) {
635  hci_remote_name(); // We need to know the name to distinguish between a Wiimote and a Wii U Pro Controller
@@ -733,7 +733,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
642  case HCI_CONNECT_WII_STATE:
643  if (hci_cmd_complete) {
644 #ifdef DEBUG_USB_HOST
-
645  Notify(PSTR("\r\nConnecting to Wiimote"), 0x80);
+
645  Notify(PSTR("\r\nConnecting to Wiimote"), 0x80);
646 #endif
647  hci_connect();
648  hci_state = HCI_CONNECTED_WII_STATE;
@@ -744,13 +744,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
653  if (hci_connect_event) {
654  if (hci_connect_complete) {
655 #ifdef DEBUG_USB_HOST
-
656  Notify(PSTR("\r\nConnected to Wiimote"), 0x80);
+
656  Notify(PSTR("\r\nConnected to Wiimote"), 0x80);
657 #endif
658  hci_authentication_request(); // This will start the pairing with the wiimote
659  hci_state = HCI_SCANNING_STATE;
660  } else {
661 #ifdef DEBUG_USB_HOST
-
662  Notify(PSTR("\r\nTrying to connect one more time..."), 0x80);
+
662  Notify(PSTR("\r\nTrying to connect one more time..."), 0x80);
663 #endif
664  hci_connect(); // Try to connect one more time
665  }
@@ -760,7 +760,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
669  case HCI_SCANNING_STATE:
670  if (!connectToWii && !pairWithWii) {
671 #ifdef DEBUG_USB_HOST
-
672  Notify(PSTR("\r\nWait For Incoming Connection Request"), 0x80);
+
672  Notify(PSTR("\r\nWait For Incoming Connection Request"), 0x80);
673 #endif
674  hci_write_scan_enable();
675  watingForConnection = true;
@@ -772,7 +772,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
681  if (hci_incoming_connect_request) {
682  watingForConnection = false;
683 #ifdef DEBUG_USB_HOST
-
684  Notify(PSTR("\r\nIncoming Connection Request"), 0x80);
+
684  Notify(PSTR("\r\nIncoming Connection Request"), 0x80);
685 #endif
686  hci_remote_name();
687  hci_state = HCI_REMOTE_NAME_STATE;
@@ -783,26 +783,26 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
692  case HCI_REMOTE_NAME_STATE:
693  if (hci_remote_name_complete) {
694 #ifdef DEBUG_USB_HOST
-
695  Notify(PSTR("\r\nRemote Name: "), 0x80);
+
695  Notify(PSTR("\r\nRemote Name: "), 0x80);
696  for (uint8_t i = 0; i < 30; i++) {
697  if (remote_name[i] == NULL)
698  break;
-
699  Notifyc(remote_name[i], 0x80);
+
699  Notifyc(remote_name[i], 0x80);
700  }
701 #endif
702  if (strncmp((const char*)remote_name, "Nintendo", 8) == 0) {
703  incomingWii = true;
704 #ifdef DEBUG_USB_HOST
-
705  Notify(PSTR("\r\nWiimote is connecting"), 0x80);
+
705  Notify(PSTR("\r\nWiimote is connecting"), 0x80);
706 #endif
707  if (strncmp((const char*)remote_name, "Nintendo RVL-CNT-01-TR", 22) == 0) {
708 #ifdef DEBUG_USB_HOST
-
709  Notify(PSTR(" with Motion Plus Inside"), 0x80);
+
709  Notify(PSTR(" with Motion Plus Inside"), 0x80);
710 #endif
711  motionPlusInside = true;
712  } else if (strncmp((const char*)remote_name, "Nintendo RVL-CNT-01-UC", 22) == 0) {
713 #ifdef DEBUG_USB_HOST
-
714  Notify(PSTR(" - Wii U Pro Controller"), 0x80);
+
714  Notify(PSTR(" - Wii U Pro Controller"), 0x80);
715 #endif
716  motionPlusInside = true;
717  wiiUProController = true;
@@ -823,12 +823,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
732  case HCI_CONNECTED_STATE:
733  if (hci_connect_complete) {
734 #ifdef DEBUG_USB_HOST
-
735  Notify(PSTR("\r\nConnected to Device: "), 0x80);
+
735  Notify(PSTR("\r\nConnected to Device: "), 0x80);
736  for (int8_t i = 5; i > 0; i--) {
-
737  PrintHex<uint8_t > (disc_bdaddr[i], 0x80);
-
738  Notify(PSTR(":"), 0x80);
+
737  D_PrintHex<uint8_t > (disc_bdaddr[i], 0x80);
+
738  Notify(PSTR(":"), 0x80);
739  }
-
740  PrintHex<uint8_t > (disc_bdaddr[0], 0x80);
+
740  D_PrintHex<uint8_t > (disc_bdaddr[0], 0x80);
741 #endif
742  // Clear these flags for a new connection
743  l2capConnectionClaimed = false;
@@ -851,7 +851,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
760  case HCI_DISCONNECT_STATE:
761  if (hci_disconnect_complete) {
762 #ifdef DEBUG_USB_HOST
-
763  Notify(PSTR("\r\nHCI Disconnected from Device"), 0x80);
+
763  Notify(PSTR("\r\nHCI Disconnected from Device"), 0x80);
764 #endif
765  hci_event_flag = 0; // Clear all flags
766 
@@ -879,8 +879,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
788  }
789 #ifdef EXTRADEBUG
790  else if (rcode != hrNAK) {
-
791  Notify(PSTR("\r\nACL data in error: "), 0x80);
-
792  PrintHex<uint8_t > (rcode, 0x80);
+
791  Notify(PSTR("\r\nACL data in error: "), 0x80);
+
792  D_PrintHex<uint8_t > (rcode, 0x80);
793  }
794 #endif
795  for (uint8_t i = 0; i < BTD_NUMSERVICES; i++)
@@ -1049,7 +1049,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
958  hcibuf[9] = 6; // Pin length is the length of the Bluetooth address
959  if (wiiUProController) {
960 #ifdef DEBUG_USB_HOST
-
961  Notify(PSTR("\r\nParing with Wii U Pro Controller"), 0x80);
+
961  Notify(PSTR("\r\nParing with Wii U Pro Controller"), 0x80);
962 #endif
963  for (uint8_t i = 0; i < 6; i++)
964  hcibuf[10 + i] = my_bdaddr[i]; // The pin is the Bluetooth dongles Bluetooth address backwards
@@ -1175,12 +1175,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
1084  if (rcode) {
1085  delay(100); // This small delay prevents it from overflowing if it fails
1086 #ifdef DEBUG_USB_HOST
-
1087  Notify(PSTR("\r\nError sending L2CAP message: 0x"), 0x80);
-
1088  PrintHex<uint8_t > (rcode, 0x80);
-
1089  Notify(PSTR(" - Channel ID: "), 0x80);
-
1090  PrintHex<uint8_t > (channelHigh, 0x80);
-
1091  Notify(PSTR(" "), 0x80);
-
1092  PrintHex<uint8_t > (channelLow, 0x80);
+
1087  Notify(PSTR("\r\nError sending L2CAP message: 0x"), 0x80);
+
1088  D_PrintHex<uint8_t > (rcode, 0x80);
+
1089  Notify(PSTR(" - Channel ID: "), 0x80);
+
1090  D_PrintHex<uint8_t > (channelHigh, 0x80);
+
1091  Notify(PSTR(" "), 0x80);
+
1092  D_PrintHex<uint8_t > (channelLow, 0x80);
1093 #endif
1094  }
1095 }
diff --git a/_p_s3_b_t_8cpp_source.html b/_p_s3_b_t_8cpp_source.html index b6239ae1..c9cd3925 100644 --- a/_p_s3_b_t_8cpp_source.html +++ b/_p_s3_b_t_8cpp_source.html @@ -346,11 +346,11 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
255  l2cap_state = L2CAP_WAIT;
256  for (uint8_t i = 0; i < 30; i++)
257  remote_name[i] = pBtd->remote_name[i]; // Store the remote name for the connection
-
258 #ifdef DEBUG_USB_HOST
+
258 #ifdef DEBUG_USB_HOST
259  if (pBtd->hci_version < 3) { // Check the HCI Version of the Bluetooth dongle
-
260  Notify(PSTR("\r\nYour dongle may not support reading the analog buttons, sensors and status\r\nYour HCI Version is: "), 0x80);
-
261  Notify(pBtd->hci_version, 0x80);
-
262  Notify(PSTR("\r\nBut should be at least 3\r\nThis means that it doesn't support Bluetooth Version 2.0+EDR"), 0x80);
+
260  Notify(PSTR("\r\nYour dongle may not support reading the analog buttons, sensors and status\r\nYour HCI Version is: "), 0x80);
+
261  Notify(pBtd->hci_version, 0x80);
+
262  Notify(PSTR("\r\nBut should be at least 3\r\nThis means that it doesn't support Bluetooth Version 2.0+EDR"), 0x80);
263  }
264 #endif
265  }
@@ -362,31 +362,31 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
271  if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
272  if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
273 #ifdef DEBUG_USB_HOST
-
274  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
-
275  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
276  Notify(PSTR(" "), 0x80);
-
277  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
278  Notify(PSTR(" Data: "), 0x80);
-
279  PrintHex<uint8_t > (l2capinbuf[17], 0x80);
-
280  Notify(PSTR(" "), 0x80);
-
281  PrintHex<uint8_t > (l2capinbuf[16], 0x80);
-
282  Notify(PSTR(" "), 0x80);
-
283  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
284  Notify(PSTR(" "), 0x80);
-
285  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
274  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
+
275  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
276  Notify(PSTR(" "), 0x80);
+
277  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
278  Notify(PSTR(" Data: "), 0x80);
+
279  D_PrintHex<uint8_t > (l2capinbuf[17], 0x80);
+
280  Notify(PSTR(" "), 0x80);
+
281  D_PrintHex<uint8_t > (l2capinbuf[16], 0x80);
+
282  Notify(PSTR(" "), 0x80);
+
283  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
284  Notify(PSTR(" "), 0x80);
+
285  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
286 #endif
287  } else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
288 #ifdef EXTRADEBUG
-
289  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
-
290  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
291  Notify(PSTR(" "), 0x80);
-
292  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
293  Notify(PSTR(" SCID: "), 0x80);
-
294  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
295  Notify(PSTR(" "), 0x80);
-
296  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
-
297  Notify(PSTR(" Identifier: "), 0x80);
-
298  PrintHex<uint8_t > (l2capinbuf[9], 0x80);
+
289  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
+
290  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
291  Notify(PSTR(" "), 0x80);
+
292  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
293  Notify(PSTR(" SCID: "), 0x80);
+
294  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
295  Notify(PSTR(" "), 0x80);
+
296  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
297  Notify(PSTR(" Identifier: "), 0x80);
+
298  D_PrintHex<uint8_t > (l2capinbuf[9], 0x80);
299 #endif
300  if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == HID_CTRL_PSM) {
301  identifier = l2capinbuf[9];
@@ -422,14 +422,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
331  } else if (l2capinbuf[8] == L2CAP_CMD_DISCONNECT_REQUEST) {
332  if (l2capinbuf[12] == control_dcid[0] && l2capinbuf[13] == control_dcid[1]) {
333 #ifdef DEBUG_USB_HOST
-
334  Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
+
334  Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
335 #endif
336  identifier = l2capinbuf[9];
337  pBtd->l2cap_disconnection_response(hci_handle, identifier, control_dcid, control_scid);
338  Reset();
339  } else if (l2capinbuf[12] == interrupt_dcid[0] && l2capinbuf[13] == interrupt_dcid[1]) {
340 #ifdef DEBUG_USB_HOST
-
341  Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
+
341  Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
342 #endif
343  identifier = l2capinbuf[9];
344  pBtd->l2cap_disconnection_response(hci_handle, identifier, interrupt_dcid, interrupt_scid);
@@ -448,8 +448,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
357  }
358 #ifdef EXTRADEBUG
359  else {
-
360  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
-
361  PrintHex<uint8_t > (l2capinbuf[8], 0x80);
+
360  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
+
361  D_PrintHex<uint8_t > (l2capinbuf[8], 0x80);
362  }
363 #endif
364  } else if (l2capinbuf[6] == interrupt_dcid[0] && l2capinbuf[7] == interrupt_dcid[1]) { // l2cap_interrupt
@@ -472,10 +472,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
381 
382 #ifdef PRINTREPORT // Uncomment "#define PRINTREPORT" to print the report send by the PS3 Controllers
383  for (uint8_t i = 10; i < 58; i++) {
-
384  PrintHex<uint8_t > (l2capinbuf[i], 0x80);
-
385  Notify(PSTR(" "), 0x80);
+
384  D_PrintHex<uint8_t > (l2capinbuf[i], 0x80);
+
385  Notify(PSTR(" "), 0x80);
386  }
-
387  Notify(PSTR("\r\n"), 0x80);
+
387  Notify(PSTR("\r\n"), 0x80);
388 #endif
389  }
390  }
@@ -489,7 +489,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
398  case L2CAP_WAIT:
399  if (l2cap_connection_request_control_flag) {
400 #ifdef DEBUG_USB_HOST
-
401  Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
+
401  Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
402 #endif
403  pBtd->l2cap_connection_response(hci_handle, identifier, control_dcid, control_scid, PENDING);
404  delay(1);
@@ -503,7 +503,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
412  case L2CAP_CONTROL_REQUEST:
413  if (l2cap_config_request_control_flag) {
414 #ifdef DEBUG_USB_HOST
-
415  Notify(PSTR("\r\nHID Control Configuration Request"), 0x80);
+
415  Notify(PSTR("\r\nHID Control Configuration Request"), 0x80);
416 #endif
417  pBtd->l2cap_config_response(hci_handle, identifier, control_scid);
418  l2cap_state = L2CAP_CONTROL_SUCCESS;
@@ -513,7 +513,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
422  case L2CAP_CONTROL_SUCCESS:
423  if (l2cap_config_success_control_flag) {
424 #ifdef DEBUG_USB_HOST
-
425  Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
+
425  Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
426 #endif
427  l2cap_state = L2CAP_INTERRUPT_SETUP;
428  }
@@ -521,7 +521,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
430  case L2CAP_INTERRUPT_SETUP:
431  if (l2cap_connection_request_interrupt_flag) {
432 #ifdef DEBUG_USB_HOST
-
433  Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
+
433  Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
434 #endif
435  pBtd->l2cap_connection_response(hci_handle, identifier, interrupt_dcid, interrupt_scid, PENDING);
436  delay(1);
@@ -536,7 +536,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
445  case L2CAP_INTERRUPT_REQUEST:
446  if (l2cap_config_request_interrupt_flag) {
447 #ifdef DEBUG_USB_HOST
-
448  Notify(PSTR("\r\nHID Interrupt Configuration Request"), 0x80);
+
448  Notify(PSTR("\r\nHID Interrupt Configuration Request"), 0x80);
449 #endif
450  pBtd->l2cap_config_response(hci_handle, identifier, interrupt_scid);
451  l2cap_state = L2CAP_INTERRUPT_SUCCESS;
@@ -545,7 +545,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
454  case L2CAP_INTERRUPT_SUCCESS:
455  if (l2cap_config_success_interrupt_flag) {
456 #ifdef DEBUG_USB_HOST
-
457  Notify(PSTR("\r\nHID Interrupt Successfully Configured"), 0x80);
+
457  Notify(PSTR("\r\nHID Interrupt Successfully Configured"), 0x80);
458 #endif
459  if (remote_name[0] == 'M') { // First letter in Motion Controller ('M')
460  for (uint8_t i = 0; i < BULK_MAXPKTSIZE; i++) // Reset l2cap in buffer as it sometimes read it as a button has been pressed
@@ -565,7 +565,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
474  case L2CAP_INTERRUPT_DISCONNECT:
475  if (l2cap_disconnect_response_interrupt_flag) {
476 #ifdef DEBUG_USB_HOST
-
477  Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
+
477  Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
478 #endif
479  identifier++;
480  pBtd->l2cap_disconnection_request(hci_handle, identifier, control_scid, control_dcid);
@@ -576,7 +576,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
485  case L2CAP_CONTROL_DISCONNECT:
486  if (l2cap_disconnect_response_control_flag) {
487 #ifdef DEBUG_USB_HOST
-
488  Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
+
488  Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
489 #endif
490  pBtd->hci_disconnect(hci_handle);
491  hci_handle = -1; // Reset handle
@@ -609,20 +609,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
518  if (remote_name[0] == 'P') { // First letter in PLAYSTATION(R)3 Controller ('P')
519  setLedOn(LED1);
520 #ifdef DEBUG_USB_HOST
-
521  Notify(PSTR("\r\nDualshock 3 Controller Enabled\r\n"), 0x80);
+
521  Notify(PSTR("\r\nDualshock 3 Controller Enabled\r\n"), 0x80);
522 #endif
523  PS3Connected = true;
524  } else if (remote_name[0] == 'N') { // First letter in Navigation Controller ('N')
525  setLedOn(LED1); // This just turns LED constantly on, on the Navigation controller
526 #ifdef DEBUG_USB_HOST
-
527  Notify(PSTR("\r\nNavigation Controller Enabled\r\n"), 0x80);
+
527  Notify(PSTR("\r\nNavigation Controller Enabled\r\n"), 0x80);
528 #endif
529  PS3NavigationConnected = true;
530  } else if (remote_name[0] == 'M') { // First letter in Motion Controller ('M')
531  moveSetBulb(Red);
532  timerBulbRumble = millis();
533 #ifdef DEBUG_USB_HOST
-
534  Notify(PSTR("\r\nMotion Controller Enabled\r\n"), 0x80);
+
534  Notify(PSTR("\r\nMotion Controller Enabled\r\n"), 0x80);
535 #endif
536  PS3MoveConnected = true;
537  }
@@ -743,7 +743,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
652 void PS3BT::moveSetRumble(uint8_t rumble) {
653 #ifdef DEBUG_USB_HOST
654  if (rumble < 64 && rumble != 0) // The rumble value has to at least 64, or approximately 25% (64/255*100)
-
655  Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
+
655  Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
656 #endif
657  //set the rumble value into the write buffer
658  HIDMoveBuffer[7] = rumble;
diff --git a/_p_s3_u_s_b_8cpp_source.html b/_p_s3_u_s_b_8cpp_source.html index d63e3e0d..031cc00b 100644 --- a/_p_s3_u_s_b_8cpp_source.html +++ b/_p_s3_u_s_b_8cpp_source.html @@ -145,12 +145,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
54  // get memory address of USB device address pool
55  AddressPool &addrPool = pUsb->GetAddressPool();
56 #ifdef EXTRADEBUG
-
57  Notify(PSTR("\r\nPS3USB Init"), 0x80);
+
57  Notify(PSTR("\r\nPS3USB Init"), 0x80);
58 #endif
59  // check if address has already been assigned to an instance
60  if (bAddress) {
61 #ifdef DEBUG_USB_HOST
-
62  Notify(PSTR("\r\nAddress in use"), 0x80);
+
62  Notify(PSTR("\r\nAddress in use"), 0x80);
63 #endif
64  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
65  }
@@ -160,14 +160,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
69 
70  if (!p) {
71 #ifdef DEBUG_USB_HOST
-
72  Notify(PSTR("\r\nAddress not found"), 0x80);
+
72  Notify(PSTR("\r\nAddress not found"), 0x80);
73 #endif
74  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
75  }
76 
77  if (!p->epinfo) {
78 #ifdef DEBUG_USB_HOST
-
79  Notify(PSTR("\r\nepinfo is null"), 0x80);
+
79  Notify(PSTR("\r\nepinfo is null"), 0x80);
80 #endif
81  return USB_ERROR_EPINFO_IS_NULL;
82  }
@@ -210,14 +210,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
119  addrPool.FreeAddress(bAddress);
120  bAddress = 0;
121 #ifdef DEBUG_USB_HOST
-
122  Notify(PSTR("\r\nsetAddr: "), 0x80);
+
122  Notify(PSTR("\r\nsetAddr: "), 0x80);
123 #endif
-
124  PrintHex<uint8_t > (rcode, 0x80);
+
124  D_PrintHex<uint8_t > (rcode, 0x80);
125  return rcode;
126  }
127 #ifdef EXTRADEBUG
-
128  Notify(PSTR("\r\nAddr: "), 0x80);
-
129  PrintHex<uint8_t > (bAddress, 0x80);
+
128  Notify(PSTR("\r\nAddr: "), 0x80);
+
129  D_PrintHex<uint8_t > (bAddress, 0x80);
130 #endif
131  p->lowspeed = false;
132 
@@ -265,12 +265,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
174  if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
175  if (PID == PS3_PID) {
176 #ifdef DEBUG_USB_HOST
-
177  Notify(PSTR("\r\nDualshock 3 Controller Connected"), 0x80);
+
177  Notify(PSTR("\r\nDualshock 3 Controller Connected"), 0x80);
178 #endif
179  PS3Connected = true;
180  } else { // must be a navigation controller
181 #ifdef DEBUG_USB_HOST
-
182  Notify(PSTR("\r\nNavigation Controller Connected"), 0x80);
+
182  Notify(PSTR("\r\nNavigation Controller Connected"), 0x80);
183 #endif
184  PS3NavigationConnected = true;
185  }
@@ -287,7 +287,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
196  readBuf[i] = 0x7F; // Set the analog joystick values to center position
197  } else { // must be a Motion controller
198 #ifdef DEBUG_USB_HOST
-
199  Notify(PSTR("\r\nMotion Controller Connected"), 0x80);
+
199  Notify(PSTR("\r\nMotion Controller Connected"), 0x80);
200 #endif
201  PS3MoveConnected = true;
202  setMoveBdaddr(my_bdaddr); // Set internal bluetooth address
@@ -297,46 +297,46 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
206  }
207 
208 #ifdef DEBUG_USB_HOST
-
209  Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
+
209  Notify(PSTR("\r\nBluetooth Address was set to: "), 0x80);
210  for (int8_t i = 5; i > 0; i--) {
-
211  PrintHex<uint8_t > (my_bdaddr[i], 0x80);
-
212  Notify(PSTR(":"), 0x80);
+
211  D_PrintHex<uint8_t > (my_bdaddr[i], 0x80);
+
212  Notify(PSTR(":"), 0x80);
213  }
-
214  PrintHex<uint8_t > (my_bdaddr[0], 0x80);
+
214  D_PrintHex<uint8_t > (my_bdaddr[0], 0x80);
215 #endif
216 
217  bPollEnable = true;
-
218  Notify(PSTR("\r\n"), 0x80);
+
218  Notify(PSTR("\r\n"), 0x80);
219  timer = millis();
220  return 0; // successful configuration
221 
222  /* diagnostic messages */
223 FailGetDevDescr:
224 #ifdef DEBUG_USB_HOST
-
225  NotifyFailGetDevDescr();
+
225  NotifyFailGetDevDescr();
226  goto Fail;
227 #endif
228 FailSetDevTblEntry:
229 #ifdef DEBUG_USB_HOST
-
230  NotifyFailSetDevTblEntry();
+
230  NotifyFailSetDevTblEntry();
231  goto Fail;
232 #endif
233 
234 FailSetConfDescr:
235 #ifdef DEBUG_USB_HOST
-
236  NotifyFailSetConfDescr();
+
236  NotifyFailSetConfDescr();
237 #endif
238  goto Fail;
239 FailUnknownDevice:
240 #ifdef DEBUG_USB_HOST
-
241  NotifyFailUnknownDevice(VID, PID);
+
241  NotifyFailUnknownDevice(VID, PID);
242 #endif
243  rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
244 Fail:
245 
246 #ifdef DEBUG_USB_HOST
-
247  Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
-
248  NotifyFail(rcode);
+
247  Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
+
248  NotifyFail(rcode);
249 #endif
250  Release();
251  return rcode;
@@ -396,10 +396,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
305  if (readBuf == NULL)
306  return;
307  for (uint8_t i = 0; i < PS3_REPORT_BUFFER_SIZE; i++) {
-
308  PrintHex<uint8_t > (readBuf[i], 0x80);
-
309  Notify(PSTR(" "), 0x80);
+
308  D_PrintHex<uint8_t > (readBuf[i], 0x80);
+
309  Notify(PSTR(" "), 0x80);
310  }
-
311  Notify(PSTR("\r\n"), 0x80);
+
311  Notify(PSTR("\r\n"), 0x80);
312 #endif
313 }
314 
@@ -606,7 +606,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
515 void PS3USB::moveSetRumble(uint8_t rumble) {
516 #ifdef DEBUG_USB_HOST
517  if (rumble < 64 && rumble != 0) // The rumble value has to at least 64, or approximately 25% (64/255*100)
-
518  Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
+
518  Notify(PSTR("\r\nThe rumble value has to at least 64, or approximately 25%"), 0x80);
519 #endif
520  //set the rumble value into the write buffer
521  writeBuf[6] = rumble;
diff --git a/_s_p_p_8cpp_source.html b/_s_p_p_8cpp_source.html index e0fff753..c84a30c1 100644 --- a/_s_p_p_8cpp_source.html +++ b/_s_p_p_8cpp_source.html @@ -191,31 +191,31 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
100  if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
101  if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
102 #ifdef DEBUG_USB_HOST
-
103  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
-
104  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
105  Notify(PSTR(" "), 0x80);
-
106  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
107  Notify(PSTR(" Data: "), 0x80);
-
108  PrintHex<uint8_t > (l2capinbuf[17], 0x80);
-
109  Notify(PSTR(" "), 0x80);
-
110  PrintHex<uint8_t > (l2capinbuf[16], 0x80);
-
111  Notify(PSTR(" "), 0x80);
-
112  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
113  Notify(PSTR(" "), 0x80);
-
114  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
103  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
+
104  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
105  Notify(PSTR(" "), 0x80);
+
106  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
107  Notify(PSTR(" Data: "), 0x80);
+
108  D_PrintHex<uint8_t > (l2capinbuf[17], 0x80);
+
109  Notify(PSTR(" "), 0x80);
+
110  D_PrintHex<uint8_t > (l2capinbuf[16], 0x80);
+
111  Notify(PSTR(" "), 0x80);
+
112  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
113  Notify(PSTR(" "), 0x80);
+
114  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
115 #endif
116  } else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
117 #ifdef EXTRADEBUG
-
118  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
-
119  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
120  Notify(PSTR(" "), 0x80);
-
121  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
122  Notify(PSTR(" SCID: "), 0x80);
-
123  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
124  Notify(PSTR(" "), 0x80);
-
125  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
-
126  Notify(PSTR(" Identifier: "), 0x80);
-
127  PrintHex<uint8_t > (l2capinbuf[9], 0x80);
+
118  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
+
119  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
120  Notify(PSTR(" "), 0x80);
+
121  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
122  Notify(PSTR(" SCID: "), 0x80);
+
123  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
124  Notify(PSTR(" "), 0x80);
+
125  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
126  Notify(PSTR(" Identifier: "), 0x80);
+
127  D_PrintHex<uint8_t > (l2capinbuf[9], 0x80);
128 #endif
129  if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == SDP_PSM) { // It doesn't matter if it receives another reqeust, since it waits for the channel to disconnect in the L2CAP_SDP_DONE state, and the l2cap_event_flag will be cleared if so
130  identifier = l2capinbuf[9];
@@ -270,15 +270,15 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
179  }
180  } else if (l2capinbuf[8] == L2CAP_CMD_INFORMATION_REQUEST) {
181 #ifdef DEBUG_USB_HOST
-
182  Notify(PSTR("\r\nInformation request"), 0x80);
+
182  Notify(PSTR("\r\nInformation request"), 0x80);
183 #endif
184  identifier = l2capinbuf[9];
185  pBtd->l2cap_information_response(hci_handle, identifier, l2capinbuf[12], l2capinbuf[13]);
186  }
187 #ifdef EXTRADEBUG
188  else {
-
189  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
-
190  PrintHex<uint8_t > (l2capinbuf[8], 0x80);
+
189  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
+
190  D_PrintHex<uint8_t > (l2capinbuf[8], 0x80);
191  }
192 #endif
193  } else if (l2capinbuf[6] == sdp_dcid[0] && l2capinbuf[7] == sdp_dcid[1]) { // SDP
@@ -302,28 +302,28 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
211  } else
212  serviceNotSupported(l2capinbuf[9], l2capinbuf[10]); // The service is not supported
213 #ifdef EXTRADEBUG
-
214  Notify(PSTR("\r\nUUID: "), 0x80);
+
214  Notify(PSTR("\r\nUUID: "), 0x80);
215  uint16_t uuid;
216  if((l2capinbuf[16] << 8 | l2capinbuf[17]) == 0x0000) // Check if it's sending the UUID as a 128-bit UUID
217  uuid = (l2capinbuf[18] << 8 | l2capinbuf[19]);
218  else // Short UUID
219  uuid = (l2capinbuf[16] << 8 | l2capinbuf[17]);
-
220  PrintHex<uint16_t> (uuid, 0x80);
+
220  D_PrintHex<uint16_t> (uuid, 0x80);
221 
-
222  Notify(PSTR("\r\nLength: "), 0x80);
+
222  Notify(PSTR("\r\nLength: "), 0x80);
223  uint16_t length = l2capinbuf[11] << 8 | l2capinbuf[12];
-
224  PrintHex<uint16_t> (length, 0x80);
-
225  Notify(PSTR("\r\nData: "), 0x80);
+
224  D_PrintHex<uint16_t> (length, 0x80);
+
225  Notify(PSTR("\r\nData: "), 0x80);
226  for (uint8_t i = 0; i < length; i++) {
-
227  PrintHex<uint8_t> (l2capinbuf[13+i], 0x80);
-
228  Notify(PSTR(" "), 0x80);
+
227  D_PrintHex<uint8_t> (l2capinbuf[13+i], 0x80);
+
228  Notify(PSTR(" "), 0x80);
229  }
230 #endif
231  }
232 #ifdef EXTRADEBUG
233  else {
-
234  Notify(PSTR("\r\nUnknown PDU: "));
-
235  PrintHex<uint8_t > (l2capinbuf[8], 0x80);
+
234  Notify(PSTR("\r\nUnknown PDU: "));
+
235  D_PrintHex<uint8_t > (l2capinbuf[8], 0x80);
236  }
237 #endif
238  } else if (l2capinbuf[6] == rfcomm_dcid[0] && l2capinbuf[7] == rfcomm_dcid[1]) { // RFCOMM
@@ -337,21 +337,21 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
246  rfcommChannelConnection = rfcommChannel;
247 
248 #ifdef EXTRADEBUG
-
249  Notify(PSTR("\r\nRFCOMM Channel: "), 0x80);
-
250  PrintHex<uint8_t > (rfcommChannel >> 3, 0x80);
-
251  Notify(PSTR(" Direction: "), 0x80);
-
252  PrintHex<uint8_t > (rfcommDirection >> 2, 0x80);
-
253  Notify(PSTR(" CommandResponse: "), 0x80);
-
254  PrintHex<uint8_t > (rfcommCommandResponse >> 1, 0x80);
-
255  Notify(PSTR(" ChannelType: "), 0x80);
-
256  PrintHex<uint8_t > (rfcommChannelType, 0x80);
-
257  Notify(PSTR(" PF_BIT: "), 0x80);
-
258  PrintHex<uint8_t > (rfcommPfBit, 0x80);
+
249  Notify(PSTR("\r\nRFCOMM Channel: "), 0x80);
+
250  D_PrintHex<uint8_t > (rfcommChannel >> 3, 0x80);
+
251  Notify(PSTR(" Direction: "), 0x80);
+
252  D_PrintHex<uint8_t > (rfcommDirection >> 2, 0x80);
+
253  Notify(PSTR(" CommandResponse: "), 0x80);
+
254  D_PrintHex<uint8_t > (rfcommCommandResponse >> 1, 0x80);
+
255  Notify(PSTR(" ChannelType: "), 0x80);
+
256  D_PrintHex<uint8_t > (rfcommChannelType, 0x80);
+
257  Notify(PSTR(" PF_BIT: "), 0x80);
+
258  D_PrintHex<uint8_t > (rfcommPfBit, 0x80);
259 #endif
260  if (rfcommChannelType == RFCOMM_DISC) {
261 #ifdef DEBUG_USB_HOST
-
262  Notify(PSTR("\r\nReceived Disconnect RFCOMM Command on channel: "), 0x80);
-
263  PrintHex<uint8_t > (rfcommChannel >> 3, 0x80);
+
262  Notify(PSTR("\r\nReceived Disconnect RFCOMM Command on channel: "), 0x80);
+
263  D_PrintHex<uint8_t > (rfcommChannel >> 3, 0x80);
264 #endif
265  connected = false;
266  sendRfcomm(rfcommChannel, rfcommDirection, rfcommCommandResponse, RFCOMM_UA, rfcommPfBit, rfcommbuf, 0x00); // UA Command
@@ -367,20 +367,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
276  rfcommAvailable += length;
277  }
278 #ifdef EXTRADEBUG
-
279  Notify(PSTR("\r\nRFCOMM Data Available: "), 0x80);
-
280  Notify(rfcommAvailable, 0x80);
+
279  Notify(PSTR("\r\nRFCOMM Data Available: "), 0x80);
+
280  Notify(rfcommAvailable, 0x80);
281  if (offset) {
-
282  Notify(PSTR(" - Credit: 0x"), 0x80);
-
283  PrintHex<uint8_t > (l2capinbuf[11], 0x80);
+
282  Notify(PSTR(" - Credit: 0x"), 0x80);
+
283  D_PrintHex<uint8_t > (l2capinbuf[11], 0x80);
284  }
285 #endif
286 #ifdef PRINTREPORT // Uncomment "#define PRINTREPORT" to print the report send to the Arduino via Bluetooth
287  for (uint8_t i = 0; i < length; i++)
-
288  Notifyc(l2capinbuf[i + 11 + offset], 0x80);
+
288  Notifyc(l2capinbuf[i + 11 + offset], 0x80);
289 #endif
290  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_RPN_CMD) { // UIH Remote Port Negotiation Command
291 #ifdef DEBUG_USB_HOST
-
292  Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
+
292  Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
293 #endif
294  rfcommbuf[0] = BT_RFCOMM_RPN_RSP; // Command
295  rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
@@ -395,7 +395,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
304  sendRfcomm(rfcommChannel, rfcommDirection, 0, RFCOMM_UIH, rfcommPfBit, rfcommbuf, 0x0A); // UIH Remote Port Negotiation Response
305  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_CMD) { // UIH Modem Status Command
306 #ifdef DEBUG_USB_HOST
-
307  Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
+
307  Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
308 #endif
309  rfcommbuf[0] = BT_RFCOMM_MSC_RSP; // UIH Modem Status Response
310  rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
@@ -406,12 +406,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
315  } else {
316  if (rfcommChannelType == RFCOMM_SABM) { // SABM Command - this is sent twice: once for channel 0 and then for the channel to establish
317 #ifdef DEBUG_USB_HOST
-
318  Notify(PSTR("\r\nReceived SABM Command"), 0x80);
+
318  Notify(PSTR("\r\nReceived SABM Command"), 0x80);
319 #endif
320  sendRfcomm(rfcommChannel, rfcommDirection, rfcommCommandResponse, RFCOMM_UA, rfcommPfBit, rfcommbuf, 0x00); // UA Command
321  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_PN_CMD) { // UIH Parameter Negotiation Command
322 #ifdef DEBUG_USB_HOST
-
323  Notify(PSTR("\r\nReceived UIH Parameter Negotiation Command"), 0x80);
+
323  Notify(PSTR("\r\nReceived UIH Parameter Negotiation Command"), 0x80);
324 #endif
325  rfcommbuf[0] = BT_RFCOMM_PN_RSP; // UIH Parameter Negotiation Response
326  rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
@@ -426,7 +426,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
335  sendRfcomm(rfcommChannel, rfcommDirection, 0, RFCOMM_UIH, rfcommPfBit, rfcommbuf, 0x0A);
336  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_CMD) { // UIH Modem Status Command
337 #ifdef DEBUG_USB_HOST
-
338  Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
+
338  Notify(PSTR("\r\nSend UIH Modem Status Response"), 0x80);
339 #endif
340  rfcommbuf[0] = BT_RFCOMM_MSC_RSP; // UIH Modem Status Response
341  rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
@@ -436,7 +436,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
345 
346  delay(1);
347 #ifdef DEBUG_USB_HOST
-
348  Notify(PSTR("\r\nSend UIH Modem Status Command"), 0x80);
+
348  Notify(PSTR("\r\nSend UIH Modem Status Command"), 0x80);
349 #endif
350  rfcommbuf[0] = BT_RFCOMM_MSC_CMD; // UIH Modem Status Command
351  rfcommbuf[1] = 2 << 1 | 1; // Length and shiftet like so: length << 1 | 1
@@ -447,7 +447,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
356  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_MSC_RSP) { // UIH Modem Status Response
357  if (!creditSent) {
358 #ifdef DEBUG_USB_HOST
-
359  Notify(PSTR("\r\nSend UIH Command with credit"), 0x80);
+
359  Notify(PSTR("\r\nSend UIH Command with credit"), 0x80);
360 #endif
361  sendRfcommCredit(rfcommChannelConnection, rfcommDirection, 0, RFCOMM_UIH, 0x10, sizeof (rfcommDataBuffer)); // Send credit
362  creditSent = true;
@@ -456,11 +456,11 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
365  }
366  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[10] == 0x01) { // UIH Command with credit
367 #ifdef DEBUG_USB_HOST
-
368  Notify(PSTR("\r\nReceived UIH Command with credit"), 0x80);
+
368  Notify(PSTR("\r\nReceived UIH Command with credit"), 0x80);
369 #endif
370  } else if (rfcommChannelType == RFCOMM_UIH && l2capinbuf[11] == BT_RFCOMM_RPN_CMD) { // UIH Remote Port Negotiation Command
371 #ifdef DEBUG_USB_HOST
-
372  Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
+
372  Notify(PSTR("\r\nReceived UIH Remote Port Negotiation Command"), 0x80);
373 #endif
374  rfcommbuf[0] = BT_RFCOMM_RPN_RSP; // Command
375  rfcommbuf[1] = l2capinbuf[12]; // Length and shiftet like so: length << 1 | 1
@@ -474,7 +474,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
383  rfcommbuf[9] = l2capinbuf[20]; // Number of Frames
384  sendRfcomm(rfcommChannel, rfcommDirection, 0, RFCOMM_UIH, rfcommPfBit, rfcommbuf, 0x0A); // UIH Remote Port Negotiation Response
385 #ifdef DEBUG_USB_HOST
-
386  Notify(PSTR("\r\nRFCOMM Connection is now established\r\n"), 0x80);
+
386  Notify(PSTR("\r\nRFCOMM Connection is now established\r\n"), 0x80);
387 #endif
388  waitForLastCommand = false;
389  creditSent = false;
@@ -483,20 +483,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
392  }
393 #ifdef DEBUG_USB_HOST
394  else if (rfcommChannelType != RFCOMM_DISC) {
-
395  Notify(PSTR("\r\nUnsupported RFCOMM Data - ChannelType: "), 0x80);
-
396  PrintHex<uint8_t > (rfcommChannelType, 0x80);
-
397  Notify(PSTR(" Command: "), 0x80);
-
398  PrintHex<uint8_t > (l2capinbuf[11], 0x80);
+
395  Notify(PSTR("\r\nUnsupported RFCOMM Data - ChannelType: "), 0x80);
+
396  D_PrintHex<uint8_t > (rfcommChannelType, 0x80);
+
397  Notify(PSTR(" Command: "), 0x80);
+
398  D_PrintHex<uint8_t > (l2capinbuf[11], 0x80);
399  }
400 #endif
401  }
402  }
403 #ifdef EXTRADEBUG
404  else {
-
405  Notify(PSTR("\r\nUnsupported L2CAP Data - Channel ID: "), 0x80);
-
406  PrintHex<uint8_t > (l2capinbuf[7], 0x80);
-
407  Notify(PSTR(" "), 0x80);
-
408  PrintHex<uint8_t > (l2capinbuf[6], 0x80);
+
405  Notify(PSTR("\r\nUnsupported L2CAP Data - Channel ID: "), 0x80);
+
406  D_PrintHex<uint8_t > (l2capinbuf[7], 0x80);
+
407  Notify(PSTR(" "), 0x80);
+
408  D_PrintHex<uint8_t > (l2capinbuf[6], 0x80);
409  }
410 #endif
411  SDP_task();
@@ -507,7 +507,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
416 void SPP::Run() {
417  if (waitForLastCommand && (millis() - timer) > 100) { // We will only wait 100ms and see if the UIH Remote Port Negotiation Command is send, as some deviced don't send it
418 #ifdef DEBUG_USB_HOST
-
419  Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"), 0x80);
+
419  Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"), 0x80);
420 #endif
421  creditSent = false;
422  waitForLastCommand = false;
@@ -523,7 +523,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
432  if (l2cap_connection_request_sdp_flag) {
433  l2cap_event_flag &= ~L2CAP_FLAG_CONNECTION_SDP_REQUEST; // Clear flag
434 #ifdef DEBUG_USB_HOST
-
435  Notify(PSTR("\r\nSDP Incoming Connection Request"), 0x80);
+
435  Notify(PSTR("\r\nSDP Incoming Connection Request"), 0x80);
436 #endif
437  pBtd->l2cap_connection_response(hci_handle, identifier, sdp_dcid, sdp_scid, PENDING);
438  delay(1);
@@ -538,7 +538,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
447  if (l2cap_config_request_sdp_flag) {
448  l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_SDP_REQUEST; // Clear flag
449 #ifdef DEBUG_USB_HOST
-
450  Notify(PSTR("\r\nSDP Configuration Request"), 0x80);
+
450  Notify(PSTR("\r\nSDP Configuration Request"), 0x80);
451 #endif
452  pBtd->l2cap_config_response(hci_handle, identifier, sdp_scid);
453  l2cap_sdp_state = L2CAP_SDP_SUCCESS;
@@ -548,7 +548,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
457  if (l2cap_config_success_sdp_flag) {
458  l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_SDP_SUCCESS; // Clear flag
459 #ifdef DEBUG_USB_HOST
-
460  Notify(PSTR("\r\nSDP Successfully Configured"), 0x80);
+
460  Notify(PSTR("\r\nSDP Successfully Configured"), 0x80);
461 #endif
462  firstMessage = true; // Reset bool
463  SDPConnected = true;
@@ -560,7 +560,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
469  l2cap_event_flag &= ~L2CAP_FLAG_DISCONNECT_SDP_REQUEST; // Clear flag
470  SDPConnected = false;
471 #ifdef DEBUG_USB_HOST
-
472  Notify(PSTR("\r\nDisconnected SDP Channel"), 0x80);
+
472  Notify(PSTR("\r\nDisconnected SDP Channel"), 0x80);
473 #endif
474  pBtd->l2cap_disconnection_response(hci_handle, identifier, sdp_dcid, sdp_scid);
475  l2cap_sdp_state = L2CAP_SDP_WAIT;
@@ -570,7 +570,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
479  case L2CAP_DISCONNECT_RESPONSE: // This is for both disconnection response from the RFCOMM and SDP channel if they were connected
480  if (l2cap_disconnect_response_flag) {
481 #ifdef DEBUG_USB_HOST
-
482  Notify(PSTR("\r\nDisconnected L2CAP Connection"), 0x80);
+
482  Notify(PSTR("\r\nDisconnected L2CAP Connection"), 0x80);
483 #endif
484  RFCOMMConnected = false;
485  SDPConnected = false;
@@ -590,7 +590,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
499  if (l2cap_connection_request_rfcomm_flag) {
500  l2cap_event_flag &= ~L2CAP_FLAG_CONNECTION_RFCOMM_REQUEST; // Clear flag
501 #ifdef DEBUG_USB_HOST
-
502  Notify(PSTR("\r\nRFCOMM Incoming Connection Request"), 0x80);
+
502  Notify(PSTR("\r\nRFCOMM Incoming Connection Request"), 0x80);
503 #endif
504  pBtd->l2cap_connection_response(hci_handle, identifier, rfcomm_dcid, rfcomm_scid, PENDING);
505  delay(1);
@@ -605,7 +605,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
514  if (l2cap_config_request_rfcomm_flag) {
515  l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_RFCOMM_REQUEST; // Clear flag
516 #ifdef DEBUG_USB_HOST
-
517  Notify(PSTR("\r\nRFCOMM Configuration Request"), 0x80);
+
517  Notify(PSTR("\r\nRFCOMM Configuration Request"), 0x80);
518 #endif
519  pBtd->l2cap_config_response(hci_handle, identifier, rfcomm_scid);
520  l2cap_rfcomm_state = L2CAP_RFCOMM_SUCCESS;
@@ -615,7 +615,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
524  if (l2cap_config_success_rfcomm_flag) {
525  l2cap_event_flag &= ~L2CAP_FLAG_CONFIG_RFCOMM_SUCCESS; // Clear flag
526 #ifdef DEBUG_USB_HOST
-
527  Notify(PSTR("\r\nRFCOMM Successfully Configured"), 0x80);
+
527  Notify(PSTR("\r\nRFCOMM Successfully Configured"), 0x80);
528 #endif
529  rfcommAvailable = 0; // Reset number of bytes available
530  bytesRead = 0; // Reset number of bytes received
@@ -629,7 +629,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
538  RFCOMMConnected = false;
539  connected = false;
540 #ifdef DEBUG_USB_HOST
-
541  Notify(PSTR("\r\nDisconnected RFCOMM Channel"), 0x80);
+
541  Notify(PSTR("\r\nDisconnected RFCOMM Channel"), 0x80);
542 #endif
543  pBtd->l2cap_disconnection_response(hci_handle, identifier, rfcomm_dcid, rfcomm_scid);
544  l2cap_rfcomm_state = L2CAP_RFCOMM_WAIT;
@@ -787,10 +787,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
696  l2capoutbuf[i + 3] = data[i];
697  l2capoutbuf[i + 3] = calcFcs(l2capoutbuf);
698 #ifdef EXTRADEBUG
-
699  Notify(PSTR(" - RFCOMM Data: "), 0x80);
+
699  Notify(PSTR(" - RFCOMM Data: "), 0x80);
700  for (i = 0; i < length + 4; i++) {
-
701  PrintHex<uint8_t > (l2capoutbuf[i], 0x80);
-
702  Notify(PSTR(" "), 0x80);
+
701  D_PrintHex<uint8_t > (l2capoutbuf[i], 0x80);
+
702  Notify(PSTR(" "), 0x80);
703  }
704 #endif
705  RFCOMM_Command(l2capoutbuf, length + 4);
@@ -803,10 +803,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
712  l2capoutbuf[3] = credit; // Credit
713  l2capoutbuf[4] = calcFcs(l2capoutbuf);
714 #ifdef EXTRADEBUG
-
715  Notify(PSTR(" - RFCOMM Credit Data: "), 0x80);
+
715  Notify(PSTR(" - RFCOMM Credit Data: "), 0x80);
716  for (uint8_t i = 0; i < 5; i++) {
-
717  PrintHex<uint8_t > (l2capoutbuf[i], 0x80);
-
718  Notify(PSTR(" "), 0x80);
+
717  D_PrintHex<uint8_t > (l2capoutbuf[i], 0x80);
+
718  Notify(PSTR(" "), 0x80);
719  }
720 #endif
721  RFCOMM_Command(l2capoutbuf, 5);
@@ -834,7 +834,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
743  for(uint8_t i = 0; i < size; i++) {
744  if(sppIndex >= sizeof(sppOutputBuffer)/sizeof(sppOutputBuffer[0]))
745  send(); // Send the current data in the buffer
-
746  sppOutputBuffer[sppIndex++] = data[i]; // All the bytes are put into a buffer and then send using the send() function
+
746  sppOutputBuffer[sppIndex++] = data[i]; // All the bytes are put into a buffer and then send using the send() function
747  }
748  return size;
749 }
@@ -893,9 +893,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
802  bytesRead = 0;
803  sendRfcommCredit(rfcommChannelConnection, rfcommDirection, 0, RFCOMM_UIH, 0x10, sizeof (rfcommDataBuffer)); // Send more credit
804 #ifdef EXTRADEBUG
-
805  Notify(PSTR("\r\nSent "), 0x80);
-
806  Notify((uint8_t)sizeof (rfcommDataBuffer), 0x80);
-
807  Notify(PSTR(" more credit"), 0x80);
+
805  Notify(PSTR("\r\nSent "), 0x80);
+
806  Notify((uint8_t)sizeof (rfcommDataBuffer), 0x80);
+
807  Notify(PSTR(" more credit"), 0x80);
808 #endif
809  }
810  return output;
diff --git a/_usb_8cpp_source.html b/_usb_8cpp_source.html index ff9f1d27..f2392830 100644 --- a/_usb_8cpp_source.html +++ b/_usb_8cpp_source.html @@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
38 
39 /* Initialize data structures */
40 void USB::init() {
-
41  devConfigIndex = 0;
+
41  //devConfigIndex = 0;
42  bmHubPre = 0;
43 }
44 
@@ -201,599 +201,682 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
110  USBTRACE("\r\n");
111  */
112  regWr(rPERADDR, addr); //set peripheral address
-
113 
+
113 
114  uint8_t mode = regRd(rMODE);
-
115 
-
116  // Set bmLOWSPEED and bmHUBPRE in case of low-speed device, reset them otherwise
-
117  regWr(rMODE, (p->lowspeed) ? mode | bmLOWSPEED | bmHubPre : mode & ~(bmHUBPRE | bmLOWSPEED));
-
118 
-
119  return 0;
-
120 }
+
115 
+
116  //Serial.print("\r\nMode: ");
+
117  //Serial.println( mode, HEX);
+
118  //Serial.print("\r\nLS: ");
+
119  //Serial.println(p->lowspeed, HEX);
+
120 
121 
-
122 /* Control transfer. Sets address, endpoint, fills control packet with necessary data, dispatches control packet, and initiates bulk IN transfer, */
-
123 /* depending on request. Actual requests are defined as inlines */
-
124 /* return codes: */
-
125 /* 00 = success */
-
126 
-
127 /* 01-0f = non-zero HRSLT */
-
128 uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi,
-
129  uint16_t wInd, uint16_t total, uint16_t nbytes, uint8_t* dataptr, USBReadParser *p) {
-
130  bool direction = false; //request direction, IN or OUT
-
131  uint8_t rcode;
-
132  SETUP_PKT setup_pkt;
+
122 
+
123  // Set bmLOWSPEED and bmHUBPRE in case of low-speed device, reset them otherwise
+
124  regWr(rMODE, (p->lowspeed) ? mode | bmLOWSPEED | bmHubPre : mode & ~(bmHUBPRE | bmLOWSPEED));
+
125 
+
126  return 0;
+
127 }
+
128 
+
129 /* Control transfer. Sets address, endpoint, fills control packet with necessary data, dispatches control packet, and initiates bulk IN transfer, */
+
130 /* depending on request. Actual requests are defined as inlines */
+
131 /* return codes: */
+
132 /* 00 = success */
133 
-
134  EpInfo *pep = NULL;
-
135  uint16_t nak_limit = 0;
-
136 
-
137  rcode = SetAddress(addr, ep, &pep, nak_limit);
-
138 
-
139  if (rcode)
-
140  return rcode;
-
141 
-
142  direction = ((bmReqType & 0x80) > 0);
+
134 /* 01-0f = non-zero HRSLT */
+
135 uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi,
+
136  uint16_t wInd, uint16_t total, uint16_t nbytes, uint8_t* dataptr, USBReadParser *p) {
+
137  bool direction = false; //request direction, IN or OUT
+
138  uint8_t rcode;
+
139  SETUP_PKT setup_pkt;
+
140 
+
141  EpInfo *pep = NULL;
+
142  uint16_t nak_limit = 0;
143 
-
144  /* fill in setup packet */
-
145  setup_pkt.ReqType_u.bmRequestType = bmReqType;
-
146  setup_pkt.bRequest = bRequest;
-
147  setup_pkt.wVal_u.wValueLo = wValLo;
-
148  setup_pkt.wVal_u.wValueHi = wValHi;
-
149  setup_pkt.wIndex = wInd;
-
150  setup_pkt.wLength = total;
-
151 
-
152  bytesWr(rSUDFIFO, 8, (uint8_t*) & setup_pkt); //transfer to setup packet FIFO
-
153 
-
154  rcode = dispatchPkt(tokSETUP, ep, nak_limit); //dispatch packet
-
155 
-
156  if (rcode) //return HRSLT if not zero
-
157  return ( rcode);
+
144  rcode = SetAddress(addr, ep, &pep, nak_limit);
+
145 
+
146  if (rcode)
+
147  return rcode;
+
148 
+
149  direction = ((bmReqType & 0x80) > 0);
+
150 
+
151  /* fill in setup packet */
+
152  setup_pkt.ReqType_u.bmRequestType = bmReqType;
+
153  setup_pkt.bRequest = bRequest;
+
154  setup_pkt.wVal_u.wValueLo = wValLo;
+
155  setup_pkt.wVal_u.wValueHi = wValHi;
+
156  setup_pkt.wIndex = wInd;
+
157  setup_pkt.wLength = total;
158 
-
159  if (dataptr != NULL) //data stage, if present
-
160  {
-
161  if (direction) //IN transfer
-
162  {
-
163  uint16_t left = total;
-
164 
-
165  pep->bmRcvToggle = 1; //bmRCVTOG1;
-
166 
-
167  while (left) {
-
168  // Bytes read into buffer
-
169  uint16_t read = nbytes;
-
170  //uint16_t read = (left<nbytes) ? left : nbytes;
+
159  bytesWr(rSUDFIFO, 8, (uint8_t*) & setup_pkt); //transfer to setup packet FIFO
+
160 
+
161  rcode = dispatchPkt(tokSETUP, ep, nak_limit); //dispatch packet
+
162 
+
163  if (rcode) //return HRSLT if not zero
+
164  return ( rcode);
+
165 
+
166  if (dataptr != NULL) //data stage, if present
+
167  {
+
168  if (direction) //IN transfer
+
169  {
+
170  uint16_t left = total;
171 
-
172  rcode = InTransfer(pep, nak_limit, &read, dataptr);
-
173  if (rcode == hrTOGERR) {
-
174  // yes, we flip it wrong here so that next time it is actually correct!
-
175  pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-
176  continue;
-
177  }
+
172  pep->bmRcvToggle = 1; //bmRCVTOG1;
+
173 
+
174  while (left) {
+
175  // Bytes read into buffer
+
176  uint16_t read = nbytes;
+
177  //uint16_t read = (left<nbytes) ? left : nbytes;
178 
-
179  if (rcode)
-
180  return rcode;
-
181 
-
182  // Invoke callback function if inTransfer completed successfully and callback function pointer is specified
-
183  if (!rcode && p)
-
184  ((USBReadParser*)p)->Parse(read, dataptr, total - left);
+
179  rcode = InTransfer(pep, nak_limit, &read, dataptr);
+
180  if (rcode == hrTOGERR) {
+
181  // yes, we flip it wrong here so that next time it is actually correct!
+
182  pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+
183  continue;
+
184  }
185 
-
186  left -= read;
-
187 
-
188  if (read < nbytes)
-
189  break;
-
190  }
-
191  } else //OUT transfer
-
192  {
-
193  pep->bmSndToggle = 1; //bmSNDTOG1;
-
194  rcode = OutTransfer(pep, nak_limit, nbytes, dataptr);
-
195  }
-
196  if (rcode) //return error
-
197  return ( rcode);
-
198  }
-
199  // Status stage
-
200  return dispatchPkt((direction) ? tokOUTHS : tokINHS, ep, nak_limit); //GET if direction
-
201 }
-
202 
-
203 /* IN transfer to arbitrary endpoint. Assumes PERADDR is set. Handles multiple packets if necessary. Transfers 'nbytes' bytes. */
-
204 /* Keep sending INs and writes data to memory area pointed by 'data' */
-
205 
-
206 /* rcode 0 if no errors. rcode 01-0f is relayed from dispatchPkt(). Rcode f0 means RCVDAVIRQ error,
-
207  fe USB xfer timeout */
-
208 uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t* data) {
-
209  EpInfo *pep = NULL;
-
210  uint16_t nak_limit = 0;
-
211 
-
212  uint8_t rcode = SetAddress(addr, ep, &pep, nak_limit);
-
213 
-
214  if (rcode) {
-
215  //printf("SetAddress Failed");
-
216  return rcode;
-
217  }
-
218  return InTransfer(pep, nak_limit, nbytesptr, data);
-
219 }
+
186  if (rcode)
+
187  return rcode;
+
188 
+
189  // Invoke callback function if inTransfer completed successfully and callback function pointer is specified
+
190  if (!rcode && p)
+
191  ((USBReadParser*)p)->Parse(read, dataptr, total - left);
+
192 
+
193  left -= read;
+
194 
+
195  if (read < nbytes)
+
196  break;
+
197  }
+
198  } else //OUT transfer
+
199  {
+
200  pep->bmSndToggle = 1; //bmSNDTOG1;
+
201  rcode = OutTransfer(pep, nak_limit, nbytes, dataptr);
+
202  }
+
203  if (rcode) //return error
+
204  return ( rcode);
+
205  }
+
206  // Status stage
+
207  return dispatchPkt((direction) ? tokOUTHS : tokINHS, ep, nak_limit); //GET if direction
+
208 }
+
209 
+
210 /* IN transfer to arbitrary endpoint. Assumes PERADDR is set. Handles multiple packets if necessary. Transfers 'nbytes' bytes. */
+
211 /* Keep sending INs and writes data to memory area pointed by 'data' */
+
212 
+
213 /* rcode 0 if no errors. rcode 01-0f is relayed from dispatchPkt(). Rcode f0 means RCVDAVIRQ error,
+
214  fe USB xfer timeout */
+
215 uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t* data) {
+
216  EpInfo *pep = NULL;
+
217  uint16_t nak_limit = 0;
+
218 
+
219  uint8_t rcode = SetAddress(addr, ep, &pep, nak_limit);
220 
-
221 uint8_t USB::InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, uint8_t* data) {
-
222  uint8_t rcode = 0;
-
223  uint8_t pktsize;
-
224 
-
225  uint16_t nbytes = *nbytesptr;
-
226  //printf("Requesting %i bytes ", nbytes);
-
227  uint8_t maxpktsize = pep->maxPktSize;
-
228 
-
229  *nbytesptr = 0;
-
230  regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
+
221  if (rcode) {
+
222  //printf("SetAddress Failed");
+
223  return rcode;
+
224  }
+
225  return InTransfer(pep, nak_limit, nbytesptr, data);
+
226 }
+
227 
+
228 uint8_t USB::InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, uint8_t* data) {
+
229  uint8_t rcode = 0;
+
230  uint8_t pktsize;
231 
-
232  while (1) // use a 'return' to exit this loop
-
233  {
-
234  rcode = dispatchPkt(tokIN, pep->epAddr, nak_limit); //IN packet to EP-'endpoint'. Function takes care of NAKS.
-
235  if (rcode == hrTOGERR) {
-
236  // yes, we flip it wrong here so that next time it is actually correct!
-
237  pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-
238  regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
-
239  continue;
-
240  }
-
241  if (rcode) {
-
242  //printf(">>>>>>>> Problem! dispatchPkt %2.2x\r\n", rcode);
-
243  break; //should be 0, indicating ACK. Else return error code.
-
244  }
-
245  /* check for RCVDAVIRQ and generate error if not present */
-
246  /* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
-
247  if ((regRd(rHIRQ) & bmRCVDAVIRQ) == 0) {
-
248  //printf(">>>>>>>> Problem! NO RCVDAVIRQ!\r\n");
-
249  rcode = 0xf0; //receive error
-
250  break;
+
232  uint16_t nbytes = *nbytesptr;
+
233  //printf("Requesting %i bytes ", nbytes);
+
234  uint8_t maxpktsize = pep->maxPktSize;
+
235 
+
236  *nbytesptr = 0;
+
237  regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
+
238 
+
239  while (1) // use a 'return' to exit this loop
+
240  {
+
241  rcode = dispatchPkt(tokIN, pep->epAddr, nak_limit); //IN packet to EP-'endpoint'. Function takes care of NAKS.
+
242  if (rcode == hrTOGERR) {
+
243  // yes, we flip it wrong here so that next time it is actually correct!
+
244  pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+
245  regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
+
246  continue;
+
247  }
+
248  if (rcode) {
+
249  //printf(">>>>>>>> Problem! dispatchPkt %2.2x\r\n", rcode);
+
250  break; //should be 0, indicating ACK. Else return error code.
251  }
-
252  pktsize = regRd(rRCVBC); //number of received bytes
-
253  //printf("Got %i bytes \r\n", pktsize);
-
254  // This would be OK, but...
-
255  //assert(pktsize <= nbytes);
-
256  if (pktsize > nbytes) {
-
257  // This can happen. Use of assert on Arduino locks up the Arduino.
-
258  // So I will trim the value, and hope for the best.
-
259  //printf(">>>>>>>> Problem! Wanted %i bytes but got %i.\r\n", nbytes, pktsize);
-
260  pktsize = nbytes;
-
261  }
-
262 
-
263  int16_t mem_left = (int16_t)nbytes - *((int16_t*)nbytesptr);
-
264 
-
265  if (mem_left < 0)
-
266  mem_left = 0;
-
267 
-
268  data = bytesRd(rRCVFIFO, ((pktsize > mem_left) ? mem_left : pktsize), data);
+
252  /* check for RCVDAVIRQ and generate error if not present */
+
253  /* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
+
254  if ((regRd(rHIRQ) & bmRCVDAVIRQ) == 0) {
+
255  //printf(">>>>>>>> Problem! NO RCVDAVIRQ!\r\n");
+
256  rcode = 0xf0; //receive error
+
257  break;
+
258  }
+
259  pktsize = regRd(rRCVBC); //number of received bytes
+
260  //printf("Got %i bytes \r\n", pktsize);
+
261  // This would be OK, but...
+
262  //assert(pktsize <= nbytes);
+
263  if (pktsize > nbytes) {
+
264  // This can happen. Use of assert on Arduino locks up the Arduino.
+
265  // So I will trim the value, and hope for the best.
+
266  //printf(">>>>>>>> Problem! Wanted %i bytes but got %i.\r\n", nbytes, pktsize);
+
267  pktsize = nbytes;
+
268  }
269 
-
270  regWr(rHIRQ, bmRCVDAVIRQ); // Clear the IRQ & free the buffer
-
271  *nbytesptr += pktsize; // add this packet's byte count to total transfer length
-
272 
-
273  /* The transfer is complete under two conditions: */
-
274  /* 1. The device sent a short packet (L.T. maxPacketSize) */
-
275  /* 2. 'nbytes' have been transferred. */
-
276  if ((pktsize < maxpktsize) || (*nbytesptr >= nbytes)) // have we transferred 'nbytes' bytes?
-
277  {
-
278  // Save toggle value
-
279  pep->bmRcvToggle = ((regRd(rHRSL) & bmRCVTOGRD)) ? 1 : 0;
-
280  //printf("\r\n");
-
281  rcode = 0;
-
282  break;
-
283  } // if
-
284  } //while( 1 )
-
285  return ( rcode);
-
286 }
-
287 
-
288 /* OUT transfer to arbitrary endpoint. Handles multiple packets if necessary. Transfers 'nbytes' bytes. */
-
289 /* Handles NAK bug per Maxim Application Note 4000 for single buffer transfer */
-
290 
-
291 /* rcode 0 if no errors. rcode 01-0f is relayed from HRSL */
-
292 uint8_t USB::outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data) {
-
293  EpInfo *pep = NULL;
-
294  uint16_t nak_limit = 0;
-
295 
-
296  uint8_t rcode = SetAddress(addr, ep, &pep, nak_limit);
+
270  int16_t mem_left = (int16_t)nbytes - *((int16_t*)nbytesptr);
+
271 
+
272  if (mem_left < 0)
+
273  mem_left = 0;
+
274 
+
275  data = bytesRd(rRCVFIFO, ((pktsize > mem_left) ? mem_left : pktsize), data);
+
276 
+
277  regWr(rHIRQ, bmRCVDAVIRQ); // Clear the IRQ & free the buffer
+
278  *nbytesptr += pktsize; // add this packet's byte count to total transfer length
+
279 
+
280  /* The transfer is complete under two conditions: */
+
281  /* 1. The device sent a short packet (L.T. maxPacketSize) */
+
282  /* 2. 'nbytes' have been transferred. */
+
283  if ((pktsize < maxpktsize) || (*nbytesptr >= nbytes)) // have we transferred 'nbytes' bytes?
+
284  {
+
285  // Save toggle value
+
286  pep->bmRcvToggle = ((regRd(rHRSL) & bmRCVTOGRD)) ? 1 : 0;
+
287  //printf("\r\n");
+
288  rcode = 0;
+
289  break;
+
290  } // if
+
291  } //while( 1 )
+
292  return ( rcode);
+
293 }
+
294 
+
295 /* OUT transfer to arbitrary endpoint. Handles multiple packets if necessary. Transfers 'nbytes' bytes. */
+
296 /* Handles NAK bug per Maxim Application Note 4000 for single buffer transfer */
297 
-
298  if (rcode)
-
299  return rcode;
-
300 
-
301  return OutTransfer(pep, nak_limit, nbytes, data);
-
302 }
-
303 
-
304 uint8_t USB::OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data) {
-
305  uint8_t rcode = hrSUCCESS, retry_count;
-
306  uint8_t *data_p = data; //local copy of the data pointer
-
307  uint16_t bytes_tosend, nak_count;
-
308  uint16_t bytes_left = nbytes;
-
309 
-
310  uint8_t maxpktsize = pep->maxPktSize;
-
311 
-
312  if (maxpktsize < 1 || maxpktsize > 64)
-
313  return USB_ERROR_INVALID_MAX_PKT_SIZE;
-
314 
-
315  unsigned long timeout = millis() + USB_XFER_TIMEOUT;
+
298 /* rcode 0 if no errors. rcode 01-0f is relayed from HRSL */
+
299 uint8_t USB::outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data) {
+
300  EpInfo *pep = NULL;
+
301  uint16_t nak_limit = 0;
+
302 
+
303  uint8_t rcode = SetAddress(addr, ep, &pep, nak_limit);
+
304 
+
305  if (rcode)
+
306  return rcode;
+
307 
+
308  return OutTransfer(pep, nak_limit, nbytes, data);
+
309 }
+
310 
+
311 uint8_t USB::OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data) {
+
312  uint8_t rcode = hrSUCCESS, retry_count;
+
313  uint8_t *data_p = data; //local copy of the data pointer
+
314  uint16_t bytes_tosend, nak_count;
+
315  uint16_t bytes_left = nbytes;
316 
-
317  regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
+
317  uint8_t maxpktsize = pep->maxPktSize;
318 
-
319  while (bytes_left) {
-
320  retry_count = 0;
-
321  nak_count = 0;
-
322  bytes_tosend = (bytes_left >= maxpktsize) ? maxpktsize : bytes_left;
-
323  bytesWr(rSNDFIFO, bytes_tosend, data_p); //filling output FIFO
-
324  regWr(rSNDBC, bytes_tosend); //set number of bytes
-
325  regWr(rHXFR, (tokOUT | pep->epAddr)); //dispatch packet
-
326  while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
-
327  regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
-
328  rcode = (regRd(rHRSL) & 0x0f);
-
329 
-
330  while (rcode && (timeout > millis())) {
-
331  switch (rcode) {
-
332  case hrNAK:
-
333  nak_count++;
-
334  if (nak_limit && (nak_count == nak_limit))
-
335  goto breakout;
-
336  //return ( rcode);
-
337  break;
-
338  case hrTIMEOUT:
-
339  retry_count++;
-
340  if (retry_count == USB_RETRY_LIMIT)
-
341  goto breakout;
-
342  //return ( rcode);
-
343  break;
-
344  case hrTOGERR:
-
345  // yes, we flip it wrong here so that next time it is actually correct!
-
346  pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-
347  regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
-
348  break;
-
349  default:
-
350  goto breakout;
-
351  }//switch( rcode
-
352 
-
353  /* process NAK according to Host out NAK bug */
-
354  regWr(rSNDBC, 0);
-
355  regWr(rSNDFIFO, *data_p);
-
356  regWr(rSNDBC, bytes_tosend);
-
357  regWr(rHXFR, (tokOUT | pep->epAddr)); //dispatch packet
-
358  while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
-
359  regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
-
360  rcode = (regRd(rHRSL) & 0x0f);
-
361  }//while( rcode && ....
-
362  bytes_left -= bytes_tosend;
-
363  data_p += bytes_tosend;
-
364  }//while( bytes_left...
-
365 breakout:
-
366 
-
367  pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 1 : 0; //bmSNDTOG1 : bmSNDTOG0; //update toggle
-
368  return ( rcode); //should be 0 in all cases
-
369 }
-
370 /* dispatch USB packet. Assumes peripheral address is set and relevant buffer is loaded/empty */
-
371 /* If NAK, tries to re-send up to nak_limit times */
-
372 /* If nak_limit == 0, do not count NAKs, exit after timeout */
-
373 /* If bus timeout, re-sends up to USB_RETRY_LIMIT times */
-
374 
-
375 /* return codes 0x00-0x0f are HRSLT( 0x00 being success ), 0xff means timeout */
-
376 uint8_t USB::dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit) {
-
377  unsigned long timeout = millis() + USB_XFER_TIMEOUT;
-
378  uint8_t tmpdata;
-
379  uint8_t rcode = hrSUCCESS;
-
380  uint8_t retry_count = 0;
-
381  uint16_t nak_count = 0;
-
382 
-
383  while (timeout > millis()) {
-
384  regWr(rHXFR, (token | ep)); //launch the transfer
-
385  rcode = USB_ERROR_TRANSFER_TIMEOUT;
-
386 
-
387  while (timeout > millis()) //wait for transfer completion
-
388  {
-
389  tmpdata = regRd(rHIRQ);
-
390 
-
391  if (tmpdata & bmHXFRDNIRQ) {
-
392  regWr(rHIRQ, bmHXFRDNIRQ); //clear the interrupt
-
393  rcode = 0x00;
-
394  break;
-
395  }//if( tmpdata & bmHXFRDNIRQ
-
396 
-
397  }//while ( millis() < timeout
-
398 
-
399  //if (rcode != 0x00) //exit if timeout
-
400  // return ( rcode);
-
401 
-
402  rcode = (regRd(rHRSL) & 0x0f); //analyze transfer result
+
319  if (maxpktsize < 1 || maxpktsize > 64)
+
320  return USB_ERROR_INVALID_MAX_PKT_SIZE;
+
321 
+
322  unsigned long timeout = millis() + USB_XFER_TIMEOUT;
+
323 
+
324  regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
+
325 
+
326  while (bytes_left) {
+
327  retry_count = 0;
+
328  nak_count = 0;
+
329  bytes_tosend = (bytes_left >= maxpktsize) ? maxpktsize : bytes_left;
+
330  bytesWr(rSNDFIFO, bytes_tosend, data_p); //filling output FIFO
+
331  regWr(rSNDBC, bytes_tosend); //set number of bytes
+
332  regWr(rHXFR, (tokOUT | pep->epAddr)); //dispatch packet
+
333  while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
+
334  regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
+
335  rcode = (regRd(rHRSL) & 0x0f);
+
336 
+
337  while (rcode && (timeout > millis())) {
+
338  switch (rcode) {
+
339  case hrNAK:
+
340  nak_count++;
+
341  if (nak_limit && (nak_count == nak_limit))
+
342  goto breakout;
+
343  //return ( rcode);
+
344  break;
+
345  case hrTIMEOUT:
+
346  retry_count++;
+
347  if (retry_count == USB_RETRY_LIMIT)
+
348  goto breakout;
+
349  //return ( rcode);
+
350  break;
+
351  case hrTOGERR:
+
352  // yes, we flip it wrong here so that next time it is actually correct!
+
353  pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+
354  regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
+
355  break;
+
356  default:
+
357  goto breakout;
+
358  }//switch( rcode
+
359 
+
360  /* process NAK according to Host out NAK bug */
+
361  regWr(rSNDBC, 0);
+
362  regWr(rSNDFIFO, *data_p);
+
363  regWr(rSNDBC, bytes_tosend);
+
364  regWr(rHXFR, (tokOUT | pep->epAddr)); //dispatch packet
+
365  while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
+
366  regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
+
367  rcode = (regRd(rHRSL) & 0x0f);
+
368  }//while( rcode && ....
+
369  bytes_left -= bytes_tosend;
+
370  data_p += bytes_tosend;
+
371  }//while( bytes_left...
+
372 breakout:
+
373 
+
374  pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 1 : 0; //bmSNDTOG1 : bmSNDTOG0; //update toggle
+
375  return ( rcode); //should be 0 in all cases
+
376 }
+
377 /* dispatch USB packet. Assumes peripheral address is set and relevant buffer is loaded/empty */
+
378 /* If NAK, tries to re-send up to nak_limit times */
+
379 /* If nak_limit == 0, do not count NAKs, exit after timeout */
+
380 /* If bus timeout, re-sends up to USB_RETRY_LIMIT times */
+
381 
+
382 /* return codes 0x00-0x0f are HRSLT( 0x00 being success ), 0xff means timeout */
+
383 uint8_t USB::dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit) {
+
384  unsigned long timeout = millis() + USB_XFER_TIMEOUT;
+
385  uint8_t tmpdata;
+
386  uint8_t rcode = hrSUCCESS;
+
387  uint8_t retry_count = 0;
+
388  uint16_t nak_count = 0;
+
389 
+
390  while (timeout > millis()) {
+
391  regWr(rHXFR, (token | ep)); //launch the transfer
+
392  rcode = USB_ERROR_TRANSFER_TIMEOUT;
+
393 
+
394  while (timeout > millis()) //wait for transfer completion
+
395  {
+
396  tmpdata = regRd(rHIRQ);
+
397 
+
398  if (tmpdata & bmHXFRDNIRQ) {
+
399  regWr(rHIRQ, bmHXFRDNIRQ); //clear the interrupt
+
400  rcode = 0x00;
+
401  break;
+
402  }//if( tmpdata & bmHXFRDNIRQ
403 
-
404  switch (rcode) {
-
405  case hrNAK:
-
406  nak_count++;
-
407  if (nak_limit && (nak_count == nak_limit))
-
408  return (rcode);
-
409  break;
-
410  case hrTIMEOUT:
-
411  retry_count++;
-
412  if (retry_count == USB_RETRY_LIMIT)
-
413  return (rcode);
-
414  break;
-
415  default:
-
416  return (rcode);
-
417  }//switch( rcode
-
418 
-
419  }//while( timeout > millis()
-
420  return ( rcode);
-
421 }
-
422 
-
423 /* USB main task. Performs enumeration/cleanup */
-
424 void USB::Task(void) //USB state machine
-
425 {
-
426  uint8_t rcode;
-
427  uint8_t tmpdata;
-
428  static unsigned long delay = 0;
-
429  //USB_DEVICE_DESCRIPTOR buf;
-
430  bool lowspeed = false;
-
431 
-
432  MAX3421E::Task();
-
433 
-
434  tmpdata = getVbusState();
-
435 
-
436  /* modify USB task state if Vbus changed */
-
437  switch (tmpdata) {
-
438  case SE1: //illegal state
-
439  usb_task_state = USB_DETACHED_SUBSTATE_ILLEGAL;
-
440  lowspeed = false;
-
441  break;
-
442  case SE0: //disconnected
-
443  if ((usb_task_state & USB_STATE_MASK) != USB_STATE_DETACHED)
-
444  usb_task_state = USB_DETACHED_SUBSTATE_INITIALIZE;
-
445  lowspeed = false;
-
446  break;
-
447  case LSHOST:
-
448  if ((usb_task_state & USB_STATE_MASK) == USB_STATE_DETACHED) {
-
449  lowspeed = true;
-
450  }
-
451  case FSHOST: //attached
-
452  if ((usb_task_state & USB_STATE_MASK) == USB_STATE_DETACHED) {
-
453  delay = millis() + USB_SETTLE_DELAY;
-
454  usb_task_state = USB_ATTACHED_SUBSTATE_SETTLE;
-
455  }
-
456  break;
-
457  }// switch( tmpdata
-
458 
-
459  for (uint8_t i = 0; i < USB_NUMDEVICES; i++)
-
460  if (devConfig[i])
-
461  rcode = devConfig[i]->Poll();
-
462 
-
463  switch (usb_task_state) {
-
464  case USB_DETACHED_SUBSTATE_INITIALIZE:
-
465  init();
-
466 
-
467  for (uint8_t i = 0; i < USB_NUMDEVICES; i++)
-
468  if (devConfig[i])
-
469  rcode = devConfig[i]->Release();
-
470 
-
471  usb_task_state = USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE;
-
472  break;
-
473  case USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE: //just sit here
-
474  break;
-
475  case USB_DETACHED_SUBSTATE_ILLEGAL: //just sit here
-
476  break;
-
477  case USB_ATTACHED_SUBSTATE_SETTLE: //settle time for just attached device
-
478  if (delay < millis())
-
479  usb_task_state = USB_ATTACHED_SUBSTATE_RESET_DEVICE;
-
480  break;
-
481  case USB_ATTACHED_SUBSTATE_RESET_DEVICE:
-
482  regWr(rHCTL, bmBUSRST); //issue bus reset
-
483  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE;
-
484  break;
-
485  case USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE:
-
486  if ((regRd(rHCTL) & bmBUSRST) == 0) {
-
487  tmpdata = regRd(rMODE) | bmSOFKAENAB; //start SOF generation
-
488  regWr(rMODE, tmpdata);
-
489  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_SOF;
-
490  //delay = millis() + 20; //20ms wait after reset per USB spec
-
491  }
-
492  break;
-
493  case USB_ATTACHED_SUBSTATE_WAIT_SOF: //todo: change check order
-
494  if (regRd(rHIRQ) & bmFRAMEIRQ) {
-
495  //when first SOF received _and_ 20ms has passed we can continue
-
496  /*
-
497  if (delay < millis()) //20ms passed
-
498  usb_task_state = USB_STATE_CONFIGURING;
-
499  */
-
500  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_RESET;
-
501  delay = millis() + 20;
-
502  }
-
503  break;
-
504  case USB_ATTACHED_SUBSTATE_WAIT_RESET:
-
505  if (delay < millis()) usb_task_state = USB_STATE_CONFIGURING;
-
506  break;
-
507  case USB_STATE_CONFIGURING:
-
508  rcode = Configuring(0, 0, lowspeed);
-
509 
-
510  if (rcode) {
-
511  if (rcode != USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE) {
-
512  usb_error = rcode;
-
513  usb_task_state = USB_STATE_ERROR;
-
514  }
-
515  } else
-
516  usb_task_state = USB_STATE_RUNNING;
-
517  break;
-
518  case USB_STATE_RUNNING:
-
519  break;
-
520  case USB_STATE_ERROR:
-
521  //MAX3421E::Init();
-
522  break;
-
523  } // switch( usb_task_state )
-
524 }
-
525 
-
526 uint8_t USB::DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed) {
-
527  //uint8_t buf[12];
-
528  uint8_t rcode;
-
529  UsbDevice *p0 = NULL, *p = NULL;
-
530 
-
531  // Get pointer to pseudo device with address 0 assigned
-
532  p0 = addrPool.GetUsbDevicePtr(0);
-
533 
-
534  if (!p0)
-
535  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+
404  }//while ( millis() < timeout
+
405 
+
406  //if (rcode != 0x00) //exit if timeout
+
407  // return ( rcode);
+
408 
+
409  rcode = (regRd(rHRSL) & 0x0f); //analyze transfer result
+
410 
+
411  switch (rcode) {
+
412  case hrNAK:
+
413  nak_count++;
+
414  if (nak_limit && (nak_count == nak_limit))
+
415  return (rcode);
+
416  break;
+
417  case hrTIMEOUT:
+
418  retry_count++;
+
419  if (retry_count == USB_RETRY_LIMIT)
+
420  return (rcode);
+
421  break;
+
422  default:
+
423  return (rcode);
+
424  }//switch( rcode
+
425 
+
426  }//while( timeout > millis()
+
427  return ( rcode);
+
428 }
+
429 
+
430 /* USB main task. Performs enumeration/cleanup */
+
431 void USB::Task(void) //USB state machine
+
432 {
+
433  uint8_t rcode;
+
434  uint8_t tmpdata;
+
435  static unsigned long delay = 0;
+
436  //USB_DEVICE_DESCRIPTOR buf;
+
437  bool lowspeed = false;
+
438 
+
439  MAX3421E::Task();
+
440 
+
441  tmpdata = getVbusState();
+
442 
+
443  /* modify USB task state if Vbus changed */
+
444  switch (tmpdata) {
+
445  case SE1: //illegal state
+
446  usb_task_state = USB_DETACHED_SUBSTATE_ILLEGAL;
+
447  lowspeed = false;
+
448  break;
+
449  case SE0: //disconnected
+
450  if ((usb_task_state & USB_STATE_MASK) != USB_STATE_DETACHED)
+
451  usb_task_state = USB_DETACHED_SUBSTATE_INITIALIZE;
+
452  lowspeed = false;
+
453  break;
+
454  case LSHOST:
+
455  // if ((usb_task_state & USB_STATE_MASK) == USB_STATE_DETACHED) {
+
456  lowspeed = true;
+
457  // }
+
458  case FSHOST: //attached
+
459  if ((usb_task_state & USB_STATE_MASK) == USB_STATE_DETACHED) {
+
460  delay = millis() + USB_SETTLE_DELAY;
+
461  usb_task_state = USB_ATTACHED_SUBSTATE_SETTLE;
+
462  }
+
463  break;
+
464  }// switch( tmpdata
+
465 
+
466  for (uint8_t i = 0; i < USB_NUMDEVICES; i++)
+
467  if (devConfig[i])
+
468  rcode = devConfig[i]->Poll();
+
469 
+
470  switch (usb_task_state) {
+
471  case USB_DETACHED_SUBSTATE_INITIALIZE:
+
472  init();
+
473 
+
474  for (uint8_t i = 0; i < USB_NUMDEVICES; i++)
+
475  if (devConfig[i])
+
476  rcode = devConfig[i]->Release();
+
477 
+
478  usb_task_state = USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE;
+
479  break;
+
480  case USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE: //just sit here
+
481  break;
+
482  case USB_DETACHED_SUBSTATE_ILLEGAL: //just sit here
+
483  break;
+
484  case USB_ATTACHED_SUBSTATE_SETTLE: //settle time for just attached device
+
485  if (delay < millis())
+
486  usb_task_state = USB_ATTACHED_SUBSTATE_RESET_DEVICE;
+
487  break;
+
488  case USB_ATTACHED_SUBSTATE_RESET_DEVICE:
+
489  regWr(rHCTL, bmBUSRST); //issue bus reset
+
490  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE;
+
491  break;
+
492  case USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE:
+
493  if ((regRd(rHCTL) & bmBUSRST) == 0) {
+
494  tmpdata = regRd(rMODE) | bmSOFKAENAB; //start SOF generation
+
495  regWr(rMODE, tmpdata);
+
496  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_SOF;
+
497  //delay = millis() + 20; //20ms wait after reset per USB spec
+
498  }
+
499  break;
+
500  case USB_ATTACHED_SUBSTATE_WAIT_SOF: //todo: change check order
+
501  if (regRd(rHIRQ) & bmFRAMEIRQ) {
+
502  //when first SOF received _and_ 20ms has passed we can continue
+
503  /*
+
504  if (delay < millis()) //20ms passed
+
505  usb_task_state = USB_STATE_CONFIGURING;
+
506  */
+
507  usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_RESET;
+
508  delay = millis() + 20;
+
509  }
+
510  break;
+
511  case USB_ATTACHED_SUBSTATE_WAIT_RESET:
+
512  if (delay < millis()) usb_task_state = USB_STATE_CONFIGURING;
+
513  break;
+
514  case USB_STATE_CONFIGURING:
+
515 
+
516  //Serial.print("\r\nConf.LS: ");
+
517  //Serial.println(lowspeed, HEX);
+
518 
+
519  rcode = Configuring(0, 0, lowspeed);
+
520 
+
521  if (rcode) {
+
522  if (rcode != USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE) {
+
523  usb_error = rcode;
+
524  usb_task_state = USB_STATE_ERROR;
+
525  }
+
526  } else
+
527  usb_task_state = USB_STATE_RUNNING;
+
528  break;
+
529  case USB_STATE_RUNNING:
+
530  break;
+
531  case USB_STATE_ERROR:
+
532  //MAX3421E::Init();
+
533  break;
+
534  } // switch( usb_task_state )
+
535 }
536 
-
537  if (!p0->epinfo)
-
538  return USB_ERROR_EPINFO_IS_NULL;
-
539 
-
540  p0->lowspeed = (lowspeed) ? true : false;
+
537 uint8_t USB::DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed) {
+
538  //uint8_t buf[12];
+
539  uint8_t rcode;
+
540  UsbDevice *p0 = NULL, *p = NULL;
541 
-
542  // Allocate new address according to device class
-
543  uint8_t bAddress = addrPool.AllocAddress(parent, false, port);
+
542  // Get pointer to pseudo device with address 0 assigned
+
543  p0 = addrPool.GetUsbDevicePtr(0);
544 
-
545  if (!bAddress)
-
546  return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
+
545  if (!p0)
+
546  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
547 
-
548  p = addrPool.GetUsbDevicePtr(bAddress);
-
549 
-
550  if (!p)
-
551  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+
548  if (!p0->epinfo)
+
549  return USB_ERROR_EPINFO_IS_NULL;
+
550 
+
551  p0->lowspeed = (lowspeed) ? true : false;
552 
-
553  p->lowspeed = lowspeed;
-
554 
-
555  // Assign new address to the device
-
556  rcode = setAddr(0, 0, bAddress);
-
557 
-
558  if (rcode) {
-
559  addrPool.FreeAddress(bAddress);
-
560  bAddress = 0;
-
561  return rcode;
-
562  }
-
563  return 0;
-
564 };
+
553  // Allocate new address according to device class
+
554  uint8_t bAddress = addrPool.AllocAddress(parent, false, port);
+
555 
+
556  if (!bAddress)
+
557  return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
+
558 
+
559  p = addrPool.GetUsbDevicePtr(bAddress);
+
560 
+
561  if (!p)
+
562  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+
563 
+
564  p->lowspeed = lowspeed;
565 
-
566 /*
-
567  * This is broken. We need to enumerate differently.
-
568  * It causes major problems with several devices if detected in an unexpected order.
-
569  *
-
570  *
-
571  * Oleg - I wouldn't do anything before the newly connected device is considered sane.
-
572  * i.e.(delays are not indicated for brevity):
-
573  * 1. reset
-
574  * 2. GetDevDescr();
-
575  * 3a. If ACK, continue with allocating address, addressing, etc.
-
576  * 3b. Else reset again, count resets, stop at some number (5?).
-
577  * 4. When max.number of resets is reached, toggle power/fail
-
578  * If desired, this could be modified by performing two resets with GetDevDescr() in the middle - however, from my experience, if a device answers to GDD()
-
579  * it doesn't need to be reset again
-
580  * New steps proposal:
-
581  * 1: get address pool instance. exit on fail
-
582  * 2: pUsb->getDevDescr(0, 0, constBufSize, (uint8_t*)buf). exit on fail.
-
583  * 3: bus reset, 100ms delay
-
584  * 4: set address
-
585  * 5: pUsb->setEpInfoEntry(bAddress, 1, epInfo), exit on fail
-
586  * 6: while (configurations) {
-
587  * for(each configuration) {
-
588  * for (each driver) {
-
589  * 6a: Ask device if it likes configuration. Returns 0 on OK.
-
590  * If successful, the driver configured device.
-
591  * The driver now owns the endpoints, and takes over managing them.
-
592  * The following will need codes:
-
593  * Everything went well, instance consumed, exit with success.
-
594  * Instance already in use, ignore it, try next driver.
-
595  * Not a supported device, ignore it, try next driver.
-
596  * Not a supported configuration for this device, ignore it, try next driver.
-
597  * Could not configure device, fatal, exit with fail.
-
598  * }
-
599  * }
-
600  * }
-
601  * 7: for(each driver) {
-
602  * 7a: Ask device if it knows this VID/PID. Acts exactly like 6a, but using VID/PID
-
603  * 8: if we get here, no driver likes the device plugged in, so exit failure.
-
604  *
-
605  */
-
606 uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
-
607  uint8_t rcode = 0;
-
608 
-
609  for (; devConfigIndex < USB_NUMDEVICES; devConfigIndex++) {
-
610  if (!devConfig[devConfigIndex])
-
611  continue;
-
612 
-
613  rcode = devConfig[devConfigIndex]->ConfigureDevice(parent, port, lowspeed);
-
614  if (rcode == USB_ERROR_CONFIG_REQUIRES_ADDITIONAL_RESET) {
-
615  if (parent == 0) {
-
616  // Send a bus reset on the root interface.
-
617  regWr(rHCTL, bmBUSRST); //issue bus reset
-
618  delay(102); // delay 102ms, compensate for clock inaccuracy.
-
619  } /* else {
-
620  * @Oleg
-
621  * TO-DO:
-
622  * How do we do an individual bus reset on a child interface?
-
623  * Is that even possible with the current code?
-
624  */
-
625  }
-
626  rcode = devConfig[devConfigIndex]->Init(parent, port, lowspeed);
-
627  if (!rcode) {
-
628  devConfigIndex = 0;
-
629  return 0;
-
630  }
-
631  //printf("ERROR ENUMERATING %2.2x\r\n", rcode);
-
632  if (!(rcode == USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED || rcode == USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE)) {
-
633  // in case of an error dev_index should be reset to 0
-
634  // in order to start from the very beginning the
-
635  // next time the program gets here
-
636  if (rcode != USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE)
-
637  devConfigIndex = 0;
-
638  return rcode;
-
639  }
-
640  }
-
641  // if we get here that means that the device class is not supported by any of registered classes
-
642  devConfigIndex = 0;
-
643 
-
644  rcode = DefaultAddressing(parent, port, lowspeed);
+
566  // Assign new address to the device
+
567  rcode = setAddr(0, 0, bAddress);
+
568 
+
569  if (rcode) {
+
570  addrPool.FreeAddress(bAddress);
+
571  bAddress = 0;
+
572  return rcode;
+
573  }
+
574  return 0;
+
575 };
+
576 
+
577 uint8_t USB::AttemptConfig(uint8_t driver, uint8_t parent, uint8_t port, bool lowspeed) {
+
578  uint8_t rcode = 0;
+
579  //printf("AttemptConfig: parent = %i, port = %i\r\n", parent, port);
+
580 
+
581  rcode = devConfig[driver]->ConfigureDevice(parent, port, lowspeed);
+
582  if (rcode == USB_ERROR_CONFIG_REQUIRES_ADDITIONAL_RESET) {
+
583  if (parent == 0) {
+
584  // Send a bus reset on the root interface.
+
585  regWr(rHCTL, bmBUSRST); //issue bus reset
+
586  delay(102); // delay 102ms, compensate for clock inaccuracy.
+
587  } else {
+
588  // reset parent port
+
589  devConfig[parent]->ResetHubPort(port);
+
590  }
+
591  }
+
592  rcode = devConfig[driver]->Init(parent, port, lowspeed);
+
593  return rcode;
+
594 }
+
595 
+
596 /*
+
597  * This is broken. We need to enumerate differently.
+
598  * It causes major problems with several devices if detected in an unexpected order.
+
599  *
+
600  *
+
601  * Oleg - I wouldn't do anything before the newly connected device is considered sane.
+
602  * i.e.(delays are not indicated for brevity):
+
603  * 1. reset
+
604  * 2. GetDevDescr();
+
605  * 3a. If ACK, continue with allocating address, addressing, etc.
+
606  * 3b. Else reset again, count resets, stop at some number (5?).
+
607  * 4. When max.number of resets is reached, toggle power/fail
+
608  * If desired, this could be modified by performing two resets with GetDevDescr() in the middle - however, from my experience, if a device answers to GDD()
+
609  * it doesn't need to be reset again
+
610  * New steps proposal:
+
611  * 1: get address pool instance. exit on fail
+
612  * 2: pUsb->getDevDescr(0, 0, constBufSize, (uint8_t*)buf). exit on fail.
+
613  * 3: bus reset, 100ms delay
+
614  * 4: set address
+
615  * 5: pUsb->setEpInfoEntry(bAddress, 1, epInfo), exit on fail
+
616  * 6: while (configurations) {
+
617  * for(each configuration) {
+
618  * for (each driver) {
+
619  * 6a: Ask device if it likes configuration. Returns 0 on OK.
+
620  * If successful, the driver configured device.
+
621  * The driver now owns the endpoints, and takes over managing them.
+
622  * The following will need codes:
+
623  * Everything went well, instance consumed, exit with success.
+
624  * Instance already in use, ignore it, try next driver.
+
625  * Not a supported device, ignore it, try next driver.
+
626  * Not a supported configuration for this device, ignore it, try next driver.
+
627  * Could not configure device, fatal, exit with fail.
+
628  * }
+
629  * }
+
630  * }
+
631  * 7: for(each driver) {
+
632  * 7a: Ask device if it knows this VID/PID. Acts exactly like 6a, but using VID/PID
+
633  * 8: if we get here, no driver likes the device plugged in, so exit failure.
+
634  *
+
635  */
+
636 uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
+
637  //uint8_t bAddress = 0;
+
638  //printf("Configuring: parent = %i, port = %i\r\n", parent, port);
+
639  uint8_t devConfigIndex;
+
640  uint8_t rcode = 0;
+
641  uint8_t buf[sizeof (USB_DEVICE_DESCRIPTOR)];
+
642  UsbDevice *p = NULL;
+
643  EpInfo *oldep_ptr = NULL;
+
644  EpInfo epInfo;
645 
-
646  return rcode;
-
647 }
-
648 
-
649 uint8_t USB::ReleaseDevice(uint8_t addr) {
-
650  if (!addr)
-
651  return 0;
-
652 
-
653  for (uint8_t i = 0; i < USB_NUMDEVICES; i++)
-
654  if (devConfig[i]->GetAddress() == addr)
-
655  return devConfig[i]->Release();
-
656 
-
657  return 0;
-
658 }
+
646  epInfo.epAddr = 0;
+
647  epInfo.maxPktSize = 8;
+
648  epInfo.epAttribs = 0;
+
649  epInfo.bmNakPower = USB_NAK_MAX_POWER;
+
650 
+
651  delay(2000);
+
652  AddressPool &addrPool = GetAddressPool();
+
653  // Get pointer to pseudo device with address 0 assigned
+
654  p = addrPool.GetUsbDevicePtr(0);
+
655  if (!p) {
+
656  //printf("Configuring error: USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL\r\n");
+
657  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+
658  }
659 
-
660 #if 1
-
661 //get device descriptor
-
662 
-
663 uint8_t USB::getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr) {
-
664  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, 0x00, USB_DESCRIPTOR_DEVICE, 0x0000, nbytes, nbytes, dataptr, NULL));
-
665 }
-
666 //get configuration descriptor
+
660  // Save old pointer to EP_RECORD of address 0
+
661  oldep_ptr = p->epinfo;
+
662 
+
663  // Temporary assign new pointer to epInfo to p->epinfo in order to
+
664  // avoid toggle inconsistence
+
665 
+
666  p->epinfo = &epInfo;
667 
-
668 uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr) {
-
669  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, nbytes, nbytes, dataptr, NULL));
-
670 }
+
668  p->lowspeed = lowspeed;
+
669  // Get device descriptor
+
670  rcode = getDevDescr(0, 0, sizeof (USB_DEVICE_DESCRIPTOR), (uint8_t*)buf);
671 
-
672 uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint8_t conf, USBReadParser *p) {
-
673  const uint8_t bufSize = 64;
-
674  uint8_t buf[bufSize];
-
675 
-
676  uint8_t ret = getConfDescr(addr, ep, 8, conf, buf);
-
677 
-
678  if (ret)
-
679  return ret;
-
680 
-
681  uint16_t total = ((USB_CONFIGURATION_DESCRIPTOR*)buf)->wTotalLength;
-
682 
-
683  //USBTRACE2("\r\ntotal conf.size:", total);
-
684 
-
685  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, total, bufSize, buf, p));
-
686 }
-
687 
-
688 //get string descriptor
-
689 
-
690 uint8_t USB::getStrDescr(uint8_t addr, uint8_t ep, uint16_t ns, uint8_t index, uint16_t langid, uint8_t* dataptr) {
-
691  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, index, USB_DESCRIPTOR_STRING, langid, ns, ns, dataptr, NULL));
-
692 }
-
693 //set address
-
694 
-
695 uint8_t USB::setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr) {
-
696  return ( ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
-
697 }
-
698 //set configuration
-
699 
-
700 uint8_t USB::setConf(uint8_t addr, uint8_t ep, uint8_t conf_value) {
-
701  return ( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
-
702 }
+
672  // Restore p->epinfo
+
673  p->epinfo = oldep_ptr;
+
674 
+
675  if (rcode) {
+
676  //printf("Configuring error: Can't get USB_DEVICE_DESCRIPTOR\r\n");
+
677  return rcode;
+
678  }
+
679 
+
680  // to-do?
+
681  // Allocate new address according to device class
+
682  //bAddress = addrPool.AllocAddress(parent, false, port);
+
683 
+
684  //if (!bAddress)
+
685  // return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
+
686 
+
687  uint16_t vid = (uint16_t)((USB_DEVICE_DESCRIPTOR*)buf)->idVendor;
+
688  uint16_t pid = (uint16_t)((USB_DEVICE_DESCRIPTOR*)buf)->idProduct;
+
689  uint8_t klass = ((USB_DEVICE_DESCRIPTOR*)buf)->bDeviceClass;
+
690 
+
691  // Attempt to configure if VID/PID or device class matches with a driver
+
692  for (devConfigIndex = 0; devConfigIndex < USB_NUMDEVICES; devConfigIndex++) {
+
693  if (!devConfig[devConfigIndex]) continue; // no driver
+
694  if (devConfig[devConfigIndex]->GetAddress()) continue; // consumed
+
695  if (devConfig[devConfigIndex]->VIDPIDOK(vid, pid)) {
+
696  rcode = AttemptConfig(devConfigIndex, parent, port, lowspeed);
+
697  break;
+
698  } else if (devConfig[devConfigIndex]->DEVCLASSOK(klass)) {
+
699  rcode = AttemptConfig(devConfigIndex, parent, port, lowspeed);
+
700  if (!rcode) break;
+
701  }
+
702  }
703 
-
704 #endif // defined(USB_METHODS_INLINE)
-
705 
+
704  if (devConfigIndex < USB_NUMDEVICES) {
+
705  return rcode;
+
706  }
+
707 
+
708 
+
709  // blindly attempt to configure
+
710  for (devConfigIndex = 0; devConfigIndex < USB_NUMDEVICES; devConfigIndex++) {
+
711  if (!devConfig[devConfigIndex]) continue;
+
712  if (devConfig[devConfigIndex]->GetAddress()) continue; // consumed
+
713  rcode = AttemptConfig(devConfigIndex, parent, port, lowspeed);
+
714 
+
715  //printf("ERROR ENUMERATING %2.2x\r\n", rcode);
+
716  if (!(rcode == USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED || rcode == USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE)) {
+
717  // in case of an error dev_index should be reset to 0
+
718  // in order to start from the very beginning the
+
719  // next time the program gets here
+
720  //if (rcode != USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE)
+
721  // devConfigIndex = 0;
+
722  return rcode;
+
723  }
+
724  }
+
725  // if we get here that means that the device class is not supported by any of registered classes
+
726  rcode = DefaultAddressing(parent, port, lowspeed);
+
727 
+
728  return rcode;
+
729 }
+
730 
+
731 uint8_t USB::ReleaseDevice(uint8_t addr) {
+
732  if (!addr)
+
733  return 0;
+
734 
+
735  for (uint8_t i = 0; i < USB_NUMDEVICES; i++) {
+
736  if(!devConfig[i]) continue;
+
737  if (devConfig[i]->GetAddress() == addr)
+
738  return devConfig[i]->Release();
+
739  }
+
740  return 0;
+
741 }
+
742 
+
743 #if 1
+
744 //get device descriptor
+
745 
+
746 uint8_t USB::getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr) {
+
747  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, 0x00, USB_DESCRIPTOR_DEVICE, 0x0000, nbytes, nbytes, dataptr, NULL));
+
748 }
+
749 //get configuration descriptor
+
750 
+
751 uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr) {
+
752  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, nbytes, nbytes, dataptr, NULL));
+
753 }
+
754 
+
755 uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint8_t conf, USBReadParser *p) {
+
756  const uint8_t bufSize = 64;
+
757  uint8_t buf[bufSize];
+
758 
+
759  uint8_t ret = getConfDescr(addr, ep, 8, conf, buf);
+
760 
+
761  if (ret)
+
762  return ret;
+
763 
+
764  uint16_t total = ((USB_CONFIGURATION_DESCRIPTOR*)buf)->wTotalLength;
+
765 
+
766  //USBTRACE2("\r\ntotal conf.size:", total);
+
767 
+
768  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, total, bufSize, buf, p));
+
769 }
+
770 
+
771 //get string descriptor
+
772 
+
773 uint8_t USB::getStrDescr(uint8_t addr, uint8_t ep, uint16_t ns, uint8_t index, uint16_t langid, uint8_t* dataptr) {
+
774  return ( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, index, USB_DESCRIPTOR_STRING, langid, ns, ns, dataptr, NULL));
+
775 }
+
776 //set address
+
777 
+
778 uint8_t USB::setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr) {
+
779  return ( ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
+
780 }
+
781 //set configuration
+
782 
+
783 uint8_t USB::setConf(uint8_t addr, uint8_t ep, uint8_t conf_value) {
+
784  return ( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
+
785 }
+
786 
+
787 #endif // defined(USB_METHODS_INLINE)
+
788 
diff --git a/_usb_8h.html b/_usb_8h.html index e84722f8..d134fad4 100644 --- a/_usb_8h.html +++ b/_usb_8h.html @@ -132,9 +132,9 @@ Classes - + - + @@ -270,7 +270,7 @@ Typedefs - +

Macros

#define USBTRACE(s)   (Notify(PSTR(s), 0x80))
#define USBTRACE(s)   (Notify(PSTR(s), 0x80))
 
#define USBTRACE2(s, r)   (Notify(PSTR(s), 0x80), PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80))
#define USBTRACE2(s, r)   (Notify(PSTR(s), 0x80), D_PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80))
 
#define bmREQ_GET_DESCR   USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_STANDARD|USB_SETUP_RECIPIENT_DEVICE
 
(   s)   (Notify(PSTR(s), 0x80))   (Notify(PSTR(s), 0x80))
@@ -298,7 +298,7 @@ Typedefs ) -    (Notify(PSTR(s), 0x80), PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80)) +    (Notify(PSTR(s), 0x80), D_PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80))
diff --git a/_usb_8h_source.html b/_usb_8h_source.html index 2b80902c..53fca001 100644 --- a/_usb_8h_source.html +++ b/_usb_8h_source.html @@ -151,7 +151,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
60 
61 //Debug macros. In 1.0 it is possible to move strings to PROGMEM by defining USBTRACE (USB_HOST_SERIAL.print(F(s)))
62 #define USBTRACE(s) (Notify(PSTR(s), 0x80))
-
63 #define USBTRACE2(s,r) (Notify(PSTR(s), 0x80), PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80))
+
63 #define USBTRACE2(s,r) (Notify(PSTR(s), 0x80), D_PrintHex((r), 0x80), Notify(PSTR("\r\n"), 0x80))
64 
65 
66 
@@ -232,152 +232,156 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
141 
142 class USBDeviceConfig {
143 public:
-
144  virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed) = 0;
+
144  virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed) { return 0; }
145  virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed) {return 0; }
-
146  virtual uint8_t Release() = 0;
-
147  virtual uint8_t Poll() = 0;
-
148  virtual uint8_t GetAddress() = 0;
-
149 };
-
150 
-
151 /* USB Setup Packet Structure */
-
152 typedef struct {
+
146  virtual uint8_t Release() { return 0; }
+
147  virtual uint8_t Poll() { return 0; }
+
148  virtual uint8_t GetAddress() { return 0; }
+
149  virtual void ResetHubPort(uint8_t port) { return; } // Note used for hubs only!
+
150  virtual boolean VIDPIDOK(uint16_t vid, uint16_t pid) { return false; }
+
151  virtual boolean DEVCLASSOK(uint8_t klass) { return false; }
+
152 };
153 
-
154  union { // offset description
-
155  uint8_t bmRequestType; // 0 Bit-map of request type
+
154 /* USB Setup Packet Structure */
+
155 typedef struct {
156 
-
157  struct {
-
158  uint8_t recipient : 5; // Recipient of the request
-
159  uint8_t type : 2; // Type of request
-
160  uint8_t direction : 1; // Direction of data X-fer
-
161  } __attribute__((packed));
-
162  } ReqType_u;
-
163  uint8_t bRequest; // 1 Request
-
164 
-
165  union {
-
166  uint16_t wValue; // 2 Depends on bRequest
+
157  union { // offset description
+
158  uint8_t bmRequestType; // 0 Bit-map of request type
+
159 
+
160  struct {
+
161  uint8_t recipient : 5; // Recipient of the request
+
162  uint8_t type : 2; // Type of request
+
163  uint8_t direction : 1; // Direction of data X-fer
+
164  } __attribute__((packed));
+
165  } ReqType_u;
+
166  uint8_t bRequest; // 1 Request
167 
-
168  struct {
-
169  uint8_t wValueLo;
-
170  uint8_t wValueHi;
-
171  } __attribute__((packed));
-
172  } wVal_u;
-
173  uint16_t wIndex; // 4 Depends on bRequest
-
174  uint16_t wLength; // 6 Depends on bRequest
-
175 } SETUP_PKT, *PSETUP_PKT __attribute__((packed));
-
176 
-
177 
-
178 
-
179 // Base class for incoming data parser
+
168  union {
+
169  uint16_t wValue; // 2 Depends on bRequest
+
170 
+
171  struct {
+
172  uint8_t wValueLo;
+
173  uint8_t wValueHi;
+
174  } __attribute__((packed));
+
175  } wVal_u;
+
176  uint16_t wIndex; // 4 Depends on bRequest
+
177  uint16_t wLength; // 6 Depends on bRequest
+
178 } SETUP_PKT, *PSETUP_PKT __attribute__((packed));
+
179 
180 
-
181 class USBReadParser {
-
182 public:
-
183  virtual void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset) = 0;
-
184 };
-
185 
-
186 class USB : public MAX3421E {
-
187  AddressPoolImpl<USB_NUMDEVICES> addrPool;
-
188  USBDeviceConfig* devConfig[USB_NUMDEVICES];
-
189  uint8_t devConfigIndex;
-
190  uint8_t bmHubPre;
-
191 
-
192 public:
-
193  USB(void);
+
181 
+
182 // Base class for incoming data parser
+
183 
+
184 class USBReadParser {
+
185 public:
+
186  virtual void Parse(const uint16_t len, const uint8_t *pbuf, const uint16_t &offset) = 0;
+
187 };
+
188 
+
189 class USB : public MAX3421E {
+
190  AddressPoolImpl<USB_NUMDEVICES> addrPool;
+
191  USBDeviceConfig* devConfig[USB_NUMDEVICES];
+
192  //uint8_t devConfigIndex;
+
193  uint8_t bmHubPre;
194 
-
195  void SetHubPreMask() {
-
196  bmHubPre |= bmHUBPRE;
-
197  };
-
198 
-
199  void ResetHubPreMask() {
-
200  bmHubPre &= (~bmHUBPRE);
-
201  };
-
202 
-
203  AddressPool& GetAddressPool() {
-
204  return(AddressPool&) addrPool;
-
205  };
-
206 
-
207  uint8_t RegisterDeviceClass(USBDeviceConfig *pdev) {
-
208  for(uint8_t i = 0; i < USB_NUMDEVICES; i++) {
-
209  if(!devConfig[i]) {
-
210  devConfig[i] = pdev;
-
211  return 0;
-
212  }
-
213  }
-
214  return USB_ERROR_UNABLE_TO_REGISTER_DEVICE_CLASS;
-
215  };
-
216 
-
217  void ForEachUsbDevice(UsbDeviceHandleFunc pfunc) {
-
218  addrPool.ForEachUsbDevice(pfunc);
-
219  };
-
220  uint8_t getUsbTaskState(void);
-
221  void setUsbTaskState(uint8_t state);
-
222 
-
223  EpInfo* getEpInfoEntry(uint8_t addr, uint8_t ep);
-
224  uint8_t setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo* eprecord_ptr);
+
195 public:
+
196  USB(void);
+
197 
+
198  void SetHubPreMask() {
+
199  bmHubPre |= bmHUBPRE;
+
200  };
+
201 
+
202  void ResetHubPreMask() {
+
203  bmHubPre &= (~bmHUBPRE);
+
204  };
+
205 
+
206  AddressPool& GetAddressPool() {
+
207  return(AddressPool&) addrPool;
+
208  };
+
209 
+
210  uint8_t RegisterDeviceClass(USBDeviceConfig *pdev) {
+
211  for(uint8_t i = 0; i < USB_NUMDEVICES; i++) {
+
212  if(!devConfig[i]) {
+
213  devConfig[i] = pdev;
+
214  return 0;
+
215  }
+
216  }
+
217  return USB_ERROR_UNABLE_TO_REGISTER_DEVICE_CLASS;
+
218  };
+
219 
+
220  void ForEachUsbDevice(UsbDeviceHandleFunc pfunc) {
+
221  addrPool.ForEachUsbDevice(pfunc);
+
222  };
+
223  uint8_t getUsbTaskState(void);
+
224  void setUsbTaskState(uint8_t state);
225 
-
226  //uint8_t ctrlReq( uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi, uint16_t wInd, uint16_t nbytes, uint8_t* dataptr);
-
227 
-
228  /* Control requests */
-
229  uint8_t getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr);
-
230  uint8_t getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr);
-
231 
-
232  uint8_t getConfDescr(uint8_t addr, uint8_t ep, uint8_t conf, USBReadParser *p);
-
233 
-
234  uint8_t getStrDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t index, uint16_t langid, uint8_t* dataptr);
-
235  uint8_t setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr);
-
236  uint8_t setConf(uint8_t addr, uint8_t ep, uint8_t conf_value);
-
237 
-
238  uint8_t ctrlData(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr, boolean direction);
-
239  uint8_t ctrlStatus(uint8_t ep, boolean direction, uint16_t nak_limit);
-
240  uint8_t inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t* data);
-
241  uint8_t outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data);
-
242  uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit);
-
243 
-
244  void Task(void);
-
245 
-
246  uint8_t DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed);
-
247  uint8_t Configuring(uint8_t parent, uint8_t port, bool lowspeed);
-
248  uint8_t ReleaseDevice(uint8_t addr);
-
249 
-
250  uint8_t ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi,
-
251  uint16_t wInd, uint16_t total, uint16_t nbytes, uint8_t* dataptr, USBReadParser *p);
+
226  EpInfo* getEpInfoEntry(uint8_t addr, uint8_t ep);
+
227  uint8_t setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo* eprecord_ptr);
+
228 
+
229  //uint8_t ctrlReq( uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi, uint16_t wInd, uint16_t nbytes, uint8_t* dataptr);
+
230 
+
231  /* Control requests */
+
232  uint8_t getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr);
+
233  uint8_t getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr);
+
234 
+
235  uint8_t getConfDescr(uint8_t addr, uint8_t ep, uint8_t conf, USBReadParser *p);
+
236 
+
237  uint8_t getStrDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t index, uint16_t langid, uint8_t* dataptr);
+
238  uint8_t setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr);
+
239  uint8_t setConf(uint8_t addr, uint8_t ep, uint8_t conf_value);
+
240 
+
241  uint8_t ctrlData(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr, boolean direction);
+
242  uint8_t ctrlStatus(uint8_t ep, boolean direction, uint16_t nak_limit);
+
243  uint8_t inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t* data);
+
244  uint8_t outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* data);
+
245  uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit);
+
246 
+
247  void Task(void);
+
248 
+
249  uint8_t DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed);
+
250  uint8_t Configuring(uint8_t parent, uint8_t port, bool lowspeed);
+
251  uint8_t ReleaseDevice(uint8_t addr);
252 
-
253 private:
-
254  void init();
-
255  uint8_t SetAddress(uint8_t addr, uint8_t ep, EpInfo **ppep, uint16_t &nak_limit);
-
256  uint8_t OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data);
-
257  uint8_t InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, uint8_t *data);
-
258 };
-
259 
-
260 #if 0 //defined(USB_METHODS_INLINE)
-
261 //get device descriptor
-
262 
-
263 inline uint8_t USB::getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr) {
-
264  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, 0x00, USB_DESCRIPTOR_DEVICE, 0x0000, nbytes, dataptr));
-
265 }
-
266 //get configuration descriptor
-
267 
-
268 inline uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr) {
-
269  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, nbytes, dataptr));
-
270 }
-
271 //get string descriptor
-
272 
-
273 inline uint8_t USB::getStrDescr(uint8_t addr, uint8_t ep, uint16_t nuint8_ts, uint8_t index, uint16_t langid, uint8_t* dataptr) {
-
274  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, index, USB_DESCRIPTOR_STRING, langid, nuint8_ts, dataptr));
-
275 }
-
276 //set address
-
277 
-
278 inline uint8_t USB::setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr) {
-
279  return( ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, NULL));
-
280 }
-
281 //set configuration
-
282 
-
283 inline uint8_t USB::setConf(uint8_t addr, uint8_t ep, uint8_t conf_value) {
-
284  return( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, NULL));
-
285 }
+
253  uint8_t ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bRequest, uint8_t wValLo, uint8_t wValHi,
+
254  uint16_t wInd, uint16_t total, uint16_t nbytes, uint8_t* dataptr, USBReadParser *p);
+
255 
+
256 private:
+
257  void init();
+
258  uint8_t SetAddress(uint8_t addr, uint8_t ep, EpInfo **ppep, uint16_t &nak_limit);
+
259  uint8_t OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data);
+
260  uint8_t InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, uint8_t *data);
+
261  uint8_t AttemptConfig(uint8_t driver, uint8_t parent, uint8_t port, bool lowspeed);
+
262 };
+
263 
+
264 #if 0 //defined(USB_METHODS_INLINE)
+
265 //get device descriptor
+
266 
+
267 inline uint8_t USB::getDevDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dataptr) {
+
268  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, 0x00, USB_DESCRIPTOR_DEVICE, 0x0000, nbytes, dataptr));
+
269 }
+
270 //get configuration descriptor
+
271 
+
272 inline uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t conf, uint8_t* dataptr) {
+
273  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, conf, USB_DESCRIPTOR_CONFIGURATION, 0x0000, nbytes, dataptr));
+
274 }
+
275 //get string descriptor
+
276 
+
277 inline uint8_t USB::getStrDescr(uint8_t addr, uint8_t ep, uint16_t nuint8_ts, uint8_t index, uint16_t langid, uint8_t* dataptr) {
+
278  return( ctrlReq(addr, ep, bmREQ_GET_DESCR, USB_REQUEST_GET_DESCRIPTOR, index, USB_DESCRIPTOR_STRING, langid, nuint8_ts, dataptr));
+
279 }
+
280 //set address
+
281 
+
282 inline uint8_t USB::setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr) {
+
283  return( ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, NULL));
+
284 }
+
285 //set configuration
286 
-
287 #endif // defined(USB_METHODS_INLINE)
-
288 
-
289 #endif //_usb_h_
+
287 inline uint8_t USB::setConf(uint8_t addr, uint8_t ep, uint8_t conf_value) {
+
288  return( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, NULL));
+
289 }
+
290 
+
291 #endif // defined(USB_METHODS_INLINE)
+
292 
+
293 #endif //_usb_h_
diff --git a/_wii_8cpp_source.html b/_wii_8cpp_source.html index 449bd049..9294a52f 100644 --- a/_wii_8cpp_source.html +++ b/_wii_8cpp_source.html @@ -210,7 +210,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
119 void WII::disconnect() { // Use this void to disconnect any of the controllers
120  if (motionPlusConnected && !pBtd->motionPlusInside) { // Disable the Motion Plus extension
121 #ifdef DEBUG_USB_HOST
-
122  Notify(PSTR("\r\nDeactivating Motion Plus"), 0x80);
+
122  Notify(PSTR("\r\nDeactivating Motion Plus"), 0x80);
123 #endif
124  initExtension1(); // This will disable the Motion Plus extension
125  }
@@ -236,18 +236,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
145  if ((l2capinbuf[6] | (l2capinbuf[7] << 8)) == 0x0001) { //l2cap_control - Channel ID for ACL-U
146  if (l2capinbuf[8] == L2CAP_CMD_COMMAND_REJECT) {
147 #ifdef DEBUG_USB_HOST
-
148  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
-
149  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
150  Notify(PSTR(" "), 0x80);
-
151  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
152  Notify(PSTR(" "), 0x80);
-
153  PrintHex<uint8_t > (l2capinbuf[17], 0x80);
-
154  Notify(PSTR(" "), 0x80);
-
155  PrintHex<uint8_t > (l2capinbuf[16], 0x80);
-
156  Notify(PSTR(" "), 0x80);
-
157  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
158  Notify(PSTR(" "), 0x80);
-
159  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
148  Notify(PSTR("\r\nL2CAP Command Rejected - Reason: "), 0x80);
+
149  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
150  Notify(PSTR(" "), 0x80);
+
151  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
152  Notify(PSTR(" "), 0x80);
+
153  D_PrintHex<uint8_t > (l2capinbuf[17], 0x80);
+
154  Notify(PSTR(" "), 0x80);
+
155  D_PrintHex<uint8_t > (l2capinbuf[16], 0x80);
+
156  Notify(PSTR(" "), 0x80);
+
157  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
158  Notify(PSTR(" "), 0x80);
+
159  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
160 #endif
161  } else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_RESPONSE) {
162  if (((l2capinbuf[16] | (l2capinbuf[17] << 8)) == 0x0000) && ((l2capinbuf[18] | (l2capinbuf[19] << 8)) == SUCCESSFUL)) { // Success
@@ -267,16 +267,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
176  }
177  } else if (l2capinbuf[8] == L2CAP_CMD_CONNECTION_REQUEST) {
178 #ifdef EXTRADEBUG
-
179  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
-
180  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
181  Notify(PSTR(" "), 0x80);
-
182  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
-
183  Notify(PSTR(" SCID: "), 0x80);
-
184  PrintHex<uint8_t > (l2capinbuf[15], 0x80);
-
185  Notify(PSTR(" "), 0x80);
-
186  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
-
187  Notify(PSTR(" Identifier: "), 0x80);
-
188  PrintHex<uint8_t > (l2capinbuf[9], 0x80);
+
179  Notify(PSTR("\r\nL2CAP Connection Request - PSM: "), 0x80);
+
180  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
181  Notify(PSTR(" "), 0x80);
+
182  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
183  Notify(PSTR(" SCID: "), 0x80);
+
184  D_PrintHex<uint8_t > (l2capinbuf[15], 0x80);
+
185  Notify(PSTR(" "), 0x80);
+
186  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
187  Notify(PSTR(" Identifier: "), 0x80);
+
188  D_PrintHex<uint8_t > (l2capinbuf[9], 0x80);
189 #endif
190  if ((l2capinbuf[12] | (l2capinbuf[13] << 8)) == HID_CTRL_PSM) {
191  identifier = l2capinbuf[9];
@@ -312,14 +312,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
221  } else if (l2capinbuf[8] == L2CAP_CMD_DISCONNECT_REQUEST) {
222  if (l2capinbuf[12] == control_dcid[0] && l2capinbuf[13] == control_dcid[1]) {
223 #ifdef DEBUG_USB_HOST
-
224  Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
+
224  Notify(PSTR("\r\nDisconnect Request: Control Channel"), 0x80);
225 #endif
226  identifier = l2capinbuf[9];
227  pBtd->l2cap_disconnection_response(hci_handle, identifier, control_dcid, control_scid);
228  Reset();
229  } else if (l2capinbuf[12] == interrupt_dcid[0] && l2capinbuf[13] == interrupt_dcid[1]) {
230 #ifdef DEBUG_USB_HOST
-
231  Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
+
231  Notify(PSTR("\r\nDisconnect Request: Interrupt Channel"), 0x80);
232 #endif
233  identifier = l2capinbuf[9];
234  pBtd->l2cap_disconnection_response(hci_handle, identifier, interrupt_dcid, interrupt_scid);
@@ -339,8 +339,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
248 #ifdef EXTRADEBUG
249  else {
250  identifier = l2capinbuf[9];
-
251  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
-
252  PrintHex<uint8_t > (l2capinbuf[8], 0x80);
+
251  Notify(PSTR("\r\nL2CAP Unknown Signaling Command: "), 0x80);
+
252  D_PrintHex<uint8_t > (l2capinbuf[8], 0x80);
253  }
254 #endif
255  } else if (l2capinbuf[6] == interrupt_dcid[0] && l2capinbuf[7] == interrupt_dcid[1]) { // l2cap_interrupt
@@ -364,9 +364,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
273  else if (!unknownExtensionConnected)
274  ButtonState = (uint32_t)((l2capinbuf[10] & 0x1F) | ((uint16_t)(l2capinbuf[11] & 0x9F) << 8));
275 #ifdef PRINTREPORT
-
276  Notify(PSTR("ButtonState: "), 0x80);
-
277  PrintHex<uint32_t > (ButtonState, 0x80);
-
278  Notify(PSTR("\r\n"), 0x80);
+
276  Notify(PSTR("ButtonState: "), 0x80);
+
277  D_PrintHex<uint32_t > (ButtonState, 0x80);
+
278  Notify(PSTR("\r\n"), 0x80);
279 #endif
280  if (ButtonState != OldButtonState) {
281  ButtonClickState = ButtonState & ~OldButtonState; // Update click state variable
@@ -386,13 +386,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
295  batteryLevel = l2capinbuf[15]; // Update battery level
296  if (l2capinbuf[12] & 0x01) {
297 #ifdef DEBUG_USB_HOST
-
298  Notify(PSTR("\r\nWARNING: Battery is nearly empty"), 0x80);
+
298  Notify(PSTR("\r\nWARNING: Battery is nearly empty"), 0x80);
299 #endif
300  }
301  if (l2capinbuf[12] & 0x02) { // Check if a extension is connected
302 #ifdef DEBUG_USB_HOST
303  if (!unknownExtensionConnected)
-
304  Notify(PSTR("\r\nExtension connected"), 0x80);
+
304  Notify(PSTR("\r\nExtension connected"), 0x80);
305 #endif
306  unknownExtensionConnected = true;
307 #ifdef WIICAMERA
@@ -401,11 +401,11 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
310  setReportMode(false, 0x35); // Also read the extension
311  } else {
312 #ifdef DEBUG_USB_HOST
-
313  Notify(PSTR("\r\nExtension disconnected"), 0x80);
+
313  Notify(PSTR("\r\nExtension disconnected"), 0x80);
314 #endif
315  if (motionPlusConnected) {
316 #ifdef DEBUG_USB_HOST
-
317  Notify(PSTR(" - from Motion Plus"), 0x80);
+
317  Notify(PSTR(" - from Motion Plus"), 0x80);
318 #endif
319  l2cap_event_flag &= ~WII_FLAG_NUNCHUCK_CONNECTED;
320  if (!activateNunchuck) // If it's already trying to initialize the Nunchuck don't set it to false
@@ -413,7 +413,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
322  //else if(classicControllerConnected)
323  } else if (nunchuckConnected) {
324 #ifdef DEBUG_USB_HOST
-
325  Notify(PSTR(" - Nunchuck"), 0x80);
+
325  Notify(PSTR(" - Nunchuck"), 0x80);
326 #endif
327  nunchuckConnected = false; // It must be the Nunchuck controller then
328  l2cap_event_flag &= ~WII_FLAG_NUNCHUCK_CONNECTED;
@@ -429,64 +429,64 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
338  // See: http://wiibrew.org/wiki/Wiimote/Extension_Controllers
339  if (l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x00 && l2capinbuf[20] == 0x00) {
340 #ifdef DEBUG_USB_HOST
-
341  Notify(PSTR("\r\nNunchuck connected"), 0x80);
+
341  Notify(PSTR("\r\nNunchuck connected"), 0x80);
342 #endif
343  l2cap_event_flag |= WII_FLAG_NUNCHUCK_CONNECTED;
344  } else if (l2capinbuf[16] == 0x00 && (l2capinbuf[17] == 0xA6 || l2capinbuf[17] == 0xA4) && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x00 && l2capinbuf[20] == 0x05) {
345 #ifdef DEBUG_USB_HOST
-
346  Notify(PSTR("\r\nMotion Plus connected"), 0x80);
+
346  Notify(PSTR("\r\nMotion Plus connected"), 0x80);
347 #endif
348  l2cap_event_flag |= WII_FLAG_MOTION_PLUS_CONNECTED;
349  } else if (l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x04 && l2capinbuf[20] == 0x05) {
350 #ifdef DEBUG_USB_HOST
-
351  Notify(PSTR("\r\nMotion Plus activated in normal mode"), 0x80);
+
351  Notify(PSTR("\r\nMotion Plus activated in normal mode"), 0x80);
352 #endif
353  motionPlusConnected = true;
354  } else if (l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x05 && l2capinbuf[20] == 0x05) {
355 #ifdef DEBUG_USB_HOST
-
356  Notify(PSTR("\r\nMotion Plus activated in Nunchuck pass-through mode"), 0x80);
+
356  Notify(PSTR("\r\nMotion Plus activated in Nunchuck pass-through mode"), 0x80);
357 #endif
358  activateNunchuck = false;
359  motionPlusConnected = true;
360  nunchuckConnected = true;
361  } else if (l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA6 && l2capinbuf[18] == 0x20 && (l2capinbuf[19] == 0x00 || l2capinbuf[19] == 0x04 || l2capinbuf[19] == 0x05 || l2capinbuf[19] == 0x07) && l2capinbuf[20] == 0x05) {
362 #ifdef DEBUG_USB_HOST
-
363  Notify(PSTR("\r\nInactive Wii Motion Plus"), 0x80);
-
364  Notify(PSTR("\r\nPlease unplug the Motion Plus, disconnect the Wiimote and then replug the Motion Plus Extension"), 0x80);
+
363  Notify(PSTR("\r\nInactive Wii Motion Plus"), 0x80);
+
364  Notify(PSTR("\r\nPlease unplug the Motion Plus, disconnect the Wiimote and then replug the Motion Plus Extension"), 0x80);
365 #endif
366  stateCounter = 300; // Skip the rest in "L2CAP_CHECK_MOTION_PLUS_STATE"
367  } else if (l2capinbuf[16] == 0x00 && l2capinbuf[17] == 0xA4 && l2capinbuf[18] == 0x20 && l2capinbuf[19] == 0x01 && l2capinbuf[20] == 0x20) {
368 #ifdef DEBUG_USB_HOST
-
369  Notify(PSTR("\r\nWii U Pro Controller connected"), 0x80);
+
369  Notify(PSTR("\r\nWii U Pro Controller connected"), 0x80);
370 #endif
371  wiiUProControllerConnected = true;
372  }
373 #ifdef DEBUG_USB_HOST
374  else {
-
375  Notify(PSTR("\r\nUnknown Device: "), 0x80);
-
376  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
377  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
-
378  Notify(PSTR("\r\nData: "), 0x80);
+
375  Notify(PSTR("\r\nUnknown Device: "), 0x80);
+
376  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
377  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
378  Notify(PSTR("\r\nData: "), 0x80);
379  for (uint8_t i = 0; i < ((l2capinbuf[12] >> 4) + 1); i++) { // bit 4-7 is the length-1
-
380  PrintHex<uint8_t > (l2capinbuf[15 + i], 0x80);
-
381  Notify(PSTR(" "), 0x80);
+
380  D_PrintHex<uint8_t > (l2capinbuf[15 + i], 0x80);
+
381  Notify(PSTR(" "), 0x80);
382  }
383  }
384 #endif
385  }
386 #ifdef EXTRADEBUG
387  else {
-
388  Notify(PSTR("\r\nReport Error: "), 0x80);
-
389  PrintHex<uint8_t > (l2capinbuf[13], 0x80);
-
390  PrintHex<uint8_t > (l2capinbuf[14], 0x80);
+
388  Notify(PSTR("\r\nReport Error: "), 0x80);
+
389  D_PrintHex<uint8_t > (l2capinbuf[13], 0x80);
+
390  D_PrintHex<uint8_t > (l2capinbuf[14], 0x80);
391  }
392 #endif
393  break;
394  case 0x22: // Acknowledge output report, return function result
395 #ifdef DEBUG_USB_HOST
396  if (l2capinbuf[13] != 0x00) { // Check if there is an error
-
397  Notify(PSTR("\r\nCommand failed: "), 0x80);
-
398  PrintHex<uint8_t > (l2capinbuf[12], 0x80);
+
397  Notify(PSTR("\r\nCommand failed: "), 0x80);
+
398  D_PrintHex<uint8_t > (l2capinbuf[12], 0x80);
399  }
400 #endif
401  break;
@@ -588,7 +588,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
497  } else {
498  if ((micros() - timer) > 1000000) { // Loop for 1 sec before resetting the values
499 #ifdef DEBUG_USB_HOST
-
500  Notify(PSTR("\r\nThe gyro values has been reset"), 0x80);
+
500  Notify(PSTR("\r\nThe gyro values has been reset"), 0x80);
501 #endif
502  gyroYawZero = (l2capinbuf[15] | ((l2capinbuf[18] & 0xFC) << 6));
503  gyroRollZero = (l2capinbuf[16] | ((l2capinbuf[19] & 0xFC) << 6));
@@ -623,7 +623,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
532  extensionConnected = true;
533  unknownExtensionConnected = true;
534 #ifdef DEBUG_USB_HOST
-
535  Notify(PSTR("\r\nExtension connected to Motion Plus"), 0x80);
+
535  Notify(PSTR("\r\nExtension connected to Motion Plus"), 0x80);
536 #endif
537  }
538  } else {
@@ -631,7 +631,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
540  extensionConnected = false;
541  unknownExtensionConnected = true;
542 #ifdef DEBUG_USB_HOST
-
543  Notify(PSTR("\r\nExtension disconnected from Motion Plus"), 0x80);
+
543  Notify(PSTR("\r\nExtension disconnected from Motion Plus"), 0x80);
544 #endif
545  nunchuckConnected = false; // There is no extension connected to the Motion Plus if this report is sent
546  }
@@ -657,8 +657,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
566  break;
567 #ifdef DEBUG_USB_HOST
568  default:
-
569  Notify(PSTR("\r\nUnknown Report type: "), 0x80);
-
570  PrintHex<uint8_t > (l2capinbuf[9], 0x80);
+
569  Notify(PSTR("\r\nUnknown Report type: "), 0x80);
+
570  D_PrintHex<uint8_t > (l2capinbuf[9], 0x80);
571  break;
572 #endif
573  }
@@ -675,7 +675,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
584  case L2CAP_CONTROL_SUCCESS:
585  if (l2cap_config_success_control_flag) {
586 #ifdef DEBUG_USB_HOST
-
587  Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
+
587  Notify(PSTR("\r\nHID Control Successfully Configured"), 0x80);
588 #endif
589  l2cap_state = L2CAP_INTERRUPT_SETUP;
590  }
@@ -684,7 +684,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
593  case L2CAP_INTERRUPT_SETUP:
594  if (l2cap_connection_request_interrupt_flag) {
595 #ifdef DEBUG_USB_HOST
-
596  Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
+
596  Notify(PSTR("\r\nHID Interrupt Incoming Connection Request"), 0x80);
597 #endif
598  pBtd->l2cap_connection_response(hci_handle, identifier, interrupt_dcid, interrupt_scid, PENDING);
599  delay(1);
@@ -701,7 +701,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
610  case L2CAP_CONTROL_CONNECT_REQUEST:
611  if (l2cap_connected_control_flag) {
612 #ifdef DEBUG_USB_HOST
-
613  Notify(PSTR("\r\nSend HID Control Config Request"), 0x80);
+
613  Notify(PSTR("\r\nSend HID Control Config Request"), 0x80);
614 #endif
615  identifier++;
616  pBtd->l2cap_config_request(hci_handle, identifier, control_scid);
@@ -712,7 +712,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
621  case L2CAP_CONTROL_CONFIG_REQUEST:
622  if (l2cap_config_success_control_flag) {
623 #ifdef DEBUG_USB_HOST
-
624  Notify(PSTR("\r\nSend HID Interrupt Connection Request"), 0x80);
+
624  Notify(PSTR("\r\nSend HID Interrupt Connection Request"), 0x80);
625 #endif
626  identifier++;
627  pBtd->l2cap_connection_request(hci_handle, identifier, interrupt_dcid, HID_INTR_PSM);
@@ -723,7 +723,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
632  case L2CAP_INTERRUPT_CONNECT_REQUEST:
633  if (l2cap_connected_interrupt_flag) {
634 #ifdef DEBUG_USB_HOST
-
635  Notify(PSTR("\r\nSend HID Interrupt Config Request"), 0x80);
+
635  Notify(PSTR("\r\nSend HID Interrupt Config Request"), 0x80);
636 #endif
637  identifier++;
638  pBtd->l2cap_config_request(hci_handle, identifier, interrupt_scid);
@@ -734,7 +734,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
643  case L2CAP_INTERRUPT_CONFIG_REQUEST:
644  if (l2cap_config_success_interrupt_flag) { // Now the HID channels is established
645 #ifdef DEBUG_USB_HOST
-
646  Notify(PSTR("\r\nHID Channels Established"), 0x80);
+
646  Notify(PSTR("\r\nHID Channels Established"), 0x80);
647 #endif
648  pBtd->connectToWii = false;
649  pBtd->pairWithWii = false;
@@ -749,7 +749,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
658  case L2CAP_INTERRUPT_DISCONNECT:
659  if (l2cap_disconnect_response_interrupt_flag) {
660 #ifdef DEBUG_USB_HOST
-
661  Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
+
661  Notify(PSTR("\r\nDisconnected Interrupt Channel"), 0x80);
662 #endif
663  identifier++;
664  pBtd->l2cap_disconnection_request(hci_handle, identifier, control_scid, control_dcid);
@@ -760,7 +760,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
669  case L2CAP_CONTROL_DISCONNECT:
670  if (l2cap_disconnect_response_control_flag) {
671 #ifdef DEBUG_USB_HOST
-
672  Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
+
672  Notify(PSTR("\r\nDisconnected Control Channel"), 0x80);
673 #endif
674  pBtd->hci_disconnect(hci_handle);
675  hci_handle = -1; // Reset handle
@@ -778,7 +778,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
687  pBtd->l2capConnectionClaimed = true;
688  activeConnection = true;
689 #ifdef DEBUG_USB_HOST
-
690  Notify(PSTR("\r\nSend HID Control Connection Request"), 0x80);
+
690  Notify(PSTR("\r\nSend HID Control Connection Request"), 0x80);
691 #endif
692  hci_handle = pBtd->hci_handle; // Store the HCI Handle for the connection
693  l2cap_event_flag = 0; // Reset flags
@@ -787,7 +787,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
696  l2cap_state = L2CAP_CONTROL_CONNECT_REQUEST;
697  } else if (l2cap_connection_request_control_flag) {
698 #ifdef DEBUG_USB_HOST
-
699  Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
+
699  Notify(PSTR("\r\nHID Control Incoming Connection Request"), 0x80);
700 #endif
701  pBtd->l2cap_connection_response(hci_handle, identifier, control_dcid, control_scid, PENDING);
702  delay(1);
@@ -802,7 +802,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
711  case L2CAP_CHECK_MOTION_PLUS_STATE:
712 #ifdef DEBUG_USB_HOST
713  if (stateCounter == 0) // Only print onnce
-
714  Notify(PSTR("\r\nChecking if a Motion Plus is connected"), 0x80);
+
714  Notify(PSTR("\r\nChecking if a Motion Plus is connected"), 0x80);
715 #endif
716  stateCounter++;
717  if (stateCounter % 200 == 0)
@@ -814,14 +814,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
723 
724  if (unknownExtensionConnected) {
725 #ifdef DEBUG_USB_HOST
-
726  Notify(PSTR("\r\nA extension is also connected"), 0x80);
+
726  Notify(PSTR("\r\nA extension is also connected"), 0x80);
727 #endif
728  activateNunchuck = true; // For we will just set this to true as this the only extension supported so far
729  }
730 
731  } else if (stateCounter == 601) { // We will try three times to check for the motion plus
732 #ifdef DEBUG_USB_HOST
-
733  Notify(PSTR("\r\nNo Motion Plus was detected"), 0x80);
+
733  Notify(PSTR("\r\nNo Motion Plus was detected"), 0x80);
734 #endif
735  stateCounter = 0;
736  l2cap_state = L2CAP_CHECK_EXTENSION_STATE;
@@ -831,7 +831,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
740  case L2CAP_CHECK_EXTENSION_STATE: // This is used to check if there is anything plugged in to the extension port
741 #ifdef DEBUG_USB_HOST
742  if (stateCounter == 0) // Only print onnce
-
743  Notify(PSTR("\r\nChecking if there is any extension connected"), 0x80);
+
743  Notify(PSTR("\r\nChecking if there is any extension connected"), 0x80);
744 #endif
745  stateCounter++; // We use this counter as there has to be a short delay between the commands
746  if (stateCounter == 1)
@@ -878,7 +878,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
787  if (unknownExtensionConnected) {
788 #ifdef DEBUG_USB_HOST
789  if (stateCounter == 0) // Only print once
-
790  Notify(PSTR("\r\nChecking extension port"), 0x80);
+
790  Notify(PSTR("\r\nChecking extension port"), 0x80);
791 #endif
792  stateCounter++; // We will use this counter as there has to be a short delay between the commands
793  if (stateCounter == 50)
@@ -895,7 +895,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
804  else if (stateCounter == 250) {
805  if (nunchuck_connected_flag) {
806 #ifdef DEBUG_USB_HOST
-
807  Notify(PSTR("\r\nNunchuck was reconnected"), 0x80);
+
807  Notify(PSTR("\r\nNunchuck was reconnected"), 0x80);
808 #endif
809  activateNunchuck = true;
810  nunchuckConnected = true;
@@ -905,7 +905,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
814  } else if (stateCounter == 300) {
815  if (motionPlusConnected) {
816 #ifdef DEBUG_USB_HOST
-
817  Notify(PSTR("\r\nReactivating the Motion Plus"), 0x80);
+
817  Notify(PSTR("\r\nReactivating the Motion Plus"), 0x80);
818 #endif
819  initMotionPlus();
820  } else
@@ -1059,19 +1059,19 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
968  uint8_t buf[1];
969  if (pBtd->wiiUProController) {
970 #ifdef DEBUG_USB_HOST
-
971  Notify(PSTR("\r\nActivating Wii U Pro Controller"), 0x80);
+
971  Notify(PSTR("\r\nActivating Wii U Pro Controller"), 0x80);
972 #endif
973  buf[0] = 0x00; // It seems like you can send anything but 0x04, 0x05, and 0x07
974  } else if (activateNunchuck) {
975 #ifdef DEBUG_USB_HOST
-
976  Notify(PSTR("\r\nActivating Motion Plus in pass-through mode"), 0x80);
+
976  Notify(PSTR("\r\nActivating Motion Plus in pass-through mode"), 0x80);
977 #endif
978  buf[0] = 0x05; // Activate nunchuck pass-through mode
979  } //else if(classicControllerConnected && extensionConnected)
980  //buf[0] = 0x07;
981  else {
982 #ifdef DEBUG_USB_HOST
-
983  Notify(PSTR("\r\nActivating Motion Plus in normal mode"), 0x80);
+
983  Notify(PSTR("\r\nActivating Motion Plus in normal mode"), 0x80);
984 #endif
985  buf[0] = 0x04; // Don't use any extension
986  }
@@ -1163,58 +1163,58 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
1072 
1073  enableIRCamera1();
1074 #ifdef DEBUG_USB_HOST
-
1075  Notify(PSTR("\r\nEnable IR Camera1 Complete"), 0x80);
+
1075  Notify(PSTR("\r\nEnable IR Camera1 Complete"), 0x80);
1076 #endif
1077  delay(80);
1078 
1079  enableIRCamera2();
1080 #ifdef DEBUG_USB_HOST
-
1081  Notify(PSTR("\r\nEnable IR Camera2 Complete"), 0x80);
+
1081  Notify(PSTR("\r\nEnable IR Camera2 Complete"), 0x80);
1082 #endif
1083  delay(80);
1084 
1085  write0x08Value();
1086 #ifdef DEBUG_USB_HOST
-
1087  Notify(PSTR("\r\nWrote hex number 0x08"), 0x80);
+
1087  Notify(PSTR("\r\nWrote hex number 0x08"), 0x80);
1088 #endif
1089  delay(80);
1090 
1091  writeSensitivityBlock1();
1092 #ifdef DEBUG_USB_HOST
-
1093  Notify(PSTR("\r\nWrote Sensitivity Block 1"), 0x80);
+
1093  Notify(PSTR("\r\nWrote Sensitivity Block 1"), 0x80);
1094 #endif
1095  delay(80);
1096 
1097  writeSensitivityBlock2();
1098 #ifdef DEBUG_USB_HOST
-
1099  Notify(PSTR("\r\nWrote Sensitivity Block 2"), 0x80);
+
1099  Notify(PSTR("\r\nWrote Sensitivity Block 2"), 0x80);
1100 #endif
1101  delay(80);
1102 
1103  uint8_t mode_num = 0x03;
1104  setWiiModeNumber(mode_num); // Change input for whatever mode you want i.e. 0x01, 0x03, or 0x05
1105 #ifdef DEBUG_USB_HOST
-
1106  Notify(PSTR("\r\nSet Wii Mode Number To 0x"), 0x80);
-
1107  PrintHex<uint8_t > (mode_num, 0x80);
+
1106  Notify(PSTR("\r\nSet Wii Mode Number To 0x"), 0x80);
+
1107  D_PrintHex<uint8_t > (mode_num, 0x80);
1108 #endif
1109  delay(80);
1110 
1111  write0x08Value();
1112 #ifdef DEBUG_USB_HOST
-
1113  Notify(PSTR("\r\nWrote Hex Number 0x08"), 0x80);
+
1113  Notify(PSTR("\r\nWrote Hex Number 0x08"), 0x80);
1114 #endif
1115  delay(80);
1116 
1117  setReportMode(false, 0x33);
1118  //setReportMode(false, 0x3f); // For full reporting mode, doesn't work yet
1119 #ifdef DEBUG_USB_HOST
-
1120  Notify(PSTR("\r\nSet Report Mode to 0x33"), 0x80);
+
1120  Notify(PSTR("\r\nSet Report Mode to 0x33"), 0x80);
1121 #endif
1122  delay(80);
1123 
1124  statusRequest(); // Used to update wiiState - call isIRCameraEnabled() afterwards to check if it actually worked
1125 #ifdef DEBUG_USB_HOST
-
1126  Notify(PSTR("\r\nIR Initialized"), 0x80);
+
1126  Notify(PSTR("\r\nIR Initialized"), 0x80);
1127 #endif
1128 }
1129 
diff --git a/_x_b_o_x_r_e_c_v_8cpp_source.html b/_x_b_o_x_r_e_c_v_8cpp_source.html index 5ed97471..bc5576e9 100644 --- a/_x_b_o_x_r_e_c_v_8cpp_source.html +++ b/_x_b_o_x_r_e_c_v_8cpp_source.html @@ -139,12 +139,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
48  // get memory address of USB device address pool
49  AddressPool &addrPool = pUsb->GetAddressPool();
50 #ifdef EXTRADEBUG
-
51  Notify(PSTR("\r\nXBOXRECV Init"), 0x80);
+
51  Notify(PSTR("\r\nXBOXRECV Init"), 0x80);
52 #endif
53  // check if address has already been assigned to an instance
54  if (bAddress) {
55 #ifdef DEBUG_USB_HOST
-
56  Notify(PSTR("\r\nAddress in use"), 0x80);
+
56  Notify(PSTR("\r\nAddress in use"), 0x80);
57 #endif
58  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
59  }
@@ -154,14 +154,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
63 
64  if (!p) {
65 #ifdef DEBUG_USB_HOST
-
66  Notify(PSTR("\r\nAddress not found"), 0x80);
+
66  Notify(PSTR("\r\nAddress not found"), 0x80);
67 #endif
68  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
69  }
70 
71  if (!p->epinfo) {
72 #ifdef DEBUG_USB_HOST
-
73  Notify(PSTR("\r\nepinfo is null"), 0x80);
+
73  Notify(PSTR("\r\nepinfo is null"), 0x80);
74 #endif
75  return USB_ERROR_EPINFO_IS_NULL;
76  }
@@ -189,7 +189,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
98  goto FailUnknownDevice;
99  else if (PID != XBOX_WIRELESS_RECEIVER_PID && PID != XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID) {
100 #ifdef DEBUG_USB_HOST
-
101  Notify(PSTR("\r\nYou'll need a wireless receiver for this libary to work"), 0x80);
+
101  Notify(PSTR("\r\nYou'll need a wireless receiver for this libary to work"), 0x80);
102 #endif
103  goto FailUnknownDevice;
104  }
@@ -210,14 +210,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
119  addrPool.FreeAddress(bAddress);
120  bAddress = 0;
121 #ifdef DEBUG_USB_HOST
-
122  Notify(PSTR("\r\nsetAddr: "), 0x80);
-
123  PrintHex<uint8_t > (rcode, 0x80);
+
122  Notify(PSTR("\r\nsetAddr: "), 0x80);
+
123  D_PrintHex<uint8_t > (rcode, 0x80);
124 #endif
125  return rcode;
126  }
127 #ifdef EXTRADEBUG
-
128  Notify(PSTR("\r\nAddr: "), 0x80);
-
129  PrintHex<uint8_t > (bAddress, 0x80);
+
128  Notify(PSTR("\r\nAddr: "), 0x80);
+
129  D_PrintHex<uint8_t > (bAddress, 0x80);
130 #endif
131  p->lowspeed = false;
132 
@@ -301,7 +301,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
210  goto FailSetConfDescr;
211 
212 #ifdef DEBUG_USB_HOST
-
213  Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"), 0x80);
+
213  Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"), 0x80);
214 #endif
215  XboxReceiverConnected = true;
216  bPollEnable = true;
@@ -310,32 +310,32 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
219  /* diagnostic messages */
220 FailGetDevDescr:
221 #ifdef DEBUG_USB_HOST
-
222  NotifyFailGetDevDescr();
+
222  NotifyFailGetDevDescr();
223  goto Fail;
224 #endif
225 
226 FailSetDevTblEntry:
227 #ifdef DEBUG_USB_HOST
-
228  NotifyFailSetDevTblEntry();
+
228  NotifyFailSetDevTblEntry();
229  goto Fail;
230 #endif
231 
232 FailSetConfDescr:
233 #ifdef DEBUG_USB_HOST
-
234  NotifyFailSetConfDescr();
+
234  NotifyFailSetConfDescr();
235 #endif
236  goto Fail;
237 
238 FailUnknownDevice:
239 #ifdef DEBUG_USB_HOST
-
240  NotifyFailUnknownDevice(VID,PID);
+
240  NotifyFailUnknownDevice(VID,PID);
241 #endif
242  rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
243 
244 Fail:
245 #ifdef DEBUG_USB_HOST
-
246  Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
-
247  NotifyFail(rcode);
+
246  Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
+
247  NotifyFail(rcode);
248 #endif
249  Release();
250  return rcode;
@@ -376,9 +376,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
285  pUsb->inTransfer(bAddress, epInfo[ inputPipe ].epAddr, &bufferSize, readBuf);
286  if (bufferSize > 0) { // The number of received bytes
287 #ifdef EXTRADEBUG
-
288  Notify(PSTR("Bytes Received: "), 0x80);
-
289  PrintHex<uint16_t > (bufferSize, 0x80);
-
290  Notify(PSTR("\r\n"), 0x80);
+
288  Notify(PSTR("Bytes Received: "), 0x80);
+
289  D_PrintHex<uint16_t > (bufferSize, 0x80);
+
290  Notify(PSTR("\r\n"), 0x80);
291 #endif
292  readReport(i);
293 #ifdef PRINTREPORT
@@ -396,8 +396,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
305  if (readBuf[0] == 0x08 && readBuf[1] != Xbox360Connected[controller]) {
306  Xbox360Connected[controller] = readBuf[1];
307 #ifdef DEBUG_USB_HOST
-
308  Notify(PSTR("Controller "), 0x80);
-
309  Notify(controller, 0x80);
+
308  Notify(PSTR("Controller "), 0x80);
+
309  Notify(controller, 0x80);
310 #endif
311  if (Xbox360Connected[controller]) {
312 #ifdef DEBUG_USB_HOST
@@ -410,8 +410,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
319  case 0xC0: str = PSTR(" as controller+headset\r\n");
320  break;
321  }
-
322  Notify(PSTR(": connected"), 0x80);
-
323  Notify(str, 0x80);
+
322  Notify(PSTR(": connected"), 0x80);
+
323  Notify(str, 0x80);
324 #endif
325  LED led;
326  switch (controller) {
@@ -428,7 +428,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
337  }
338 #ifdef DEBUG_USB_HOST
339  else
-
340  Notify(PSTR(": disconnected\r\n"), 0x80);
+
340  Notify(PSTR(": disconnected\r\n"), 0x80);
341 #endif
342  return;
343  }
@@ -469,14 +469,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
378 #ifdef PRINTREPORT
379  if (readBuf == NULL)
380  return;
-
381  Notify(PSTR("Controller "), 0x80);
-
382  Notify(controller, 0x80);
-
383  Notify(PSTR(": "), 0x80);
+
381  Notify(PSTR("Controller "), 0x80);
+
382  Notify(controller, 0x80);
+
383  Notify(PSTR(": "), 0x80);
384  for (uint8_t i = 0; i < nBytes; i++) {
-
385  PrintHex<uint8_t > (readBuf[i], 0x80);
-
386  Notify(PSTR(" "), 0x80);
+
385  D_PrintHex<uint8_t > (readBuf[i], 0x80);
+
386  Notify(PSTR(" "), 0x80);
387  }
-
388  Notify(PSTR("\r\n"), 0x80);
+
388  Notify(PSTR("\r\n"), 0x80);
389 #endif
390 }
391 
@@ -557,7 +557,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
466  rcode = pUsb->outTransfer(bAddress, epInfo[ outputPipe ].epAddr, nbytes, data);
467 #ifdef EXTRADEBUG
468  if (rcode)
-
469  Notify(PSTR("Error sending Xbox message\r\n"), 0x80);
+
469  Notify(PSTR("Error sending Xbox message\r\n"), 0x80);
470 #endif
471 }
472 
diff --git a/_x_b_o_x_u_s_b_8cpp_source.html b/_x_b_o_x_u_s_b_8cpp_source.html index 69622a26..2ab766b1 100644 --- a/_x_b_o_x_u_s_b_8cpp_source.html +++ b/_x_b_o_x_u_s_b_8cpp_source.html @@ -137,12 +137,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
46  // get memory address of USB device address pool
47  AddressPool &addrPool = pUsb->GetAddressPool();
48 #ifdef EXTRADEBUG
-
49  Notify(PSTR("\r\nXBOXUSB Init"), 0x80);
+
49  Notify(PSTR("\r\nXBOXUSB Init"), 0x80);
50 #endif
51  // check if address has already been assigned to an instance
52  if (bAddress) {
53 #ifdef DEBUG_USB_HOST
-
54  Notify(PSTR("\r\nAddress in use"), 0x80);
+
54  Notify(PSTR("\r\nAddress in use"), 0x80);
55 #endif
56  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
57  }
@@ -152,14 +152,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
61 
62  if (!p) {
63 #ifdef DEBUG_USB_HOST
-
64  Notify(PSTR("\r\nAddress not found"), 0x80);
+
64  Notify(PSTR("\r\nAddress not found"), 0x80);
65 #endif
66  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
67  }
68 
69  if (!p->epinfo) {
70 #ifdef DEBUG_USB_HOST
-
71  Notify(PSTR("\r\nepinfo is null"), 0x80);
+
71  Notify(PSTR("\r\nepinfo is null"), 0x80);
72 #endif
73  return USB_ERROR_EPINFO_IS_NULL;
74  }
@@ -187,12 +187,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
96  goto FailUnknownDevice;
97  if (PID == XBOX_WIRELESS_PID) {
98 #ifdef DEBUG_USB_HOST
-
99  Notify(PSTR("\r\nYou have plugged in a wireless Xbox 360 controller - it doesn't support USB communication"), 0x80);
+
99  Notify(PSTR("\r\nYou have plugged in a wireless Xbox 360 controller - it doesn't support USB communication"), 0x80);
100 #endif
101  goto FailUnknownDevice;
102  } else if (PID == XBOX_WIRELESS_RECEIVER_PID || PID == XBOX_WIRELESS_RECEIVER_THIRD_PARTY_PID) {
103 #ifdef DEBUG_USB_HOST
-
104  Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"), 0x80);
+
104  Notify(PSTR("\r\nThis library only supports Xbox 360 controllers via USB"), 0x80);
105 #endif
106  goto FailUnknownDevice;
107  }
@@ -213,14 +213,14 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
122  addrPool.FreeAddress(bAddress);
123  bAddress = 0;
124 #ifdef DEBUG_USB_HOST
-
125  Notify(PSTR("\r\nsetAddr: "), 0x80);
+
125  Notify(PSTR("\r\nsetAddr: "), 0x80);
126 #endif
-
127  PrintHex<uint8_t > (rcode, 0x80);
+
127  D_PrintHex<uint8_t > (rcode, 0x80);
128  return rcode;
129  }
130 #ifdef EXTRADEBUG
-
131  Notify(PSTR("\r\nAddr: "), 0x80);
-
132  PrintHex<uint8_t > (bAddress, 0x80);
+
131  Notify(PSTR("\r\nAddr: "), 0x80);
+
132  D_PrintHex<uint8_t > (bAddress, 0x80);
133 #endif
134  p->lowspeed = false;
135 
@@ -265,7 +265,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
174  goto FailSetConfDescr;
175 
176 #ifdef DEBUG_USB_HOST
-
177  Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"), 0x80);
+
177  Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"), 0x80);
178 #endif
179  setLedOn(LED1);
180  Xbox360Connected = true;
@@ -275,31 +275,31 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
184  /* diagnostic messages */
185 FailGetDevDescr:
186 #ifdef DEBUG_USB_HOST
-
187  NotifyFailGetDevDescr();
+
187  NotifyFailGetDevDescr();
188  goto Fail;
189 #endif
190 
191 FailSetDevTblEntry:
192 #ifdef DEBUG_USB_HOST
-
193  NotifyFailSetDevTblEntry();
+
193  NotifyFailSetDevTblEntry();
194  goto Fail;
195 #endif
196 
197 FailSetConfDescr:
198 #ifdef DEBUG_USB_HOST
-
199  NotifyFailSetConfDescr();
+
199  NotifyFailSetConfDescr();
200  goto Fail;
201 #endif
202 FailUnknownDevice:
203 #ifdef DEBUG_USB_HOST
-
204  NotifyFailUnknownDevice(VID, PID);
+
204  NotifyFailUnknownDevice(VID, PID);
205 #endif
206  rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
207 
208 Fail:
209 #ifdef DEBUG_USB_HOST
-
210  Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
-
211  NotifyFail(rcode);
+
210  Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
+
211  NotifyFail(rcode);
212 #endif
213  Release();
214  return rcode;
@@ -358,10 +358,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
267  if (readBuf == NULL)
268  return;
269  for (uint8_t i = 0; i < XBOX_REPORT_BUFFER_SIZE; i++) {
-
270  PrintHex<uint8_t > (readBuf[i], 0x80);
-
271  Notify(PSTR(" "), 0x80);
+
270  D_PrintHex<uint8_t > (readBuf[i], 0x80);
+
271  Notify(PSTR(" "), 0x80);
272  }
-
273  Notify(PSTR("\r\n"), 0x80);
+
273  Notify(PSTR("\r\n"), 0x80);
274 #endif
275 }
276 
diff --git a/adk_8cpp_source.html b/adk_8cpp_source.html index 1e9edf1c..5ef0cc30 100644 --- a/adk_8cpp_source.html +++ b/adk_8cpp_source.html @@ -319,25 +319,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
228  /* diagnostic messages */
229 FailGetDevDescr:
230 #ifdef DEBUG_USB_HOST
-
231  NotifyFailGetDevDescr();
+
231  NotifyFailGetDevDescr();
232  goto Fail;
233 #endif
234 
235 FailSetDevTblEntry:
236 #ifdef DEBUG_USB_HOST
-
237  NotifyFailSetDevTblEntry();
+
237  NotifyFailSetDevTblEntry();
238  goto Fail;
239 #endif
240 
241 FailGetConfDescr:
242 #ifdef DEBUG_USB_HOST
-
243  NotifyFailGetConfDescr();
+
243  NotifyFailGetConfDescr();
244  goto Fail;
245 #endif
246 
247 FailSetConfDescr:
248 #ifdef DEBUG_USB_HOST
-
249  NotifyFailSetConfDescr();
+
249  NotifyFailSetConfDescr();
250  goto Fail;
251 #endif
252 
@@ -418,20 +418,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
327 }
328 
329 void ADK::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
-
330  Notify(PSTR("Endpoint descriptor:"), 0x80);
-
331  Notify(PSTR("\r\nLength:\t\t"), 0x80);
-
332  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
-
333  Notify(PSTR("\r\nType:\t\t"), 0x80);
-
334  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
-
335  Notify(PSTR("\r\nAddress:\t"), 0x80);
-
336  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
-
337  Notify(PSTR("\r\nAttributes:\t"), 0x80);
-
338  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
-
339  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
-
340  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
-
341  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
-
342  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
-
343  Notify(PSTR("\r\n"), 0x80);
+
330  Notify(PSTR("Endpoint descriptor:"), 0x80);
+
331  Notify(PSTR("\r\nLength:\t\t"), 0x80);
+
332  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
+
333  Notify(PSTR("\r\nType:\t\t"), 0x80);
+
334  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
+
335  Notify(PSTR("\r\nAddress:\t"), 0x80);
+
336  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
+
337  Notify(PSTR("\r\nAttributes:\t"), 0x80);
+
338  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
+
339  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
+
340  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
+
341  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
+
342  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
+
343  Notify(PSTR("\r\n"), 0x80);
344 }
diff --git a/cdcacm_8cpp_source.html b/cdcacm_8cpp_source.html index d04389a2..ac8762da 100644 --- a/cdcacm_8cpp_source.html +++ b/cdcacm_8cpp_source.html @@ -275,25 +275,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
184 
185 FailGetDevDescr:
186 #ifdef DEBUG_USB_HOST
-
187  NotifyFailGetDevDescr();
+
187  NotifyFailGetDevDescr();
188  goto Fail;
189 #endif
190 
191 FailSetDevTblEntry:
192 #ifdef DEBUG_USB_HOST
-
193  NotifyFailSetDevTblEntry();
+
193  NotifyFailSetDevTblEntry();
194  goto Fail;
195 #endif
196 
197 FailGetConfDescr:
198 #ifdef DEBUG_USB_HOST
-
199  NotifyFailGetConfDescr();
+
199  NotifyFailGetConfDescr();
200  goto Fail;
201 #endif
202 
203 FailSetConfDescr:
204 #ifdef DEBUG_USB_HOST
-
205  NotifyFailSetConfDescr();
+
205  NotifyFailSetConfDescr();
206  goto Fail;
207 #endif
208 
@@ -304,7 +304,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
213 
214 Fail:
215 #ifdef DEBUG_USB_HOST
-
216  NotifyFail(rcode);
+
216  NotifyFail(rcode);
217 #endif
218  Release();
219  return rcode;
@@ -423,20 +423,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
332 }
333 
334 void ACM::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
-
335  Notify(PSTR("Endpoint descriptor:"), 0x80);
-
336  Notify(PSTR("\r\nLength:\t\t"), 0x80);
-
337  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
-
338  Notify(PSTR("\r\nType:\t\t"), 0x80);
-
339  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
-
340  Notify(PSTR("\r\nAddress:\t"), 0x80);
-
341  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
-
342  Notify(PSTR("\r\nAttributes:\t"), 0x80);
-
343  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
-
344  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
-
345  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
-
346  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
-
347  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
-
348  Notify(PSTR("\r\n"), 0x80);
+
335  Notify(PSTR("Endpoint descriptor:"), 0x80);
+
336  Notify(PSTR("\r\nLength:\t\t"), 0x80);
+
337  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
+
338  Notify(PSTR("\r\nType:\t\t"), 0x80);
+
339  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
+
340  Notify(PSTR("\r\nAddress:\t"), 0x80);
+
341  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
+
342  Notify(PSTR("\r\nAttributes:\t"), 0x80);
+
343  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
+
344  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
+
345  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
+
346  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
+
347  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
+
348  Notify(PSTR("\r\n"), 0x80);
349 }
diff --git a/cdcftdi_8cpp_source.html b/cdcftdi_8cpp_source.html index bec1bbef..55fd299e 100644 --- a/cdcftdi_8cpp_source.html +++ b/cdcftdi_8cpp_source.html @@ -270,25 +270,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
179 
180 FailGetDevDescr:
181 #ifdef DEBUG_USB_HOST
-
182  NotifyFailGetDevDescr();
+
182  NotifyFailGetDevDescr();
183  goto Fail;
184 #endif
185 
186 FailSetDevTblEntry:
187 #ifdef DEBUG_USB_HOST
-
188  NotifyFailSetDevTblEntry();
+
188  NotifyFailSetDevTblEntry();
189  goto Fail;
190 #endif
191 
192 FailGetConfDescr:
193 #ifdef DEBUG_USB_HOST
-
194  NotifyFailGetConfDescr();
+
194  NotifyFailGetConfDescr();
195  goto Fail;
196 #endif
197 
198 FailSetConfDescr:
199 #ifdef DEBUG_USB_HOST
-
200  NotifyFailSetConfDescr();
+
200  NotifyFailSetConfDescr();
201  goto Fail;
202 #endif
203 
@@ -299,7 +299,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
208 
209 Fail:
210 #ifdef DEBUG_USB_HOST
-
211  NotifyFail(rcode);
+
211  NotifyFail(rcode);
212 #endif
213  Release();
214  return rcode;
@@ -415,20 +415,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
324 }
325 
326 void FTDI::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
-
327  Notify(PSTR("Endpoint descriptor:"), 0x80);
-
328  Notify(PSTR("\r\nLength:\t\t"), 0x80);
-
329  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
-
330  Notify(PSTR("\r\nType:\t\t"), 0x80);
-
331  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
-
332  Notify(PSTR("\r\nAddress:\t"), 0x80);
-
333  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
-
334  Notify(PSTR("\r\nAttributes:\t"), 0x80);
-
335  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
-
336  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
-
337  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
-
338  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
-
339  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
-
340  Notify(PSTR("\r\n"), 0x80);
+
327  Notify(PSTR("Endpoint descriptor:"), 0x80);
+
328  Notify(PSTR("\r\nLength:\t\t"), 0x80);
+
329  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
+
330  Notify(PSTR("\r\nType:\t\t"), 0x80);
+
331  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
+
332  Notify(PSTR("\r\nAddress:\t"), 0x80);
+
333  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
+
334  Notify(PSTR("\r\nAttributes:\t"), 0x80);
+
335  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
+
336  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
+
337  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
+
338  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
+
339  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
+
340  Notify(PSTR("\r\n"), 0x80);
341 }
diff --git a/cdcprolific_8cpp_source.html b/cdcprolific_8cpp_source.html index e7b0a44c..690bfafc 100644 --- a/cdcprolific_8cpp_source.html +++ b/cdcprolific_8cpp_source.html @@ -242,63 +242,64 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
151 
152  USBTRACE("PL configured\r\n");
153 
-
154  bPollEnable = true;
-
155  return 0;
-
156 
-
157 FailGetDevDescr:
-
158 #ifdef DEBUG_USB_HOST
-
159  NotifyFailGetDevDescr();
-
160  goto Fail;
-
161 #endif
-
162 
-
163 FailSetDevTblEntry:
-
164 #ifdef DEBUG_USB_HOST
-
165  NotifyFailSetDevTblEntry();
-
166  goto Fail;
-
167 #endif
-
168 
-
169 FailGetConfDescr:
-
170 #ifdef DEBUG_USB_HOST
-
171  NotifyFailGetConfDescr();
-
172  goto Fail;
-
173 #endif
-
174 
-
175 FailSetConfDescr:
-
176 #ifdef DEBUG_USB_HOST
-
177  NotifyFailSetConfDescr();
-
178  goto Fail;
-
179 #endif
-
180 
-
181 FailOnInit:
-
182 #ifdef DEBUG_USB_HOST
-
183  USBTRACE("OnInit:");
-
184 #endif
-
185 
-
186 Fail:
-
187 #ifdef DEBUG_USB_HOST
-
188  NotifyFail(rcode);
-
189 #endif
-
190  Release();
-
191  return rcode;
-
192 }
-
193 
-
194 //uint8_t PL::Poll()
-
195 //{
-
196 // uint8_t rcode = 0;
-
197 //
-
198 // //if (!bPollEnable)
-
199 // // return 0;
-
200 //
-
201 // //if (qNextPollTime <= millis())
-
202 // //{
-
203 // // USB_HOST_SERIAL.println(bAddress, HEX);
-
204 //
-
205 // // qNextPollTime = millis() + 100;
-
206 // //}
-
207 // return rcode;
-
208 //}
-
209 
+
154  //bPollEnable = true;
+
155  ready = true;
+
156  return 0;
+
157 
+
158 FailGetDevDescr:
+
159 #ifdef DEBUG_USB_HOST
+
160  NotifyFailGetDevDescr();
+
161  goto Fail;
+
162 #endif
+
163 
+
164 FailSetDevTblEntry:
+
165 #ifdef DEBUG_USB_HOST
+
166  NotifyFailSetDevTblEntry();
+
167  goto Fail;
+
168 #endif
+
169 
+
170 FailGetConfDescr:
+
171 #ifdef DEBUG_USB_HOST
+
172  NotifyFailGetConfDescr();
+
173  goto Fail;
+
174 #endif
+
175 
+
176 FailSetConfDescr:
+
177 #ifdef DEBUG_USB_HOST
+
178  NotifyFailSetConfDescr();
+
179  goto Fail;
+
180 #endif
+
181 
+
182 FailOnInit:
+
183 #ifdef DEBUG_USB_HOST
+
184  USBTRACE("OnInit:");
+
185 #endif
+
186 
+
187 Fail:
+
188 #ifdef DEBUG_USB_HOST
+
189  NotifyFail(rcode);
+
190 #endif
+
191  Release();
+
192  return rcode;
+
193 }
+
194 
+
195 //uint8_t PL::Poll()
+
196 //{
+
197 // uint8_t rcode = 0;
+
198 //
+
199 // //if (!bPollEnable)
+
200 // // return 0;
+
201 //
+
202 // //if (qNextPollTime <= millis())
+
203 // //{
+
204 // // USB_HOST_SERIAL.println(bAddress, HEX);
+
205 //
+
206 // // qNextPollTime = millis() + 100;
+
207 // //}
+
208 // return rcode;
+
209 //}
210 
+
211 
diff --git a/class_a_c_m-members.html b/class_a_c_m-members.html index c002486b..30a4317f 100644 --- a/class_a_c_m-members.html +++ b/class_a_c_m-members.html @@ -99,30 +99,33 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); bPollEnableACMprotected ClearCommFeature(uint16_t fid)ACM ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual - EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ACMvirtual - epDataInIndexACMprotectedstatic - epDataOutIndexACMprotectedstatic - epInfoACMprotected - epInterruptInIndexACMprotectedstatic - GetAddress()ACMinlinevirtual - GetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM - GetLineCoding(LINE_CODING *dataptr)ACM - GetNotif(uint16_t *bytes_rcvd, uint8_t *dataptr)ACM - Init(uint8_t parent, uint8_t port, bool lowspeed)ACMvirtual - isReady()ACMinlinevirtual - pAsyncACMprotected - Poll()ACMvirtual - PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ACMprotected - pUsbACMprotected - qNextPollTimeACMprotected - RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ACM - readyACMprotected - Release()ACMvirtual + DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual + EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ACMvirtual + epDataInIndexACMprotectedstatic + epDataOutIndexACMprotectedstatic + epInfoACMprotected + epInterruptInIndexACMprotectedstatic + GetAddress()ACMinlinevirtual + GetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM + GetLineCoding(LINE_CODING *dataptr)ACM + GetNotif(uint16_t *bytes_rcvd, uint8_t *dataptr)ACM + Init(uint8_t parent, uint8_t port, bool lowspeed)ACMvirtual + isReady()ACMinlinevirtual + pAsyncACMprotected + Poll()ACMvirtual + PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ACMprotected + pUsbACMprotected + qNextPollTimeACMprotected + RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ACM + readyACMprotected + Release()ACMvirtual + ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual SendBreak(uint16_t duration)ACM SetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM SetControlLineState(uint8_t state)ACM SetLineCoding(const LINE_CODING *dataptr)ACM SndData(uint16_t nbytes, uint8_t *dataptr)ACM + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_a_c_m.html b/class_a_c_m.html index 4c7796e0..587d087d 100644 --- a/class_a_c_m.html +++ b/class_a_c_m.html @@ -149,6 +149,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -526,7 +532,7 @@ Static Protected Attributes

Protected Member Functions

-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Reimplemented in PL2303.

@@ -555,7 +561,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 249 of file cdcacm.cpp.

@@ -582,7 +588,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 262 of file cdcacm.cpp.

@@ -609,7 +615,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 199 of file cdcacm.h.

diff --git a/class_a_d_k-members.html b/class_a_d_k-members.html index 8aa26418..1eb75cee 100644 --- a/class_a_d_k-members.html +++ b/class_a_d_k-members.html @@ -95,20 +95,23 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); bConfNumADKprotected bNumEPADKprotected ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual - EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ADKvirtual - epDataInIndexADKprotectedstatic - epDataOutIndexADKprotectedstatic - epInfoADKprotected - GetAddress()ADKinlinevirtual - Init(uint8_t parent, uint8_t port, bool lowspeed)ADKvirtual - isReady()ADKinlinevirtual - Poll()ADKinlinevirtual - PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ADKprotected - pUsbADKprotected - RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ADK - readyADKprotected - Release()ADKvirtual + DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual + EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ADKvirtual + epDataInIndexADKprotectedstatic + epDataOutIndexADKprotectedstatic + epInfoADKprotected + GetAddress()ADKinlinevirtual + Init(uint8_t parent, uint8_t port, bool lowspeed)ADKvirtual + isReady()ADKinlinevirtual + Poll()ADKinlinevirtual + PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ADKprotected + pUsbADKprotected + RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ADK + readyADKprotected + Release()ADKvirtual + ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual SndData(uint16_t nbytes, uint8_t *dataptr)ADK + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_a_d_k.html b/class_a_d_k.html index 38e95406..d9fb3c5c 100644 --- a/class_a_d_k.html +++ b/class_a_d_k.html @@ -133,6 +133,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -344,7 +350,7 @@ Static Protected Attributes

Protected Member Functions

-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 62 of file adk.cpp.

@@ -371,7 +377,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 309 of file adk.cpp.

@@ -398,7 +404,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 116 of file adk.h.

@@ -425,7 +431,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 120 of file adk.h.

diff --git a/class_b_t_d-members.html b/class_b_t_d-members.html index 59e2cd1f..ef6afe95 100644 --- a/class_b_t_d-members.html +++ b/class_b_t_d-members.html @@ -102,59 +102,62 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); btdPinBTD ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual connectToWiiBTD - disc_bdaddrBTD - disconnect()BTDinline - EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)BTDvirtual - epInfoBTDprotected - GetAddress()BTDinlinevirtual - hci_accept_connection()BTD - hci_authentication_request()BTD - HCI_Command(uint8_t *data, uint16_t nbytes)BTD - hci_connect()BTD - hci_disconnect(uint16_t handle)BTD - hci_handleBTD - hci_inquiry()BTD - hci_inquiry_cancel()BTD - hci_link_key_request_negative_reply()BTD - hci_pin_code_negative_request_reply()BTD - hci_pin_code_request_reply()BTD - hci_read_bdaddr()BTD - hci_read_local_version_information()BTD - hci_remote_name()BTD - hci_reset()BTD - hci_set_local_name(const char *name)BTD - hci_versionBTD - hci_write_class_of_device()BTD - hci_write_scan_disable()BTD - hci_write_scan_enable()BTD - incomingWiiBTD - Init(uint8_t parent, uint8_t port, bool lowspeed)BTDvirtual - isReady()BTDinlinevirtual - L2CAP_Command(uint16_t handle, uint8_t *data, uint8_t nbytes, uint8_t channelLow=0x01, uint8_t channelHigh=0x00)BTD - l2cap_config_request(uint16_t handle, uint8_t rxid, uint8_t *dcid)BTD - l2cap_config_response(uint16_t handle, uint8_t rxid, uint8_t *scid)BTD - l2cap_connection_request(uint16_t handle, uint8_t rxid, uint8_t *scid, uint16_t psm)BTD - l2cap_connection_response(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid, uint8_t result)BTD - l2cap_disconnection_request(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid)BTD - l2cap_disconnection_response(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid)BTD - l2cap_information_response(uint16_t handle, uint8_t rxid, uint8_t infoTypeLow, uint8_t infoTypeHigh)BTD - l2capConnectionClaimedBTD - motionPlusInsideBTD - my_bdaddrBTD - pairWithWiiBTD - pairWithWiimote()BTDinline - Poll()BTDvirtual - PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)BTDprotected - pUsbBTDprotected - qNextPollTimeBTDprotected - readPollInterval()BTDinline - registerServiceClass(BluetoothService *pService)BTDinline - Release()BTDvirtual - remote_nameBTD + DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual + disc_bdaddrBTD + disconnect()BTDinline + EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)BTDvirtual + epInfoBTDprotected + GetAddress()BTDinlinevirtual + hci_accept_connection()BTD + hci_authentication_request()BTD + HCI_Command(uint8_t *data, uint16_t nbytes)BTD + hci_connect()BTD + hci_disconnect(uint16_t handle)BTD + hci_handleBTD + hci_inquiry()BTD + hci_inquiry_cancel()BTD + hci_link_key_request_negative_reply()BTD + hci_pin_code_negative_request_reply()BTD + hci_pin_code_request_reply()BTD + hci_read_bdaddr()BTD + hci_read_local_version_information()BTD + hci_remote_name()BTD + hci_reset()BTD + hci_set_local_name(const char *name)BTD + hci_versionBTD + hci_write_class_of_device()BTD + hci_write_scan_disable()BTD + hci_write_scan_enable()BTD + incomingWiiBTD + Init(uint8_t parent, uint8_t port, bool lowspeed)BTDvirtual + isReady()BTDinlinevirtual + L2CAP_Command(uint16_t handle, uint8_t *data, uint8_t nbytes, uint8_t channelLow=0x01, uint8_t channelHigh=0x00)BTD + l2cap_config_request(uint16_t handle, uint8_t rxid, uint8_t *dcid)BTD + l2cap_config_response(uint16_t handle, uint8_t rxid, uint8_t *scid)BTD + l2cap_connection_request(uint16_t handle, uint8_t rxid, uint8_t *scid, uint16_t psm)BTD + l2cap_connection_response(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid, uint8_t result)BTD + l2cap_disconnection_request(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid)BTD + l2cap_disconnection_response(uint16_t handle, uint8_t rxid, uint8_t *dcid, uint8_t *scid)BTD + l2cap_information_response(uint16_t handle, uint8_t rxid, uint8_t infoTypeLow, uint8_t infoTypeHigh)BTD + l2capConnectionClaimedBTD + motionPlusInsideBTD + my_bdaddrBTD + pairWithWiiBTD + pairWithWiimote()BTDinline + Poll()BTDvirtual + PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)BTDprotected + pUsbBTDprotected + qNextPollTimeBTDprotected + readPollInterval()BTDinline + registerServiceClass(BluetoothService *pService)BTDinline + Release()BTDvirtual + remote_nameBTD + ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual rfcommConnectionClaimedBTD sdpConnectionClaimedBTD - watingForConnectionBTD - wiiUProControllerBTD + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual + watingForConnectionBTD + wiiUProControllerBTD
diff --git a/class_b_t_d.html b/class_b_t_d.html index 03000b0e..d89caef4 100644 --- a/class_b_t_d.html +++ b/class_b_t_d.html @@ -194,6 +194,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -340,7 +346,7 @@ Static Protected Attributes
Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 45 of file BTD.cpp.

@@ -369,7 +375,7 @@ Static Protected Attributes

Release the USB device.

Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 315 of file BTD.cpp.

@@ -398,7 +404,7 @@ Static Protected Attributes

Poll the USB Input endpoins and run the state machines.

Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 328 of file BTD.cpp.

@@ -427,7 +433,7 @@ Static Protected Attributes

Get the device address.

Returns
The device address.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 186 of file BTD.h.

diff --git a/class_bulk_only-members.html b/class_bulk_only-members.html index 00a848bf..dccca1bb 100644 --- a/class_bulk_only-members.html +++ b/class_bulk_only-members.html @@ -104,33 +104,36 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Public Attributes

CurrentSectorSizeBulkOnlyprotected
dCBWDataTransferLengthBulkOnlyprotected
dCBWTagBulkOnlyprotected
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)BulkOnlyvirtual
epDataInIndexBulkOnlyprotectedstatic
epDataOutIndexBulkOnlyprotectedstatic
epInfoBulkOnlyprotected
epInterruptInIndexBulkOnlyprotectedstatic
GetAddress()BulkOnlyinlinevirtual
GetbMaxLUN()BulkOnlyinline
GetbTheLUN()BulkOnlyinline
GetCapacity(uint8_t lun)BulkOnly
GetLastUsbError()BulkOnlyinline
GetSectorSize(uint8_t lun)BulkOnly
Init(uint8_t parent, uint8_t port, bool lowspeed)BulkOnlyvirtual
LockMedia(uint8_t lun, uint8_t lock)BulkOnly
LUNIsGood(uint8_t lun)BulkOnly
LUNOkBulkOnlyprotected
MediaCTL(uint8_t lun, uint8_t ctl)BulkOnly
OnInit()BulkOnlyinlineprotectedvirtual
Poll()BulkOnlyvirtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)BulkOnlyprotected
pUsbBulkOnlyprotected
qNextPollTimeBulkOnlyprotected
Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)BulkOnly
Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)BulkOnly
Release()BulkOnlyvirtual
Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, const uint8_t *buf)BulkOnly
WriteOkBulkOnlyprotected
WriteProtected(uint8_t lun)BulkOnly
DEVCLASSOK(uint8_t klass)BulkOnlyinlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)BulkOnlyvirtual
epDataInIndexBulkOnlyprotectedstatic
epDataOutIndexBulkOnlyprotectedstatic
epInfoBulkOnlyprotected
epInterruptInIndexBulkOnlyprotectedstatic
GetAddress()BulkOnlyinlinevirtual
GetbMaxLUN()BulkOnlyinline
GetbTheLUN()BulkOnlyinline
GetCapacity(uint8_t lun)BulkOnly
GetLastUsbError()BulkOnlyinline
GetSectorSize(uint8_t lun)BulkOnly
Init(uint8_t parent, uint8_t port, bool lowspeed)BulkOnlyvirtual
LockMedia(uint8_t lun, uint8_t lock)BulkOnly
LUNIsGood(uint8_t lun)BulkOnly
LUNOkBulkOnlyprotected
MediaCTL(uint8_t lun, uint8_t ctl)BulkOnly
OnInit()BulkOnlyinlineprotectedvirtual
Poll()BulkOnlyvirtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)BulkOnlyprotected
pUsbBulkOnlyprotected
qNextPollTimeBulkOnlyprotected
Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)BulkOnly
Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)BulkOnly
Release()BulkOnlyvirtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, const uint8_t *buf)BulkOnly
WriteOkBulkOnlyprotected
WriteProtected(uint8_t lun)BulkOnly
diff --git a/class_bulk_only.html b/class_bulk_only.html index 58b06578..e8aac71f 100644 --- a/class_bulk_only.html +++ b/class_bulk_only.html @@ -150,6 +150,13 @@ Public Member Functions   virtual void EndpointXtract (uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)   +virtual boolean DEVCLASSOK (uint8_t klass) +  +- Public Member Functions inherited from USBDeviceConfig +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  @@ -255,7 +262,7 @@ Static Protected Attributes -

Definition at line 1299 of file masstorage.cpp.

+

Definition at line 1298 of file masstorage.cpp.

@@ -522,7 +529,7 @@ Static Protected Attributes

Protected Member Functions

-

Definition at line 1327 of file masstorage.cpp.

+

Definition at line 1326 of file masstorage.cpp.

@@ -746,7 +753,7 @@ Static Protected Attributes
Returns
0 for success
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 346 of file masstorage.cpp.

@@ -830,9 +837,9 @@ Static Protected Attributes

For driver use only.

Returns
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

-

Definition at line 536 of file masstorage.cpp.

+

Definition at line 571 of file masstorage.cpp.

@@ -859,9 +866,9 @@ Static Protected Attributes

For driver use only.

Returns
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

-

Definition at line 614 of file masstorage.cpp.

+

Definition at line 649 of file masstorage.cpp.

@@ -886,7 +893,7 @@ Static Protected Attributes
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 272 of file masstorage.h.

@@ -955,7 +962,35 @@ Static Protected Attributes

Implements UsbConfigXtracter.

-

Definition at line 1268 of file masstorage.cpp.

+

Definition at line 539 of file masstorage.cpp.

+ +
+ + +
+
+ + + + + +
+ + + + + + + + +
virtual boolean BulkOnly::DEVCLASSOK (uint8_t klass)
+ 		+inlinevirtual
+
+ +

Reimplemented from USBDeviceConfig.

+ +

Definition at line 278 of file masstorage.h.

diff --git a/class_f_t_d_i-members.html b/class_f_t_d_i-members.html index cb87fca6..60ebeb04 100644 --- a/class_f_t_d_i-members.html +++ b/class_f_t_d_i-members.html @@ -91,18 +91,21 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');

This is the complete list of members for FTDI, including all inherited members.

- - - - - - - + + + + + + + + + +
ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)FTDIvirtual
FTDI(USB *pusb, FTDIAsyncOper *pasync)FTDI
GetAddress()FTDIinlinevirtual
Init(uint8_t parent, uint8_t port, bool lowspeed)FTDIvirtual
Poll()FTDIvirtual
RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr)FTDI
Release()FTDIvirtual
DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)FTDIvirtual
FTDI(USB *pusb, FTDIAsyncOper *pasync)FTDI
GetAddress()FTDIinlinevirtual
Init(uint8_t parent, uint8_t port, bool lowspeed)FTDIvirtual
Poll()FTDIvirtual
RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr)FTDI
Release()FTDIvirtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
SetBaudRate(uint32_t baud)FTDI
SetData(uint16_t databm)FTDI
SetFlowControl(uint8_t protocol, uint8_t xon=0x11, uint8_t xoff=0x13)FTDI
SetModemControl(uint16_t control)FTDI
SndData(uint16_t nbytes, uint8_t *dataptr)FTDI
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_f_t_d_i.html b/class_f_t_d_i.html index fbc6a081..c50008b5 100644 --- a/class_f_t_d_i.html +++ b/class_f_t_d_i.html @@ -136,6 +136,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) + 

Detailed Description

@@ -352,7 +358,7 @@ Public Member Functions
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 41 of file cdcftdi.cpp.

@@ -379,7 +385,7 @@ Public Member Functions
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 244 of file cdcftdi.cpp.

@@ -406,7 +412,7 @@ Public Member Functions
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 254 of file cdcftdi.cpp.

@@ -433,7 +439,7 @@ Public Member Functions
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 143 of file cdcftdi.h.

diff --git a/class_h_i_d-members.html b/class_h_i_d-members.html index c130c2ee..59f36871 100644 --- a/class_h_i_d-members.html +++ b/class_h_i_d-members.html @@ -92,31 +92,34 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
bAddressHIDprotected
ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)=0UsbConfigXtracterpure virtual
epInterruptInIndexHIDprotectedstatic
epInterruptOutIndexHIDprotectedstatic
GetAddress()=0USBDeviceConfigpure virtual
GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID
GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID
GetProtocol(uint8_t iface, uint8_t *dataptr)HID
GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID
GetReportParser(uint8_t id)HIDprotectedvirtual
GetUsb()HIDinline
HID(USB *pusb)HIDinline
Init(uint8_t parent, uint8_t port, bool lowspeed)=0USBDeviceConfigpure virtual
maxEpPerInterfaceHIDprotectedstatic
maxHidInterfacesHIDprotectedstatic
Poll()=0USBDeviceConfigpure virtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected
PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected
pUsbHIDprotected
Release()=0USBDeviceConfigpure virtual
DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)=0UsbConfigXtracterpure virtual
epInterruptInIndexHIDprotectedstatic
epInterruptOutIndexHIDprotectedstatic
GetAddress()USBDeviceConfiginlinevirtual
GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID
GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID
GetProtocol(uint8_t iface, uint8_t *dataptr)HID
GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID
GetReportParser(uint8_t id)HIDprotectedvirtual
GetUsb()HIDinline
HID(USB *pusb)HIDinline
Init(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
maxEpPerInterfaceHIDprotectedstatic
maxHidInterfacesHIDprotectedstatic
Poll()USBDeviceConfiginlinevirtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected
PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected
pUsbHIDprotected
Release()USBDeviceConfiginlinevirtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
SetIdle(uint8_t iface, uint8_t reportID, uint8_t duration)HID
SetProtocol(uint8_t iface, uint8_t protocol)HID
SetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
SetReportParser(uint8_t id, HIDReportParser *prs)HIDvirtual
totalEndpointsHIDprotectedstatic
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_h_i_d.html b/class_h_i_d.html index a7855b2d..3f787408 100644 --- a/class_h_i_d.html +++ b/class_h_i_d.html @@ -135,16 +135,22 @@ Public Member Functions uint8_t SetReport (uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)   - Public Member Functions inherited from USBDeviceConfig -virtual uint8_t Init (uint8_t parent, uint8_t port, bool lowspeed)=0 -  +virtual uint8_t Init (uint8_t parent, uint8_t port, bool lowspeed) +  virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   -virtual uint8_t Release ()=0 -  -virtual uint8_t Poll ()=0 -  -virtual uint8_t GetAddress ()=0 -  +virtual uint8_t Release () +  +virtual uint8_t Poll () +  +virtual uint8_t GetAddress () +  +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  - Public Member Functions inherited from UsbConfigXtracter virtual void EndpointXtract (uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)=0   diff --git a/class_h_i_d_boot-members.html b/class_h_i_d_boot-members.html index 09e90190..ad9a902e 100644 --- a/class_h_i_d_boot-members.html +++ b/class_h_i_d_boot-members.html @@ -92,31 +92,34 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
bAddressHIDprotected
ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)HIDBoot< BOOT_PROTOCOL >virtual
epInterruptInIndexHIDprotectedstatic
epInterruptOutIndexHIDprotectedstatic
GetAddress()HIDBoot< BOOT_PROTOCOL >inlinevirtual
GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID
GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID
GetProtocol(uint8_t iface, uint8_t *dataptr)HID
GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID
GetUsb()HIDinline
HID(USB *pusb)HIDinline
HIDBoot(USB *p)HIDBoot< BOOT_PROTOCOL >
Init(uint8_t parent, uint8_t port, bool lowspeed)HIDBoot< BOOT_PROTOCOL >virtual
maxEpPerInterfaceHIDprotectedstatic
maxHidInterfacesHIDprotectedstatic
Poll()HIDBoot< BOOT_PROTOCOL >virtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected
PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected
pUsbHIDprotected
Release()HIDBoot< BOOT_PROTOCOL >virtual
DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual
EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)HIDBoot< BOOT_PROTOCOL >virtual
epInterruptInIndexHIDprotectedstatic
epInterruptOutIndexHIDprotectedstatic
GetAddress()HIDBoot< BOOT_PROTOCOL >inlinevirtual
GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID
GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID
GetProtocol(uint8_t iface, uint8_t *dataptr)HID
GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID
GetUsb()HIDinline
HID(USB *pusb)HIDinline
HIDBoot(USB *p)HIDBoot< BOOT_PROTOCOL >
Init(uint8_t parent, uint8_t port, bool lowspeed)HIDBoot< BOOT_PROTOCOL >virtual
maxEpPerInterfaceHIDprotectedstatic
maxHidInterfacesHIDprotectedstatic
Poll()HIDBoot< BOOT_PROTOCOL >virtual
PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected
PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected
pUsbHIDprotected
Release()HIDBoot< BOOT_PROTOCOL >virtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
SetIdle(uint8_t iface, uint8_t reportID, uint8_t duration)HID
SetProtocol(uint8_t iface, uint8_t protocol)HID
SetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID
SetReportParser(uint8_t id, HIDReportParser *prs)HIDBoot< BOOT_PROTOCOL >inlinevirtual
totalEndpointsHIDprotectedstatic
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_h_i_d_boot.html b/class_h_i_d_boot.html index e9f773f1..13a427cf 100644 --- a/class_h_i_d_boot.html +++ b/class_h_i_d_boot.html @@ -147,6 +147,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -280,7 +286,7 @@ template<const uint8_t BOOT_PROTOCOL>

Additional Inherited Members

-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 245 of file hidboot.h.

@@ -309,7 +315,7 @@ template<const uint8_t BOOT_PROTOCOL>
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 463 of file hidboot.h.

@@ -338,7 +344,7 @@ template<const uint8_t BOOT_PROTOCOL>
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 476 of file hidboot.h.

@@ -367,7 +373,7 @@ template<const uint8_t BOOT_PROTOCOL>
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 211 of file hidboot.h.

diff --git a/class_h_i_d_universal-members.html b/class_h_i_d_universal-members.html index 569c6cc3..e42d385c 100644 --- a/class_h_i_d_universal-members.html +++ b/class_h_i_d_universal-members.html @@ -93,33 +93,36 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); bAddressHIDprotected bHasReportIdHIDUniversalprotected ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual - EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)HIDUniversalvirtual - epInterruptInIndexHIDprotectedstatic - epInterruptOutIndexHIDprotectedstatic - GetAddress()HIDUniversalinlinevirtual - GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID - GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID - GetProtocol(uint8_t iface, uint8_t *dataptr)HID - GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID - GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID - GetReportParser(uint8_t id)HIDUniversalprotectedvirtual - GetUsb()HIDinline - HID(USB *pusb)HIDinline - HIDUniversal(USB *p)HIDUniversal - Init(uint8_t parent, uint8_t port, bool lowspeed)HIDUniversalvirtual - maxEpPerInterfaceHIDprotectedstatic - maxHidInterfacesHIDprotectedstatic - OnInitSuccessful()HIDUniversalinlineprotectedvirtual - Poll()HIDUniversalvirtual - PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected - PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected - pUsbHIDprotected - Release()HIDUniversalvirtual + DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual + EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)HIDUniversalvirtual + epInterruptInIndexHIDprotectedstatic + epInterruptOutIndexHIDprotectedstatic + GetAddress()HIDUniversalinlinevirtual + GetHidDescr(uint8_t ep, uint16_t nbytes, uint8_t *dataptr)HID + GetIdle(uint8_t iface, uint8_t reportID, uint8_t *dataptr)HID + GetProtocol(uint8_t iface, uint8_t *dataptr)HID + GetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID + GetReportDescr(uint8_t ep, USBReadParser *parser=NULL)HID + GetReportParser(uint8_t id)HIDUniversalprotectedvirtual + GetUsb()HIDinline + HID(USB *pusb)HIDinline + HIDUniversal(USB *p)HIDUniversal + Init(uint8_t parent, uint8_t port, bool lowspeed)HIDUniversalvirtual + maxEpPerInterfaceHIDprotectedstatic + maxHidInterfacesHIDprotectedstatic + OnInitSuccessful()HIDUniversalinlineprotectedvirtual + Poll()HIDUniversalvirtual + PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)HIDprotected + PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc)HIDprotected + pUsbHIDprotected + Release()HIDUniversalvirtual + ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual SetIdle(uint8_t iface, uint8_t reportID, uint8_t duration)HID SetProtocol(uint8_t iface, uint8_t protocol)HID SetReport(uint8_t ep, uint8_t iface, uint8_t report_type, uint8_t report_id, uint16_t nbytes, uint8_t *dataptr)HID SetReportParser(uint8_t id, HIDReportParser *prs)HIDUniversalvirtual totalEndpointsHIDprotectedstatic + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_h_i_d_universal.html b/class_h_i_d_universal.html index c3b67c95..32644b29 100644 --- a/class_h_i_d_universal.html +++ b/class_h_i_d_universal.html @@ -150,6 +150,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -339,7 +345,7 @@ Additional Inherited Members

Protected Member Functions

-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 76 of file hiduniversal.cpp.

@@ -366,7 +372,7 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 312 of file hiduniversal.cpp.

@@ -393,7 +399,7 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 339 of file hiduniversal.cpp.

@@ -420,7 +426,7 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 71 of file hiduniversal.h.

diff --git a/class_p_l2303-members.html b/class_p_l2303-members.html index 172632f4..89039c17 100644 --- a/class_p_l2303-members.html +++ b/class_p_l2303-members.html @@ -99,31 +99,34 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); bPollEnableACMprotected ClearCommFeature(uint16_t fid)ACM ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual - EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ACMvirtual - epDataInIndexACMprotectedstatic - epDataOutIndexACMprotectedstatic - epInfoACMprotected - epInterruptInIndexACMprotectedstatic - GetAddress()ACMinlinevirtual - GetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM - GetLineCoding(LINE_CODING *dataptr)ACM - GetNotif(uint16_t *bytes_rcvd, uint8_t *dataptr)ACM - Init(uint8_t parent, uint8_t port, bool lowspeed)PL2303virtual - isReady()ACMinlinevirtual - pAsyncACMprotected - PL2303(USB *pusb, CDCAsyncOper *pasync)PL2303 - Poll()ACMvirtual - PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ACMprotected - pUsbACMprotected - qNextPollTimeACMprotected - RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ACM - readyACMprotected - Release()ACMvirtual + DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual + EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep)ACMvirtual + epDataInIndexACMprotectedstatic + epDataOutIndexACMprotectedstatic + epInfoACMprotected + epInterruptInIndexACMprotectedstatic + GetAddress()ACMinlinevirtual + GetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM + GetLineCoding(LINE_CODING *dataptr)ACM + GetNotif(uint16_t *bytes_rcvd, uint8_t *dataptr)ACM + Init(uint8_t parent, uint8_t port, bool lowspeed)PL2303virtual + isReady()ACMinlinevirtual + pAsyncACMprotected + PL2303(USB *pusb, CDCAsyncOper *pasync)PL2303 + Poll()ACMvirtual + PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR *ep_ptr)ACMprotected + pUsbACMprotected + qNextPollTimeACMprotected + RcvData(uint16_t *nbytesptr, uint8_t *dataptr)ACM + readyACMprotected + Release()ACMvirtual + ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual SendBreak(uint16_t duration)ACM SetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr)ACM SetControlLineState(uint8_t state)ACM SetLineCoding(const LINE_CODING *dataptr)ACM SndData(uint16_t nbytes, uint8_t *dataptr)ACM + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_p_l2303.html b/class_p_l2303.html index 67eccfd2..794ec4c2 100644 --- a/class_p_l2303.html +++ b/class_p_l2303.html @@ -149,6 +149,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  diff --git a/class_p_s3_u_s_b-members.html b/class_p_s3_u_s_b-members.html index fa4dc5d9..6d66700f 100644 --- a/class_p_s3_u_s_b-members.html +++ b/class_p_s3_u_s_b-members.html @@ -92,28 +92,30 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');

Additional Inherited Members

- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +126,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); +
bAddressPS3USBprotected
ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
epInfoPS3USBprotected
GetAddress()PS3USBinlinevirtual
getAnalogButton(Button a)PS3USB
getAnalogHat(AnalogHat a)PS3USB
getAngle(Angle a)PS3USB
getButtonClick(Button b)PS3USB
getButtonPress(Button b)PS3USB
getSensor(Sensor a)PS3USB
getStatus(Status c)PS3USB
getStatusString()PS3USB
Init(uint8_t parent, uint8_t port, bool lowspeed)PS3USBvirtual
isReady()PS3USBinlinevirtual
moveSetBulb(uint8_t r, uint8_t g, uint8_t b)PS3USB
moveSetBulb(Colors color)PS3USB
moveSetRumble(uint8_t rumble)PS3USB
Poll()PS3USBvirtual
PS3ConnectedPS3USB
PS3MoveConnectedPS3USB
PS3NavigationConnectedPS3USB
PS3USB(USB *pUsb, uint8_t btadr5=0, uint8_t btadr4=0, uint8_t btadr3=0, uint8_t btadr2=0, uint8_t btadr1=0, uint8_t btadr0=0)PS3USB
pUsbPS3USBprotected
Release()PS3USBvirtual
DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual
epInfoPS3USBprotected
GetAddress()PS3USBinlinevirtual
getAnalogButton(Button a)PS3USB
getAnalogHat(AnalogHat a)PS3USB
getAngle(Angle a)PS3USB
getButtonClick(Button b)PS3USB
getButtonPress(Button b)PS3USB
getSensor(Sensor a)PS3USB
getStatus(Status c)PS3USB
getStatusString()PS3USB
Init(uint8_t parent, uint8_t port, bool lowspeed)PS3USBvirtual
isReady()PS3USBinlinevirtual
moveSetBulb(uint8_t r, uint8_t g, uint8_t b)PS3USB
moveSetBulb(Colors color)PS3USB
moveSetRumble(uint8_t rumble)PS3USB
Poll()PS3USBvirtual
PS3ConnectedPS3USB
PS3MoveConnectedPS3USB
PS3NavigationConnectedPS3USB
PS3USB(USB *pUsb, uint8_t btadr5=0, uint8_t btadr4=0, uint8_t btadr3=0, uint8_t btadr2=0, uint8_t btadr1=0, uint8_t btadr0=0)PS3USB
pUsbPS3USBprotected
Release()PS3USBvirtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
setAllOff()PS3USB
setBdaddr(uint8_t *BDADDR)PS3USB
setLedOff(LED a)PS3USB
setRumbleOff()PS3USB
setRumbleOn(Rumble mode)PS3USB
setRumbleOn(uint8_t rightDuration, uint8_t rightPower, uint8_t leftDuration, uint8_t leftPower)PS3USB
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_p_s3_u_s_b.html b/class_p_s3_u_s_b.html index f2f8126f..9d92ec14 100644 --- a/class_p_s3_u_s_b.html +++ b/class_p_s3_u_s_b.html @@ -170,6 +170,12 @@ Public Member Functions - Public Member Functions inherited from USBDeviceConfig virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)   +virtual void ResetHubPort (uint8_t port) +  +virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid) +  +virtual boolean DEVCLASSOK (uint8_t klass) +  @@ -311,7 +317,7 @@ Protected Attributes
Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 46 of file PS3USB.cpp.

@@ -340,7 +346,7 @@ Protected Attributes

Release the USB device.

Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 255 of file PS3USB.cpp.

@@ -369,7 +375,7 @@ Protected Attributes

Poll the USB Input endpoins and run the state machines.

Returns
0 on success.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 265 of file PS3USB.cpp.

@@ -398,7 +404,7 @@ Protected Attributes

Get the device address.

Returns
The device address.
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 96 of file PS3USB.h.

diff --git a/class_u_s_b.html b/class_u_s_b.html index 6edf9f6c..46c1c443 100644 --- a/class_u_s_b.html +++ b/class_u_s_b.html @@ -194,7 +194,7 @@ Public Member Functions

Public Attributes

Detailed Description

-

Definition at line 186 of file Usb.h.

+

Definition at line 189 of file Usb.h.

Constructor & Destructor Documentation

@@ -236,7 +236,7 @@ Public Member Functions
-

Definition at line 195 of file Usb.h.

+

Definition at line 198 of file Usb.h.

@@ -261,7 +261,7 @@ Public Member Functions
-

Definition at line 199 of file Usb.h.

+

Definition at line 202 of file Usb.h.

@@ -286,7 +286,7 @@ Public Member Functions
-

Definition at line 203 of file Usb.h.

+

Definition at line 206 of file Usb.h.

@@ -312,7 +312,7 @@ Public Member Functions
-

Definition at line 207 of file Usb.h.

+

Definition at line 210 of file Usb.h.

@@ -338,7 +338,7 @@ Public Member Functions
-

Definition at line 217 of file Usb.h.

+

Definition at line 220 of file Usb.h.

@@ -478,7 +478,7 @@ Public Member Functions

defined(USB_METHODS_INLINE)

-

Definition at line 663 of file Usb.cpp.

+

Definition at line 746 of file Usb.cpp.

@@ -524,7 +524,7 @@ Public Member Functions
-

Definition at line 668 of file Usb.cpp.

+

Definition at line 751 of file Usb.cpp.

@@ -564,7 +564,7 @@ Public Member Functions
-

Definition at line 672 of file Usb.cpp.

+

Definition at line 755 of file Usb.cpp.

@@ -616,7 +616,7 @@ Public Member Functions
-

Definition at line 690 of file Usb.cpp.

+

Definition at line 773 of file Usb.cpp.

@@ -650,7 +650,7 @@ Public Member Functions
-

Definition at line 695 of file Usb.cpp.

+

Definition at line 778 of file Usb.cpp.

@@ -684,7 +684,7 @@ Public Member Functions
-

Definition at line 700 of file Usb.cpp.

+

Definition at line 783 of file Usb.cpp.

@@ -800,7 +800,7 @@ Public Member Functions
-

Definition at line 208 of file Usb.cpp.

+

Definition at line 215 of file Usb.cpp.

@@ -840,7 +840,7 @@ Public Member Functions
-

Definition at line 292 of file Usb.cpp.

+

Definition at line 299 of file Usb.cpp.

@@ -874,7 +874,7 @@ Public Member Functions
-

Definition at line 376 of file Usb.cpp.

+

Definition at line 383 of file Usb.cpp.

@@ -892,7 +892,7 @@ Public Member Functions
-

Definition at line 424 of file Usb.cpp.

+

Definition at line 431 of file Usb.cpp.

@@ -926,7 +926,7 @@ Public Member Functions
-

Definition at line 526 of file Usb.cpp.

+

Definition at line 537 of file Usb.cpp.

@@ -960,7 +960,7 @@ Public Member Functions
-

Definition at line 606 of file Usb.cpp.

+

Definition at line 636 of file Usb.cpp.

@@ -978,7 +978,7 @@ Public Member Functions
-

Definition at line 649 of file Usb.cpp.

+

Definition at line 731 of file Usb.cpp.

@@ -1060,7 +1060,7 @@ Public Member Functions
-

Definition at line 128 of file Usb.cpp.

+

Definition at line 135 of file Usb.cpp.

diff --git a/class_u_s_b_device_config-members.html b/class_u_s_b_device_config-members.html index cc33f529..e13634f4 100644 --- a/class_u_s_b_device_config-members.html +++ b/class_u_s_b_device_config-members.html @@ -91,10 +91,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');

This is the complete list of members for USBDeviceConfig, including all inherited members.

- - - - + + + + + + +
ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
GetAddress()=0USBDeviceConfigpure virtual
Init(uint8_t parent, uint8_t port, bool lowspeed)=0USBDeviceConfigpure virtual
Poll()=0USBDeviceConfigpure virtual
Release()=0USBDeviceConfigpure virtual
DEVCLASSOK(uint8_t klass)USBDeviceConfiginlinevirtual
GetAddress()USBDeviceConfiginlinevirtual
Init(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlinevirtual
Poll()USBDeviceConfiginlinevirtual
Release()USBDeviceConfiginlinevirtual
ResetHubPort(uint8_t port)USBDeviceConfiginlinevirtual
VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlinevirtual
diff --git a/class_u_s_b_device_config.html b/class_u_s_b_device_config.html index 54cb10d7..c972ed93 100644 --- a/class_u_s_b_device_config.html +++ b/class_u_s_b_device_config.html @@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); Public Member Functions | List of all members
-
USBDeviceConfig Class Referenceabstract
+
USBDeviceConfig Class Reference
@@ -102,22 +102,28 @@ Inheritance diagram for USBDeviceConfig:
- - + + - - - - - - + + + + + + + + + + + +

Public Member Functions

virtual uint8_t Init (uint8_t parent, uint8_t port, bool lowspeed)=0
 
virtual uint8_t Init (uint8_t parent, uint8_t port, bool lowspeed)
 
virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)
 
virtual uint8_t Release ()=0
 
virtual uint8_t Poll ()=0
 
virtual uint8_t GetAddress ()=0
 
virtual uint8_t Release ()
 
virtual uint8_t Poll ()
 
virtual uint8_t GetAddress ()
 
virtual void ResetHubPort (uint8_t port)
 
virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid)
 
virtual boolean DEVCLASSOK (uint8_t klass)
 

Detailed Description

Definition at line 142 of file Usb.h.

Member Function Documentation

- +
@@ -150,12 +156,14 @@ Public Member Functions
-pure virtual +inlinevirtual
-

Implemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, PL2303, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+

Reimplemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, PL2303, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+ +

Definition at line 144 of file Usb.h.

@@ -203,7 +211,7 @@ Public Member Functions - +
@@ -219,16 +227,18 @@ Public Member Functions
-pure virtual +inlinevirtual
-

Implemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+

Reimplemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+ +

Definition at line 146 of file Usb.h.

- +
@@ -244,16 +254,18 @@ Public Member Functions
-pure virtual +inlinevirtual
-

Implemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+

Reimplemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+ +

Definition at line 147 of file Usb.h.

- +
@@ -269,12 +281,106 @@ Public Member Functions
-pure virtual +inlinevirtual
-

Implemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+

Reimplemented in BulkOnly, HIDBoot< BOOT_PROTOCOL >, USBHub, ACM, BTD, FTDI, ADK, PS3USB, XBOXRECV, XBOXUSB, and HIDUniversal.

+ +

Definition at line 148 of file Usb.h.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void USBDeviceConfig::ResetHubPort (uint8_t port)
+ 		+inlinevirtual
+
+ +

Reimplemented in USBHub.

+ +

Definition at line 149 of file Usb.h.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual boolean USBDeviceConfig::VIDPIDOK (uint16_t vid,
uint16_t pid 
)
+ 		+inlinevirtual
+
+ +

Definition at line 150 of file Usb.h.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual boolean USBDeviceConfig::DEVCLASSOK (uint8_t klass)
+ 		+inlinevirtual
+
+ +

Reimplemented in BulkOnly, and USBHub.

+ +

Definition at line 151 of file Usb.h.

diff --git a/class_u_s_b_hub-members.html b/class_u_s_b_hub-members.html index 22a670d8..f88a350c 100644 --- a/class_u_s_b_hub-members.html +++ b/class_u_s_b_hub-members.html @@ -93,18 +93,21 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); ClearHubFeature(uint8_t fid)USBHubinline ClearPortFeature(uint8_t fid, uint8_t port, uint8_t sel=0)USBHubinline ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)USBDeviceConfiginlineprivatevirtual - GetAddress()USBHubinlinevirtual - GetHubDescriptor(uint8_t index, uint16_t nbytes, uint8_t *dataptr)USBHubinline - GetHubStatus(uint16_t nbytes, uint8_t *dataptr)USBHubinline - GetPortStatus(uint8_t port, uint16_t nbytes, uint8_t *dataptr)USBHubinline - Init(uint8_t parent, uint8_t port, bool lowspeed)USBHubvirtual - Poll()USBHubvirtual - PrintHubStatus()USBHub - Release()USBHubvirtual + DEVCLASSOK(uint8_t klass)USBHubinlinevirtual + GetAddress()USBHubinlinevirtual + GetHubDescriptor(uint8_t index, uint16_t nbytes, uint8_t *dataptr)USBHubinline + GetHubStatus(uint16_t nbytes, uint8_t *dataptr)USBHubinline + GetPortStatus(uint8_t port, uint16_t nbytes, uint8_t *dataptr)USBHubinline + Init(uint8_t parent, uint8_t port, bool lowspeed)USBHubvirtual + Poll()USBHubvirtual + PrintHubStatus()USBHub + Release()USBHubvirtual + ResetHubPort(uint8_t port)USBHubvirtual SetHubDescriptor(uint8_t port, uint16_t nbytes, uint8_t *dataptr)USBHubinline SetHubFeature(uint8_t fid)USBHubinline SetPortFeature(uint8_t fid, uint8_t port, uint8_t sel=0)USBHubinline USBHub(USB *p)USBHub + VIDPIDOK(uint16_t vid, uint16_t pid)USBDeviceConfiginlineprivatevirtual
diff --git a/class_u_s_b_hub.html b/class_u_s_b_hub.html index 61b3939d..80fc2a84 100644 --- a/class_u_s_b_hub.html +++ b/class_u_s_b_hub.html @@ -135,14 +135,20 @@ Public Member Functions   virtual uint8_t Poll ()   +virtual void ResetHubPort (uint8_t port) +  virtual uint8_t GetAddress ()   +virtual boolean DEVCLASSOK (uint8_t klass) +  + +

Additional Inherited Members

- Private Member Functions inherited from USBDeviceConfig
virtual uint8_t ConfigureDevice (uint8_t parent, uint8_t port, bool lowspeed)
 
virtual boolean VIDPIDOK (uint16_t vid, uint16_t pid)
 

Detailed Description

@@ -189,7 +195,7 @@ Additional Inherited Members
-

Definition at line 218 of file usbhub.h.

+

Definition at line 220 of file usbhub.h.

@@ -231,7 +237,7 @@ Additional Inherited Members
-

Definition at line 223 of file usbhub.h.

+

Definition at line 225 of file usbhub.h.

@@ -273,7 +279,7 @@ Additional Inherited Members
-

Definition at line 228 of file usbhub.h.

+

Definition at line 230 of file usbhub.h.

@@ -309,7 +315,7 @@ Additional Inherited Members
-

Definition at line 233 of file usbhub.h.

+

Definition at line 235 of file usbhub.h.

@@ -351,7 +357,7 @@ Additional Inherited Members
-

Definition at line 238 of file usbhub.h.

+

Definition at line 240 of file usbhub.h.

@@ -393,7 +399,7 @@ Additional Inherited Members
-

Definition at line 243 of file usbhub.h.

+

Definition at line 245 of file usbhub.h.

@@ -419,7 +425,7 @@ Additional Inherited Members
-

Definition at line 248 of file usbhub.h.

+

Definition at line 250 of file usbhub.h.

@@ -461,7 +467,7 @@ Additional Inherited Members
-

Definition at line 253 of file usbhub.h.

+

Definition at line 255 of file usbhub.h.

@@ -518,7 +524,7 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 42 of file usbhub.cpp.

@@ -545,9 +551,9 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

-

Definition at line 208 of file usbhub.cpp.

+

Definition at line 211 of file usbhub.cpp.

@@ -572,9 +578,37 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

-

Definition at line 221 of file usbhub.cpp.

+

Definition at line 224 of file usbhub.cpp.

+ +
+ + +
+
+ + + + + +
+ + + + + + + + +
void USBHub::ResetHubPort (uint8_t port)
+ 		+virtual
+
+ +

Reimplemented from USBDeviceConfig.

+ +

Definition at line 304 of file usbhub.cpp.

@@ -599,10 +633,38 @@ Additional Inherited Members
-

Implements USBDeviceConfig.

+

Reimplemented from USBDeviceConfig.

Definition at line 211 of file usbhub.h.

+
+ + +
+
+ + + + + +
+ + + + + + + + +
virtual boolean USBHub::DEVCLASSOK (uint8_t klass)
+ 		+inlinevirtual
+
+ +

Reimplemented from USBDeviceConfig.

+ +

Definition at line 214 of file usbhub.h.

+
The documentation for this class was generated from the following files: diff --git a/functions_func_0x78.html b/functions_func_0x78.html index f762c29d..b0c359da 100644 --- a/functions_func_0x78.html +++ b/functions_func_0x78.html @@ -98,6 +98,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • s
  • t
  • u
    • +
  • v
  • w
  • x
    • diff --git a/globals_0x64.html b/globals_0x64.html index ab834708..0f7c8f36 100644 --- a/globals_0x64.html +++ b/globals_0x64.html @@ -125,6 +125,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    Here is a list of all file members with links to the files they belong to:

    - d -

    +
    - 
      +  + +

      - d -

      + + +

      - e -

      • E_Notify() : message.cpp , message.h @@ -110,6 +131,42 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
      • ErrorMessage() : message.h
        • +
      + + +

      - n -

      + + +

      - p -

      • PrintBin() : printhex.h
        • @@ -123,6 +180,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); : usbhub.cpp , usbhub.h +
      + + +

      - s -

      • SerialPrintHex() : printhex.h
        • diff --git a/hid_8cpp_source.html b/hid_8cpp_source.html index 114dfa08..fb9e76a2 100644 --- a/hid_8cpp_source.html +++ b/hid_8cpp_source.html @@ -133,43 +133,43 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
        42 }
        43 
        44 void HID::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
        -
        45  Notify(PSTR("Endpoint descriptor:"), 0x80);
        -
        46  Notify(PSTR("\r\nLength:\t\t"), 0x80);
        -
        47  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
        -
        48  Notify(PSTR("\r\nType:\t\t"), 0x80);
        -
        49  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
        -
        50  Notify(PSTR("\r\nAddress:\t"), 0x80);
        -
        51  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
        -
        52  Notify(PSTR("\r\nAttributes:\t"), 0x80);
        -
        53  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
        -
        54  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
        -
        55  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
        -
        56  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
        -
        57  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
        +
        45  Notify(PSTR("Endpoint descriptor:"), 0x80);
        +
        46  Notify(PSTR("\r\nLength:\t\t"), 0x80);
        +
        47  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
        +
        48  Notify(PSTR("\r\nType:\t\t"), 0x80);
        +
        49  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
        +
        50  Notify(PSTR("\r\nAddress:\t"), 0x80);
        +
        51  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
        +
        52  Notify(PSTR("\r\nAttributes:\t"), 0x80);
        +
        53  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
        +
        54  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
        +
        55  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
        +
        56  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
        +
        57  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
        58 }
        59 
        60 void HID::PrintHidDescriptor(const USB_HID_DESCRIPTOR *pDesc) {
        -
        61  Notify(PSTR("\r\n\r\nHID Descriptor:\r\n"), 0x80);
        -
        62  Notify(PSTR("bDescLength:\t\t"), 0x80);
        -
        63  PrintHex<uint8_t > (pDesc->bLength, 0x80);
        +
        61  Notify(PSTR("\r\n\r\nHID Descriptor:\r\n"), 0x80);
        +
        62  Notify(PSTR("bDescLength:\t\t"), 0x80);
        +
        63  D_PrintHex<uint8_t > (pDesc->bLength, 0x80);
        64 
        -
        65  Notify(PSTR("\r\nbDescriptorType:\t"), 0x80);
        -
        66  PrintHex<uint8_t > (pDesc->bDescriptorType, 0x80);
        +
        65  Notify(PSTR("\r\nbDescriptorType:\t"), 0x80);
        +
        66  D_PrintHex<uint8_t > (pDesc->bDescriptorType, 0x80);
        67 
        -
        68  Notify(PSTR("\r\nbcdHID:\t\t\t"), 0x80);
        -
        69  PrintHex<uint16_t > (pDesc->bcdHID, 0x80);
        +
        68  Notify(PSTR("\r\nbcdHID:\t\t\t"), 0x80);
        +
        69  D_PrintHex<uint16_t > (pDesc->bcdHID, 0x80);
        70 
        -
        71  Notify(PSTR("\r\nbCountryCode:\t\t"), 0x80);
        -
        72  PrintHex<uint8_t > (pDesc->bCountryCode, 0x80);
        +
        71  Notify(PSTR("\r\nbCountryCode:\t\t"), 0x80);
        +
        72  D_PrintHex<uint8_t > (pDesc->bCountryCode, 0x80);
        73 
        -
        74  Notify(PSTR("\r\nbNumDescriptors:\t"), 0x80);
        -
        75  PrintHex<uint8_t > (pDesc->bNumDescriptors, 0x80);
        +
        74  Notify(PSTR("\r\nbNumDescriptors:\t"), 0x80);
        +
        75  D_PrintHex<uint8_t > (pDesc->bNumDescriptors, 0x80);
        76 
        -
        77  Notify(PSTR("\r\nbDescrType:\t\t"), 0x80);
        -
        78  PrintHex<uint8_t > (pDesc->bDescrType, 0x80);
        +
        77  Notify(PSTR("\r\nbDescrType:\t\t"), 0x80);
        +
        78  D_PrintHex<uint8_t > (pDesc->bDescrType, 0x80);
        79 
        -
        80  Notify(PSTR("\r\nwDescriptorLength:\t"), 0x80);
        -
        81  PrintHex<uint16_t > (pDesc->wDescriptorLength, 0x80);
        +
        80  Notify(PSTR("\r\nwDescriptorLength:\t"), 0x80);
        +
        81  D_PrintHex<uint16_t > (pDesc->wDescriptorLength, 0x80);
        82 }
    diff --git a/hidboot_8h_source.html b/hidboot_8h_source.html index b76e88d9..7cea7e7b 100644 --- a/hidboot_8h_source.html +++ b/hidboot_8h_source.html @@ -485,25 +485,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    394 
    395 FailGetDevDescr:
    396 #ifdef DEBUG_USB_HOST
    -
    397  NotifyFailGetDevDescr();
    +
    397  NotifyFailGetDevDescr();
    398  goto Fail;
    399 #endif
    400 
    401 FailSetDevTblEntry:
    402 #ifdef DEBUG_USB_HOST
    -
    403  NotifyFailSetDevTblEntry();
    +
    403  NotifyFailSetDevTblEntry();
    404  goto Fail;
    405 #endif
    406 
    407 FailGetConfDescr:
    408 #ifdef DEBUG_USB_HOST
    -
    409  NotifyFailGetConfDescr();
    +
    409  NotifyFailGetConfDescr();
    410  goto Fail;
    411 #endif
    412 
    413 FailSetConfDescr:
    414 #ifdef DEBUG_USB_HOST
    -
    415  NotifyFailSetConfDescr();
    +
    415  NotifyFailSetConfDescr();
    416  goto Fail;
    417 #endif
    418 
    @@ -520,7 +520,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    429 
    430 Fail:
    431 #ifdef DEBUG_USB_HOST
    -
    432  NotifyFail(rcode);
    +
    432  NotifyFail(rcode);
    433 #endif
    434  Release();
    435  return rcode;
    diff --git a/hidescriptorparser_8cpp_source.html b/hidescriptorparser_8cpp_source.html index 49d8c8e8..2bd66b39 100644 --- a/hidescriptorparser_8cpp_source.html +++ b/hidescriptorparser_8cpp_source.html @@ -1085,79 +1085,79 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    994 }
    995 
    996 void ReportDescParserBase::PrintValue(uint8_t *p, uint8_t len) {
    -
    997  Notify(PSTR("("), 0x80);
    +
    997  E_Notify(PSTR("("), 0x80);
    998  for (; len; p++, len--)
    999  PrintHex<uint8_t > (*p, 0x80);
    -
    1000  Notify(PSTR(")"), 0x80);
    +
    1000  E_Notify(PSTR(")"), 0x80);
    1001 }
    1002 
    1003 void ReportDescParserBase::PrintByteValue(uint8_t data) {
    -
    1004  Notify(PSTR("("), 0x80);
    +
    1004  E_Notify(PSTR("("), 0x80);
    1005  PrintHex<uint8_t > (data, 0x80);
    -
    1006  Notify(PSTR(")"), 0x80);
    +
    1006  E_Notify(PSTR(")"), 0x80);
    1007 }
    1008 
    1009 void ReportDescParserBase::PrintItemTitle(uint8_t prefix) {
    1010  switch (prefix & (TYPE_MASK | TAG_MASK)) {
    1011  case (TYPE_GLOBAL | TAG_GLOBAL_PUSH):
    -
    1012  Notify(PSTR("\r\nPush"), 0x80);
    +
    1012  E_Notify(PSTR("\r\nPush"), 0x80);
    1013  break;
    1014  case (TYPE_GLOBAL | TAG_GLOBAL_POP):
    -
    1015  Notify(PSTR("\r\nPop"), 0x80);
    +
    1015  E_Notify(PSTR("\r\nPop"), 0x80);
    1016  break;
    1017  case (TYPE_GLOBAL | TAG_GLOBAL_USAGEPAGE):
    -
    1018  Notify(PSTR("\r\nUsage Page"), 0x80);
    +
    1018  E_Notify(PSTR("\r\nUsage Page"), 0x80);
    1019  break;
    1020  case (TYPE_GLOBAL | TAG_GLOBAL_LOGICALMIN):
    -
    1021  Notify(PSTR("\r\nLogical Min"), 0x80);
    +
    1021  E_Notify(PSTR("\r\nLogical Min"), 0x80);
    1022  break;
    1023  case (TYPE_GLOBAL | TAG_GLOBAL_LOGICALMAX):
    -
    1024  Notify(PSTR("\r\nLogical Max"), 0x80);
    +
    1024  E_Notify(PSTR("\r\nLogical Max"), 0x80);
    1025  break;
    1026  case (TYPE_GLOBAL | TAG_GLOBAL_PHYSMIN):
    -
    1027  Notify(PSTR("\r\nPhysical Min"), 0x80);
    +
    1027  E_Notify(PSTR("\r\nPhysical Min"), 0x80);
    1028  break;
    1029  case (TYPE_GLOBAL | TAG_GLOBAL_PHYSMAX):
    -
    1030  Notify(PSTR("\r\nPhysical Max"), 0x80);
    +
    1030  E_Notify(PSTR("\r\nPhysical Max"), 0x80);
    1031  break;
    1032  case (TYPE_GLOBAL | TAG_GLOBAL_UNITEXP):
    -
    1033  Notify(PSTR("\r\nUnit Exp"), 0x80);
    +
    1033  E_Notify(PSTR("\r\nUnit Exp"), 0x80);
    1034  break;
    1035  case (TYPE_GLOBAL | TAG_GLOBAL_UNIT):
    -
    1036  Notify(PSTR("\r\nUnit"), 0x80);
    +
    1036  E_Notify(PSTR("\r\nUnit"), 0x80);
    1037  break;
    1038  case (TYPE_GLOBAL | TAG_GLOBAL_REPORTSIZE):
    -
    1039  Notify(PSTR("\r\nReport Size"), 0x80);
    +
    1039  E_Notify(PSTR("\r\nReport Size"), 0x80);
    1040  break;
    1041  case (TYPE_GLOBAL | TAG_GLOBAL_REPORTCOUNT):
    -
    1042  Notify(PSTR("\r\nReport Count"), 0x80);
    +
    1042  E_Notify(PSTR("\r\nReport Count"), 0x80);
    1043  break;
    1044  case (TYPE_GLOBAL | TAG_GLOBAL_REPORTID):
    -
    1045  Notify(PSTR("\r\nReport Id"), 0x80);
    +
    1045  E_Notify(PSTR("\r\nReport Id"), 0x80);
    1046  break;
    1047  case (TYPE_LOCAL | TAG_LOCAL_USAGE):
    -
    1048  Notify(PSTR("\r\nUsage"), 0x80);
    +
    1048  E_Notify(PSTR("\r\nUsage"), 0x80);
    1049  break;
    1050  case (TYPE_LOCAL | TAG_LOCAL_USAGEMIN):
    -
    1051  Notify(PSTR("\r\nUsage Min"), 0x80);
    +
    1051  E_Notify(PSTR("\r\nUsage Min"), 0x80);
    1052  break;
    1053  case (TYPE_LOCAL | TAG_LOCAL_USAGEMAX):
    -
    1054  Notify(PSTR("\r\nUsage Max"), 0x80);
    +
    1054  E_Notify(PSTR("\r\nUsage Max"), 0x80);
    1055  break;
    1056  case (TYPE_MAIN | TAG_MAIN_COLLECTION):
    -
    1057  Notify(PSTR("\r\nCollection"), 0x80);
    +
    1057  E_Notify(PSTR("\r\nCollection"), 0x80);
    1058  break;
    1059  case (TYPE_MAIN | TAG_MAIN_ENDCOLLECTION):
    -
    1060  Notify(PSTR("\r\nEnd Collection"), 0x80);
    +
    1060  E_Notify(PSTR("\r\nEnd Collection"), 0x80);
    1061  break;
    1062  case (TYPE_MAIN | TAG_MAIN_INPUT):
    -
    1063  Notify(PSTR("\r\nInput"), 0x80);
    +
    1063  E_Notify(PSTR("\r\nInput"), 0x80);
    1064  break;
    1065  case (TYPE_MAIN | TAG_MAIN_OUTPUT):
    -
    1066  Notify(PSTR("\r\nOutput"), 0x80);
    +
    1066  E_Notify(PSTR("\r\nOutput"), 0x80);
    1067  break;
    1068  case (TYPE_MAIN | TAG_MAIN_FEATURE):
    -
    1069  Notify(PSTR("\r\nFeature"), 0x80);
    +
    1069  E_Notify(PSTR("\r\nFeature"), 0x80);
    1070  break;
    1071  } // switch (**pp & (TYPE_MASK | TAG_MASK))
    1072 }
    @@ -1241,30 +1241,30 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    1150  case (TYPE_MAIN | TAG_MAIN_ENDCOLLECTION):
    1151  switch (data) {
    1152  case 0x00:
    -
    1153  Notify(PSTR(" Physical"), 0x80);
    +
    1153  E_Notify(PSTR(" Physical"), 0x80);
    1154  break;
    1155  case 0x01:
    -
    1156  Notify(PSTR(" Application"), 0x80);
    +
    1156  E_Notify(PSTR(" Application"), 0x80);
    1157  break;
    1158  case 0x02:
    -
    1159  Notify(PSTR(" Logical"), 0x80);
    +
    1159  E_Notify(PSTR(" Logical"), 0x80);
    1160  break;
    1161  case 0x03:
    -
    1162  Notify(PSTR(" Report"), 0x80);
    +
    1162  E_Notify(PSTR(" Report"), 0x80);
    1163  break;
    1164  case 0x04:
    -
    1165  Notify(PSTR(" Named Array"), 0x80);
    +
    1165  E_Notify(PSTR(" Named Array"), 0x80);
    1166  break;
    1167  case 0x05:
    -
    1168  Notify(PSTR(" Usage Switch"), 0x80);
    +
    1168  E_Notify(PSTR(" Usage Switch"), 0x80);
    1169  break;
    1170  case 0x06:
    -
    1171  Notify(PSTR(" Usage Modifier"), 0x80);
    +
    1171  E_Notify(PSTR(" Usage Modifier"), 0x80);
    1172  break;
    1173  default:
    -
    1174  Notify(PSTR(" Vendor Defined("), 0x80);
    +
    1174  E_Notify(PSTR(" Vendor Defined("), 0x80);
    1175  PrintHex<uint8_t > (data, 0x80);
    -
    1176  Notify(PSTR(")"), 0x80);
    +
    1176  E_Notify(PSTR(")"), 0x80);
    1177  }
    1178  break;
    1179  case (TYPE_MAIN | TAG_MAIN_INPUT):
    @@ -1273,9 +1273,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    1182  totalSize += (uint16_t)rptSize * (uint16_t)rptCount;
    1183  rptSize = 0;
    1184  rptCount = 0;
    -
    1185  Notify(PSTR("("), 0x80);
    +
    1185  E_Notify(PSTR("("), 0x80);
    1186  PrintBin<uint8_t > (data, 0x80);
    -
    1187  Notify(PSTR(")"), 0x80);
    +
    1187  E_Notify(PSTR(")"), 0x80);
    1188  break;
    1189  } // switch (**pp & (TYPE_MASK | TAG_MASK))
    1190  }
    @@ -1309,13 +1309,13 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    1218  if (page > 0x00 && page < 0x11)
    1219  pfUsage = /*(UsagePageFunc)pgm_read_word*/(usagePageFunctions[page - 1]);
    1220  //else if (page > 0x7f && page < 0x84)
    -
    1221  // Notify(pstrUsagePageMonitor);
    +
    1221  // E_Notify(pstrUsagePageMonitor);
    1222  //else if (page > 0x83 && page < 0x8c)
    -
    1223  // Notify(pstrUsagePagePower);
    +
    1223  // E_Notify(pstrUsagePagePower);
    1224  //else if (page > 0x8b && page < 0x92)
    -
    1225  // Notify((char*)pgm_read_word(&usagePageTitles1[page - 0x8c]));
    +
    1225  // E_Notify((char*)pgm_read_word(&usagePageTitles1[page - 0x8c]));
    1226  //else if (page > 0xfeff && page <= 0xffff)
    -
    1227  // Notify(pstrUsagePageVendorDefined);
    +
    1227  // E_Notify(pstrUsagePageVendorDefined);
    1228  else
    1229  switch (page) {
    1230  case 0x14:
    @@ -1328,232 +1328,232 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    1237 }
    1238 
    1239 void ReportDescParserBase::PrintUsagePage(uint16_t page) {
    -
    1240  Notify(pstrSpace, 0x80);
    +
    1240  E_Notify(pstrSpace, 0x80);
    1241 
    1242  if (page > 0x00 && page < 0x11)
    -
    1243  Notify((char*)pgm_read_word(&usagePageTitles0[page - 1]), 0x80);
    +
    1243  E_Notify((char*)pgm_read_word(&usagePageTitles0[page - 1]), 0x80);
    1244  else if (page > 0x7f && page < 0x84)
    -
    1245  Notify(pstrUsagePageMonitor, 0x80);
    +
    1245  E_Notify(pstrUsagePageMonitor, 0x80);
    1246  else if (page > 0x83 && page < 0x8c)
    -
    1247  Notify(pstrUsagePagePower, 0x80);
    +
    1247  E_Notify(pstrUsagePagePower, 0x80);
    1248  else if (page > 0x8b && page < 0x92)
    -
    1249  Notify((char*)pgm_read_word(&usagePageTitles1[page - 0x8c]), 0x80);
    +
    1249  E_Notify((char*)pgm_read_word(&usagePageTitles1[page - 0x8c]), 0x80);
    1250  else if (page > 0xfeff && page <= 0xffff)
    -
    1251  Notify(pstrUsagePageVendorDefined, 0x80);
    +
    1251  E_Notify(pstrUsagePageVendorDefined, 0x80);
    1252  else
    1253  switch (page) {
    1254  case 0x14:
    -
    1255  Notify(pstrUsagePageAlphaNumericDisplay, 0x80);
    +
    1255  E_Notify(pstrUsagePageAlphaNumericDisplay, 0x80);
    1256  break;
    1257  case 0x40:
    -
    1258  Notify(pstrUsagePageMedicalInstruments, 0x80);
    +
    1258  E_Notify(pstrUsagePageMedicalInstruments, 0x80);
    1259  break;
    1260  default:
    -
    1261  Notify(pstrUsagePageUndefined, 0x80);
    +
    1261  E_Notify(pstrUsagePageUndefined, 0x80);
    1262  }
    1263 }
    1264 
    1265 void ReportDescParserBase::PrintButtonPageUsage(uint16_t usage) {
    -
    1266  Notify(pstrSpace, 0x80);
    -
    1267  Notify(PSTR("Btn"), 0x80);
    +
    1266  E_Notify(pstrSpace, 0x80);
    +
    1267  E_Notify(PSTR("Btn"), 0x80);
    1268  PrintHex<uint16_t > (usage, 0x80);
    -
    1269  Notify(PSTR("\r\n"), 0x80);
    +
    1269  E_Notify(PSTR("\r\n"), 0x80);
    1270  //USB_HOST_SERIAL.print(usage, HEX);
    1271 }
    1272 
    1273 void ReportDescParserBase::PrintOrdinalPageUsage(uint16_t usage) {
    -
    1274  Notify(pstrSpace, 0x80);
    -
    1275  Notify(PSTR("Inst"), 0x80);
    +
    1274  E_Notify(pstrSpace, 0x80);
    +
    1275  E_Notify(PSTR("Inst"), 0x80);
    1276  // Sorry, HEX for now...
    1277  PrintHex<uint16_t > (usage, 0x80);
    -
    1278  Notify(PSTR("\r\n"), 0x80);
    +
    1278  E_Notify(PSTR("\r\n"), 0x80);
    1279  //USB_HOST_SERIAL.print(usage, DEC);
    1280 }
    1281 
    1282 void ReportDescParserBase::PrintGenericDesktopPageUsage(uint16_t usage) {
    -
    1283  Notify(pstrSpace, 0x80);
    +
    1283  E_Notify(pstrSpace, 0x80);
    1284 
    1285  if (usage > 0x00 && usage < 0x0a)
    -
    1286  Notify((char*)pgm_read_word(&genDesktopTitles0[usage - 1]), 0x80);
    +
    1286  E_Notify((char*)pgm_read_word(&genDesktopTitles0[usage - 1]), 0x80);
    1287  else if (usage > 0x2f && usage < 0x49)
    -
    1288  Notify((char*)pgm_read_word(&genDesktopTitles1[usage - 0x30]), 0x80);
    +
    1288  E_Notify((char*)pgm_read_word(&genDesktopTitles1[usage - 0x30]), 0x80);
    1289  else if (usage > 0x7f && usage < 0x94)
    -
    1290  Notify((char*)pgm_read_word(&genDesktopTitles2[usage - 0x80]), 0x80);
    +
    1290  E_Notify((char*)pgm_read_word(&genDesktopTitles2[usage - 0x80]), 0x80);
    1291  else if (usage > 0x9f && usage < 0xa9)
    -
    1292  Notify((char*)pgm_read_word(&genDesktopTitles3[usage - 0xa0]), 0x80);
    +
    1292  E_Notify((char*)pgm_read_word(&genDesktopTitles3[usage - 0xa0]), 0x80);
    1293  else if (usage > 0xaf && usage < 0xb8)
    -
    1294  Notify((char*)pgm_read_word(&genDesktopTitles4[usage - 0xb0]), 0x80);
    +
    1294  E_Notify((char*)pgm_read_word(&genDesktopTitles4[usage - 0xb0]), 0x80);
    1295  else
    -
    1296  Notify(pstrUsagePageUndefined, 0x80);
    +
    1296  E_Notify(pstrUsagePageUndefined, 0x80);
    1297 }
    1298 
    1299 void ReportDescParserBase::PrintSimulationControlsPageUsage(uint16_t usage) {
    -
    1300  Notify(pstrSpace, 0x80);
    +
    1300  E_Notify(pstrSpace, 0x80);
    1301 
    1302  if (usage > 0x00 && usage < 0x0d)
    -
    1303  Notify((char*)pgm_read_word(&simuTitles0[usage - 1]), 0x80);
    +
    1303  E_Notify((char*)pgm_read_word(&simuTitles0[usage - 1]), 0x80);
    1304  else if (usage > 0x1f && usage < 0x26)
    -
    1305  Notify((char*)pgm_read_word(&simuTitles1[usage - 0x20]), 0x80);
    +
    1305  E_Notify((char*)pgm_read_word(&simuTitles1[usage - 0x20]), 0x80);
    1306  else if (usage > 0xaf && usage < 0xd1)
    -
    1307  Notify((char*)pgm_read_word(&simuTitles2[usage - 0xb0]), 0x80);
    +
    1307  E_Notify((char*)pgm_read_word(&simuTitles2[usage - 0xb0]), 0x80);
    1308  else
    -
    1309  Notify(pstrUsagePageUndefined, 0x80);
    +
    1309  E_Notify(pstrUsagePageUndefined, 0x80);
    1310 }
    1311 
    1312 void ReportDescParserBase::PrintVRControlsPageUsage(uint16_t usage) {
    -
    1313  Notify(pstrSpace, 0x80);
    +
    1313  E_Notify(pstrSpace, 0x80);
    1314 
    1315  if (usage > 0x00 && usage < 0x0b)
    -
    1316  Notify((char*)pgm_read_word(&vrTitles0[usage - 1]), 0x80);
    +
    1316  E_Notify((char*)pgm_read_word(&vrTitles0[usage - 1]), 0x80);
    1317  else if (usage > 0x1f && usage < 0x22)
    -
    1318  Notify((char*)pgm_read_word(&vrTitles1[usage - 0x20]), 0x80);
    +
    1318  E_Notify((char*)pgm_read_word(&vrTitles1[usage - 0x20]), 0x80);
    1319  else
    -
    1320  Notify(pstrUsagePageUndefined, 0x80);
    +
    1320  E_Notify(pstrUsagePageUndefined, 0x80);
    1321 }
    1322 
    1323 void ReportDescParserBase::PrintSportsControlsPageUsage(uint16_t usage) {
    -
    1324  Notify(pstrSpace, 0x80);
    +
    1324  E_Notify(pstrSpace, 0x80);
    1325 
    1326  if (usage > 0x00 && usage < 0x05)
    -
    1327  Notify((char*)pgm_read_word(&sportsCtrlTitles0[usage - 1]), 0x80);
    +
    1327  E_Notify((char*)pgm_read_word(&sportsCtrlTitles0[usage - 1]), 0x80);
    1328  else if (usage > 0x2f && usage < 0x3a)
    -
    1329  Notify((char*)pgm_read_word(&sportsCtrlTitles1[usage - 0x30]), 0x80);
    +
    1329  E_Notify((char*)pgm_read_word(&sportsCtrlTitles1[usage - 0x30]), 0x80);
    1330  else if (usage > 0x4f && usage < 0x64)
    -
    1331  Notify((char*)pgm_read_word(&sportsCtrlTitles2[usage - 0x50]), 0x80);
    +
    1331  E_Notify((char*)pgm_read_word(&sportsCtrlTitles2[usage - 0x50]), 0x80);
    1332  else
    -
    1333  Notify(pstrUsagePageUndefined, 0x80);
    +
    1333  E_Notify(pstrUsagePageUndefined, 0x80);
    1334 }
    1335 
    1336 void ReportDescParserBase::PrintGameControlsPageUsage(uint16_t usage) {
    -
    1337  Notify(pstrSpace, 0x80);
    +
    1337  E_Notify(pstrSpace, 0x80);
    1338 
    1339  if (usage > 0x00 && usage < 0x04)
    -
    1340  Notify((char*)pgm_read_word(&gameTitles0[usage - 1]), 0x80);
    +
    1340  E_Notify((char*)pgm_read_word(&gameTitles0[usage - 1]), 0x80);
    1341  else if (usage > 0x1f && usage < 0x3a)
    -
    1342  Notify((char*)pgm_read_word(&gameTitles1[usage - 0x20]), 0x80);
    +
    1342  E_Notify((char*)pgm_read_word(&gameTitles1[usage - 0x20]), 0x80);
    1343  else
    -
    1344  Notify(pstrUsagePageUndefined, 0x80);
    +
    1344  E_Notify(pstrUsagePageUndefined, 0x80);
    1345 }
    1346 
    1347 void ReportDescParserBase::PrintGenericDeviceControlsPageUsage(uint16_t usage) {
    -
    1348  Notify(pstrSpace, 0x80);
    +
    1348  E_Notify(pstrSpace, 0x80);
    1349 
    1350  if (usage > 0x1f && usage < 0x27)
    -
    1351  Notify((char*)pgm_read_word(&genDevCtrlTitles[usage - 0x20]), 0x80);
    +
    1351  E_Notify((char*)pgm_read_word(&genDevCtrlTitles[usage - 0x20]), 0x80);
    1352  else
    -
    1353  Notify(pstrUsagePageUndefined, 0x80);
    +
    1353  E_Notify(pstrUsagePageUndefined, 0x80);
    1354 }
    1355 
    1356 void ReportDescParserBase::PrintLEDPageUsage(uint16_t usage) {
    -
    1357  Notify(pstrSpace, 0x80);
    +
    1357  E_Notify(pstrSpace, 0x80);
    1358 
    1359  if (usage > 0x00 && usage < 0x4e)
    -
    1360  Notify((char*)pgm_read_word(&ledTitles[usage - 1]), 0x80);
    +
    1360  E_Notify((char*)pgm_read_word(&ledTitles[usage - 1]), 0x80);
    1361  else
    -
    1362  Notify(pstrUsagePageUndefined, 0x80);
    +
    1362  E_Notify(pstrUsagePageUndefined, 0x80);
    1363 }
    1364 
    1365 void ReportDescParserBase::PrintTelephonyPageUsage(uint16_t usage) {
    -
    1366  Notify(pstrSpace, 0x80);
    +
    1366  E_Notify(pstrSpace, 0x80);
    1367 
    1368  if (usage > 0x00 && usage < 0x08)
    -
    1369  Notify((char*)pgm_read_word(&telTitles0[usage - 1]), 0x80);
    +
    1369  E_Notify((char*)pgm_read_word(&telTitles0[usage - 1]), 0x80);
    1370  else if (usage > 0x1f && usage < 0x32)
    -
    1371  Notify((char*)pgm_read_word(&telTitles1[usage - 0x1f]), 0x80);
    +
    1371  E_Notify((char*)pgm_read_word(&telTitles1[usage - 0x1f]), 0x80);
    1372  else if (usage > 0x4f && usage < 0x54)
    -
    1373  Notify((char*)pgm_read_word(&telTitles2[usage - 0x4f]), 0x80);
    +
    1373  E_Notify((char*)pgm_read_word(&telTitles2[usage - 0x4f]), 0x80);
    1374  else if (usage > 0x6f && usage < 0x75)
    -
    1375  Notify((char*)pgm_read_word(&telTitles3[usage - 0x6f]), 0x80);
    +
    1375  E_Notify((char*)pgm_read_word(&telTitles3[usage - 0x6f]), 0x80);
    1376  else if (usage > 0x8f && usage < 0x9f)
    -
    1377  Notify((char*)pgm_read_word(&telTitles4[usage - 0x8f]), 0x80);
    +
    1377  E_Notify((char*)pgm_read_word(&telTitles4[usage - 0x8f]), 0x80);
    1378  else if (usage > 0xaf && usage < 0xc0)
    -
    1379  Notify((char*)pgm_read_word(&telTitles5[usage - 0xaf]), 0x80);
    +
    1379  E_Notify((char*)pgm_read_word(&telTitles5[usage - 0xaf]), 0x80);
    1380  else
    -
    1381  Notify(pstrUsagePageUndefined, 0x80);
    +
    1381  E_Notify(pstrUsagePageUndefined, 0x80);
    1382 }
    1383 
    1384 void ReportDescParserBase::PrintConsumerPageUsage(uint16_t usage) {
    -
    1385  Notify(pstrSpace, 0x80);
    +
    1385  E_Notify(pstrSpace, 0x80);
    1386 
    1387  if (usage > 0x00 && usage < 0x07)
    -
    1388  Notify((char*)pgm_read_word(&consTitles0[usage - 1]), 0x80);
    +
    1388  E_Notify((char*)pgm_read_word(&consTitles0[usage - 1]), 0x80);
    1389  else if (usage > 0x1f && usage < 0x23)
    -
    1390  Notify((char*)pgm_read_word(&consTitles1[usage - 0x1f]), 0x80);
    +
    1390  E_Notify((char*)pgm_read_word(&consTitles1[usage - 0x1f]), 0x80);
    1391  else if (usage > 0x2f && usage < 0x37)
    -
    1392  Notify((char*)pgm_read_word(&consTitles2[usage - 0x2f]), 0x80);
    +
    1392  E_Notify((char*)pgm_read_word(&consTitles2[usage - 0x2f]), 0x80);
    1393  else if (usage > 0x3f && usage < 0x49)
    -
    1394  Notify((char*)pgm_read_word(&consTitles3[usage - 0x3f]), 0x80);
    +
    1394  E_Notify((char*)pgm_read_word(&consTitles3[usage - 0x3f]), 0x80);
    1395  else if (usage > 0x5f && usage < 0x67)
    -
    1396  Notify((char*)pgm_read_word(&consTitles4[usage - 0x5f]), 0x80);
    +
    1396  E_Notify((char*)pgm_read_word(&consTitles4[usage - 0x5f]), 0x80);
    1397  else if (usage > 0x7f && usage < 0xa5)
    -
    1398  Notify((char*)pgm_read_word(&consTitles5[usage - 0x7f]), 0x80);
    +
    1398  E_Notify((char*)pgm_read_word(&consTitles5[usage - 0x7f]), 0x80);
    1399  else if (usage > 0xaf && usage < 0xcf)
    -
    1400  Notify((char*)pgm_read_word(&consTitles6[usage - 0xaf]), 0x80);
    +
    1400  E_Notify((char*)pgm_read_word(&consTitles6[usage - 0xaf]), 0x80);
    1401  else if (usage > 0xdf && usage < 0xeb)
    -
    1402  Notify((char*)pgm_read_word(&consTitles7[usage - 0xdf]), 0x80);
    +
    1402  E_Notify((char*)pgm_read_word(&consTitles7[usage - 0xdf]), 0x80);
    1403  else if (usage > 0xef && usage < 0xf6)
    -
    1404  Notify((char*)pgm_read_word(&consTitles8[usage - 0xef]), 0x80);
    +
    1404  E_Notify((char*)pgm_read_word(&consTitles8[usage - 0xef]), 0x80);
    1405  else if (usage > 0xff && usage < 0x10e)
    -
    1406  Notify((char*)pgm_read_word(&consTitles9[usage - 0xff]), 0x80);
    +
    1406  E_Notify((char*)pgm_read_word(&consTitles9[usage - 0xff]), 0x80);
    1407  else if (usage > 0x14f && usage < 0x156)
    -
    1408  Notify((char*)pgm_read_word(&consTitlesA[usage - 0x14f]), 0x80);
    +
    1408  E_Notify((char*)pgm_read_word(&consTitlesA[usage - 0x14f]), 0x80);
    1409  else if (usage > 0x15f && usage < 0x16b)
    -
    1410  Notify((char*)pgm_read_word(&consTitlesB[usage - 0x15f]), 0x80);
    +
    1410  E_Notify((char*)pgm_read_word(&consTitlesB[usage - 0x15f]), 0x80);
    1411  else if (usage > 0x16f && usage < 0x175)
    -
    1412  Notify((char*)pgm_read_word(&consTitlesC[usage - 0x16f]), 0x80);
    +
    1412  E_Notify((char*)pgm_read_word(&consTitlesC[usage - 0x16f]), 0x80);
    1413  else if (usage > 0x17f && usage < 0x1c8)
    -
    1414  Notify((char*)pgm_read_word(&consTitlesD[usage - 0x17f]), 0x80);
    +
    1414  E_Notify((char*)pgm_read_word(&consTitlesD[usage - 0x17f]), 0x80);
    1415  else if (usage > 0x1ff && usage < 0x29d)
    -
    1416  Notify((char*)pgm_read_word(&consTitlesE[usage - 0x1ff]), 0x80);
    +
    1416  E_Notify((char*)pgm_read_word(&consTitlesE[usage - 0x1ff]), 0x80);
    1417  else
    -
    1418  Notify(pstrUsagePageUndefined, 0x80);
    +
    1418  E_Notify(pstrUsagePageUndefined, 0x80);
    1419 }
    1420 
    1421 void ReportDescParserBase::PrintDigitizerPageUsage(uint16_t usage) {
    -
    1422  Notify(pstrSpace, 0x80);
    +
    1422  E_Notify(pstrSpace, 0x80);
    1423 
    1424  if (usage > 0x00 && usage < 0x0e)
    -
    1425  Notify((char*)pgm_read_word(&digitTitles0[usage - 1]), 0x80);
    +
    1425  E_Notify((char*)pgm_read_word(&digitTitles0[usage - 1]), 0x80);
    1426  else if (usage > 0x1f && usage < 0x23)
    -
    1427  Notify((char*)pgm_read_word(&digitTitles1[usage - 0x1f]), 0x80);
    +
    1427  E_Notify((char*)pgm_read_word(&digitTitles1[usage - 0x1f]), 0x80);
    1428  else if (usage > 0x2f && usage < 0x47)
    -
    1429  Notify((char*)pgm_read_word(&digitTitles2[usage - 0x2f]), 0x80);
    +
    1429  E_Notify((char*)pgm_read_word(&digitTitles2[usage - 0x2f]), 0x80);
    1430  else
    -
    1431  Notify(pstrUsagePageUndefined, 0x80);
    +
    1431  E_Notify(pstrUsagePageUndefined, 0x80);
    1432 }
    1433 
    1434 void ReportDescParserBase::PrintAlphanumDisplayPageUsage(uint16_t usage) {
    -
    1435  Notify(pstrSpace, 0x80);
    +
    1435  E_Notify(pstrSpace, 0x80);
    1436 
    1437  if (usage > 0x00 && usage < 0x03)
    -
    1438  Notify((char*)pgm_read_word(&aplphanumTitles0[usage - 1]), 0x80);
    +
    1438  E_Notify((char*)pgm_read_word(&aplphanumTitles0[usage - 1]), 0x80);
    1439  else if (usage > 0x1f && usage < 0x4e)
    -
    1440  Notify((char*)pgm_read_word(&aplphanumTitles1[usage - 0x1f]), 0x80);
    +
    1440  E_Notify((char*)pgm_read_word(&aplphanumTitles1[usage - 0x1f]), 0x80);
    1441  else if (usage > 0x7f && usage < 0x96)
    -
    1442  Notify((char*)pgm_read_word(&digitTitles2[usage - 0x80]), 0x80);
    +
    1442  E_Notify((char*)pgm_read_word(&digitTitles2[usage - 0x80]), 0x80);
    1443  else
    -
    1444  Notify(pstrUsagePageUndefined, 0x80);
    +
    1444  E_Notify(pstrUsagePageUndefined, 0x80);
    1445 }
    1446 
    1447 void ReportDescParserBase::PrintMedicalInstrumentPageUsage(uint16_t usage) {
    -
    1448  Notify(pstrSpace, 0x80);
    +
    1448  E_Notify(pstrSpace, 0x80);
    1449 
    1450  if (usage == 1)
    -
    1451  Notify(pstrUsageMedicalUltrasound, 0x80);
    +
    1451  E_Notify(pstrUsageMedicalUltrasound, 0x80);
    1452  else if (usage > 0x1f && usage < 0x28)
    -
    1453  Notify((char*)pgm_read_word(&medInstrTitles0[usage - 0x1f]), 0x80);
    +
    1453  E_Notify((char*)pgm_read_word(&medInstrTitles0[usage - 0x1f]), 0x80);
    1454  else if (usage > 0x3f && usage < 0x45)
    -
    1455  Notify((char*)pgm_read_word(&medInstrTitles1[usage - 0x40]), 0x80);
    +
    1455  E_Notify((char*)pgm_read_word(&medInstrTitles1[usage - 0x40]), 0x80);
    1456  else if (usage > 0x5f && usage < 0x62)
    -
    1457  Notify((char*)pgm_read_word(&medInstrTitles2[usage - 0x60]), 0x80);
    +
    1457  E_Notify((char*)pgm_read_word(&medInstrTitles2[usage - 0x60]), 0x80);
    1458  else if (usage == 0x70)
    -
    1459  Notify(pstrUsageDepthGainCompensation, 0x80);
    +
    1459  E_Notify(pstrUsageDepthGainCompensation, 0x80);
    1460  else if (usage > 0x7f && usage < 0x8a)
    -
    1461  Notify((char*)pgm_read_word(&medInstrTitles3[usage - 0x80]), 0x80);
    +
    1461  E_Notify((char*)pgm_read_word(&medInstrTitles3[usage - 0x80]), 0x80);
    1462  else if (usage > 0x9f && usage < 0xa2)
    -
    1463  Notify((char*)pgm_read_word(&medInstrTitles4[usage - 0xa0]), 0x80);
    +
    1463  E_Notify((char*)pgm_read_word(&medInstrTitles4[usage - 0xa0]), 0x80);
    1464  else
    -
    1465  Notify(pstrUsagePageUndefined, 0x80);
    +
    1465  E_Notify(pstrUsagePageUndefined, 0x80);
    1466 }
    1467 
    1468 uint8_t ReportDescParser2::ParseItem(uint8_t **pp, uint16_t *pcntdn) {
    @@ -1704,7 +1704,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    1613  }
    1614  PrintByteValue(result.dwResult);
    1615  }
    -
    1616  Notify(PSTR("\r\n"), 0x80);
    +
    1616  E_Notify(PSTR("\r\n"), 0x80);
    1617 }
    1618 
    1619 void UniversalReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
    diff --git a/hiduniversal_8cpp_source.html b/hiduniversal_8cpp_source.html index c4b2681d..97b31266 100644 --- a/hiduniversal_8cpp_source.html +++ b/hiduniversal_8cpp_source.html @@ -313,25 +313,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    222 
    223 FailGetDevDescr:
    224 #ifdef DEBUG_USB_HOST
    -
    225  NotifyFailGetDevDescr();
    +
    225  NotifyFailGetDevDescr();
    226  goto Fail;
    227 #endif
    228 
    229 FailSetDevTblEntry:
    230 #ifdef DEBUG_USB_HOST
    -
    231  NotifyFailSetDevTblEntry();
    +
    231  NotifyFailSetDevTblEntry();
    232  goto Fail;
    233 #endif
    234 
    235 FailGetConfDescr:
    236 #ifdef DEBUG_USB_HOST
    -
    237  NotifyFailGetConfDescr();
    +
    237  NotifyFailGetConfDescr();
    238  goto Fail;
    239 #endif
    240 
    241 FailSetConfDescr:
    242 #ifdef DEBUG_USB_HOST
    -
    243  NotifyFailSetConfDescr();
    +
    243  NotifyFailSetConfDescr();
    244  goto Fail;
    245 #endif
    246 
    @@ -343,7 +343,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    252 
    253 Fail:
    254 #ifdef DEBUG_USB_HOST
    -
    255  NotifyFail(rcode);
    +
    255  NotifyFail(rcode);
    256 #endif
    257  Release();
    258  return rcode;
    @@ -462,12 +462,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    371  if (identical)
    372  return 0;
    373 
    -
    374  Notify(PSTR("\r\nBuf: "), 0x80);
    +
    374  Notify(PSTR("\r\nBuf: "), 0x80);
    375 
    376  for (uint8_t i = 0; i < read; i++)
    -
    377  PrintHex<uint8_t > (buf[i], 0x80);
    +
    377  D_PrintHex<uint8_t > (buf[i], 0x80);
    378 
    -
    379  Notify(PSTR("\r\n"), 0x80);
    +
    379  Notify(PSTR("\r\n"), 0x80);
    380 
    381  HIDReportParser *prs = GetReportParser(((bHasReportId) ? *buf : 0));
    382 
    diff --git a/masstorage_8cpp_source.html b/masstorage_8cpp_source.html index 267abc31..d2f62df3 100644 --- a/masstorage_8cpp_source.html +++ b/masstorage_8cpp_source.html @@ -121,8 +121,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    56 
    57 
    66 uint8_t BulkOnly::LockMedia(uint8_t lun, uint8_t lock) {
    -
    67  Notify(PSTR("\r\nLockMedia\r\n"), 0x80);
    -
    68  Notify(PSTR("---------\r\n"), 0x80);
    +
    67  Notify(PSTR("\r\nLockMedia\r\n"), 0x80);
    +
    68  Notify(PSTR("---------\r\n"), 0x80);
    69 
    70  CommandBlockWrapper cbw;
    71  SetCurLUN(lun);
    @@ -144,8 +144,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    87 }
    88 
    97 uint8_t BulkOnly::MediaCTL(uint8_t lun, uint8_t ctl) {
    -
    98  Notify(PSTR("\r\nMediaCTL\r\n"), 0x80);
    -
    99  Notify(PSTR("-----------------\r\n"), 0x80);
    +
    98  Notify(PSTR("\r\nMediaCTL\r\n"), 0x80);
    +
    99  Notify(PSTR("-----------------\r\n"), 0x80);
    100  SetCurLUN(lun);
    101  uint8_t rcode = MASS_ERR_UNIT_NOT_READY;
    102  if (bAddress) {
    @@ -172,16 +172,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    123 
    134 uint8_t BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf) {
    135  if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA;
    -
    136  Notify(PSTR("\r\nRead LUN:\t"), 0x80);
    -
    137  PrintHex<uint8_t > (lun, 0x90);
    +
    136  Notify(PSTR("\r\nRead LUN:\t"), 0x80);
    +
    137  D_PrintHex<uint8_t > (lun, 0x90);
    138  //printf("LUN=%i LBA=%8.8X BLOCKS=%i SIZE=%i\r\n", lun, addr, blocks, bsize);
    -
    139  Notify(PSTR("\r\nLBA:\t\t"), 0x90);
    -
    140  PrintHex<uint32_t > (addr, 0x90);
    -
    141  Notify(PSTR("\r\nblocks:\t\t"), 0x90);
    -
    142  PrintHex<uint8_t > (blocks, 0x90);
    -
    143  Notify(PSTR("\r\nblock size:\t"), 0x90);
    -
    144  PrintHex<uint16_t > (bsize, 0x90);
    -
    145  Notify(PSTR("\r\n---------\r\n"), 0x80);
    +
    139  Notify(PSTR("\r\nLBA:\t\t"), 0x90);
    +
    140  D_PrintHex<uint32_t > (addr, 0x90);
    +
    141  Notify(PSTR("\r\nblocks:\t\t"), 0x90);
    +
    142  D_PrintHex<uint8_t > (blocks, 0x90);
    +
    143  Notify(PSTR("\r\nblock size:\t"), 0x90);
    +
    144  D_PrintHex<uint16_t > (bsize, 0x90);
    +
    145  Notify(PSTR("\r\n---------\r\n"), 0x80);
    146  CommandBlockWrapper cbw;
    147 
    148 again:
    @@ -215,16 +215,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    186 uint8_t BulkOnly::Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, const uint8_t * buf) {
    187  if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA;
    188  if (!WriteOk[lun]) return MASS_ERR_WRITE_PROTECTED;
    -
    189  Notify(PSTR("\r\nWrite LUN:\t"), 0x80);
    -
    190  PrintHex<uint8_t > (lun, 0x90);
    +
    189  Notify(PSTR("\r\nWrite LUN:\t"), 0x80);
    +
    190  D_PrintHex<uint8_t > (lun, 0x90);
    191  //printf("LUN=%i LBA=%8.8X BLOCKS=%i SIZE=%i\r\n", lun, addr, blocks, bsize);
    -
    192  Notify(PSTR("\r\nLBA:\t\t"), 0x90);
    -
    193  PrintHex<uint32_t > (addr, 0x90);
    -
    194  Notify(PSTR("\r\nblocks:\t\t"), 0x90);
    -
    195  PrintHex<uint8_t > (blocks, 0x90);
    -
    196  Notify(PSTR("\r\nblock size:\t"), 0x90);
    -
    197  PrintHex<uint16_t > (bsize, 0x90);
    -
    198  Notify(PSTR("\r\n---------\r\n"), 0x80);
    +
    192  Notify(PSTR("\r\nLBA:\t\t"), 0x90);
    +
    193  D_PrintHex<uint32_t > (addr, 0x90);
    +
    194  Notify(PSTR("\r\nblocks:\t\t"), 0x90);
    +
    195  D_PrintHex<uint8_t > (blocks, 0x90);
    +
    196  Notify(PSTR("\r\nblock size:\t"), 0x90);
    +
    197  D_PrintHex<uint16_t > (bsize, 0x90);
    +
    198  Notify(PSTR("\r\n---------\r\n"), 0x80);
    199  //MediaCTL(lun, 0x01);
    200  CommandBlockWrapper cbw;
    201 
    @@ -290,7 +290,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    277  EpInfo *oldep_ptr = NULL;
    278  USBTRACE("MS ConfigureDevice\r\n");
    279  ClearAllEP();
    -
    280  delay(2000);
    +
    280  //delay(2000);
    281  AddressPool &addrPool = pUsb->GetAddressPool();
    282 
    283 
    @@ -340,7 +340,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    327 
    328 FailGetDevDescr:
    329 #ifdef DEBUG_USB_HOST
    -
    330  NotifyFailGetDevDescr(rcode);
    +
    330  NotifyFailGetDevDescr(rcode);
    331 #endif
    332  rcode = USB_ERROR_FailGetDevDescr;
    333 
    @@ -415,819 +415,818 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    409  // Assign epInfo to epinfo pointer
    410  pUsb->setEpInfoEntry(bAddress, bNumEP, epInfo);
    411 
    -
    412  USBTRACE("MS ConfigureDevice\r\n");
    -
    413  USBTRACE2("Conf:", bConfNum);
    -
    414 
    -
    415  // Set Configuration Value
    -
    416  rcode = pUsb->setConf(bAddress, 0, bConfNum);
    -
    417 
    -
    418  if (rcode)
    -
    419  goto FailSetConfDescr;
    -
    420 
    -
    421  //Linux does a 1sec delay after this.
    -
    422  delay(1000);
    -
    423 
    -
    424  rcode = GetMaxLUN(&bMaxLUN);
    -
    425  if (rcode)
    -
    426  goto FailGetMaxLUN;
    -
    427 
    -
    428  if (bMaxLUN >= MASS_MAX_SUPPORTED_LUN) bMaxLUN = MASS_MAX_SUPPORTED_LUN - 1;
    -
    429  ErrorMessage<uint8_t > (PSTR("MaxLUN"), bMaxLUN);
    -
    430 
    -
    431  delay(1000); // Delay a bit for slow firmware.
    -
    432 
    -
    433  //bTheLUN = bMaxLUN;
    -
    434 
    -
    435  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    -
    436  InquiryResponse response;
    -
    437  rcode = Inquiry(lun, sizeof (InquiryResponse), (uint8_t*) & response);
    -
    438  if (rcode) {
    -
    439  ErrorMessage<uint8_t > (PSTR("Inquiry"), rcode);
    -
    440  } else {
    -
    441  uint8_t tries = 0xf0;
    -
    442  while (rcode = TestUnitReady(lun)) {
    -
    443  if (rcode == 0x08) break; // break on no media, this is OK to do.
    -
    444  // try to lock media and spin up
    -
    445  if (tries < 14) {
    -
    446  LockMedia(lun, 1);
    -
    447  MediaCTL(lun, 1); // I actually have a USB stick that needs this!
    -
    448  } else delay(2 * (tries + 1));
    -
    449  tries++;
    -
    450  if (!tries) break;
    -
    451  }
    -
    452  if (!rcode) {
    -
    453  delay(1000);
    -
    454  LUNOk[lun] = CheckLUN(lun);
    -
    455  if (!LUNOk[lun]) LUNOk[lun] = CheckLUN(lun);
    -
    456  }
    -
    457  }
    -
    458  }
    +
    412  USBTRACE2("Conf:", bConfNum);
    +
    413 
    +
    414  // Set Configuration Value
    +
    415  rcode = pUsb->setConf(bAddress, 0, bConfNum);
    +
    416 
    +
    417  if (rcode)
    +
    418  goto FailSetConfDescr;
    +
    419 
    +
    420  //Linux does a 1sec delay after this.
    +
    421  delay(1000);
    +
    422 
    +
    423  rcode = GetMaxLUN(&bMaxLUN);
    +
    424  if (rcode)
    +
    425  goto FailGetMaxLUN;
    +
    426 
    +
    427  if (bMaxLUN >= MASS_MAX_SUPPORTED_LUN) bMaxLUN = MASS_MAX_SUPPORTED_LUN - 1;
    +
    428  ErrorMessage<uint8_t > (PSTR("MaxLUN"), bMaxLUN);
    +
    429 
    +
    430  delay(1000); // Delay a bit for slow firmware.
    +
    431 
    +
    432  //bTheLUN = bMaxLUN;
    +
    433 
    +
    434  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    +
    435  InquiryResponse response;
    +
    436  rcode = Inquiry(lun, sizeof (InquiryResponse), (uint8_t*) & response);
    +
    437  if (rcode) {
    +
    438  ErrorMessage<uint8_t > (PSTR("Inquiry"), rcode);
    +
    439  } else {
    +
    440  uint8_t tries = 0xf0;
    +
    441  while (rcode = TestUnitReady(lun)) {
    +
    442  if (rcode == 0x08) break; // break on no media, this is OK to do.
    +
    443  // try to lock media and spin up
    +
    444  if (tries < 14) {
    +
    445  LockMedia(lun, 1);
    +
    446  MediaCTL(lun, 1); // I actually have a USB stick that needs this!
    +
    447  } else delay(2 * (tries + 1));
    +
    448  tries++;
    +
    449  if (!tries) break;
    +
    450  }
    +
    451  if (!rcode) {
    +
    452  delay(1000);
    +
    453  LUNOk[lun] = CheckLUN(lun);
    +
    454  if (!LUNOk[lun]) LUNOk[lun] = CheckLUN(lun);
    +
    455  }
    +
    456  }
    +
    457  }
    +
    458 
    459 
    -
    460 
    -
    461 #if 0
    -
    462  {
    -
    463  bool good;
    -
    464  for (uint8_t i = 1; i == 0; i++) {
    -
    465  good = false;
    -
    466  CheckMedia();
    -
    467  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) good |= LUNOk[lun];
    -
    468  if (good) break;
    -
    469  delay(118); // 255 loops =~ 30 seconds to allow for spin up, as per SCSI spec.
    -
    470  }
    -
    471  }
    -
    472 #else
    -
    473  CheckMedia();
    -
    474 #endif
    -
    475 
    -
    476  rcode = OnInit();
    -
    477 
    -
    478  if (rcode)
    -
    479  goto FailOnInit;
    -
    480 
    -
    481  USBTRACE("MS configured\r\n\r\n");
    -
    482 
    -
    483  bPollEnable = true;
    -
    484 
    -
    485  //USBTRACE("Poll enabled\r\n");
    -
    486  return 0;
    -
    487 
    -
    488 FailSetConfDescr:
    -
    489 #ifdef DEBUG_USB_HOST
    -
    490  NotifyFailSetConfDescr();
    -
    491  goto Fail;
    -
    492 #endif
    -
    493 
    -
    494 FailOnInit:
    -
    495 #ifdef DEBUG_USB_HOST
    -
    496  USBTRACE("OnInit:");
    -
    497  goto Fail;
    -
    498 #endif
    -
    499 
    -
    500 FailGetMaxLUN:
    -
    501 #ifdef DEBUG_USB_HOST
    -
    502  USBTRACE("GetMaxLUN:");
    -
    503  goto Fail;
    -
    504 #endif
    -
    505 
    -
    506 FailInvalidSectorSize:
    -
    507 #ifdef DEBUG_USB_HOST
    -
    508  USBTRACE("Sector Size is NOT VALID: ");
    -
    509  goto Fail;
    -
    510 #endif
    -
    511 
    -
    512 FailSetDevTblEntry:
    -
    513 #ifdef DEBUG_USB_HOST
    -
    514  NotifyFailSetDevTblEntry();
    -
    515  goto Fail;
    -
    516 #endif
    -
    517 
    -
    518 FailGetConfDescr:
    -
    519 #ifdef DEBUG_USB_HOST
    -
    520  NotifyFailGetConfDescr();
    -
    521 #endif
    -
    522 
    -
    523 Fail:
    -
    524 #ifdef DEBUG_USB_HOST
    -
    525  NotifyFail(rcode);
    -
    526 #endif
    -
    527  Release();
    -
    528  return rcode;
    -
    529 }
    -
    530 
    -
    536 uint8_t BulkOnly::Release() {
    -
    537  ClearAllEP();
    -
    538  pUsb->GetAddressPool().FreeAddress(bAddress);
    -
    539  return 0;
    -
    540 }
    -
    541 
    -
    548 boolean BulkOnly::CheckLUN(uint8_t lun) {
    -
    549  uint8_t rcode;
    -
    550  Capacity capacity;
    -
    551  for (uint8_t i = 0; i<sizeof (Capacity); i++) capacity.data[i] = 0;
    -
    552 
    -
    553  rcode = ReadCapacity(lun, sizeof (Capacity), (uint8_t*) & capacity);
    -
    554  if (rcode) {
    -
    555  //printf(">>>>>>>>>>>>>>>>ReadCapacity returned %i\r\n", rcode);
    -
    556  return false;
    -
    557  }
    -
    558  ErrorMessage<uint8_t > (PSTR(">>>>>>>>>>>>>>>>CAPACITY OK ON LUN"), lun);
    -
    559  for (uint8_t i = 0; i<sizeof (Capacity); i++)
    -
    560  PrintHex<uint8_t > (capacity.data[i], 0x80);
    -
    561  Notify(PSTR("\r\n\r\n"), 0x80);
    -
    562  // Only 512/1024/2048/4096 are valid values!
    -
    563  uint32_t c = ((uint32_t)capacity.data[4] << 24) + ((uint32_t)capacity.data[5] << 16) + ((uint32_t)capacity.data[6] << 8) + (uint32_t)capacity.data[7];
    -
    564  if (c != 0x0200LU && c != 0x0400LU && c != 0x0800LU && c != 0x1000LU) {
    -
    565  return false;
    -
    566  }
    -
    567  // Store capacity information.
    -
    568  CurrentSectorSize[lun] = (uint16_t)(c & 0xFFFF);
    -
    569  CurrentCapacity[lun] = ((uint32_t)capacity.data[0] << 24) + ((uint32_t)capacity.data[1] << 16) + ((uint32_t)capacity.data[2] << 8) + (uint32_t)capacity.data[3];
    -
    570  if (CurrentCapacity[lun] == 0xffffffffLU || CurrentCapacity[lun] == 0x00LU) {
    -
    571  // Buggy firmware will report 0xffffffff or 0 for no media
    -
    572  if (CurrentCapacity[lun])
    -
    573  ErrorMessage<uint8_t > (PSTR(">>>>>>>>>>>>>>>>BUGGY FIRMWARE. CAPACITY FAIL ON LUN"), lun);
    -
    574  return false;
    -
    575  }
    -
    576  delay(20);
    -
    577  Page3F(lun);
    -
    578  if (!TestUnitReady(lun)) return true;
    -
    579  return false;
    -
    580 }
    -
    581 
    -
    582 
    -
    588 void BulkOnly::CheckMedia() {
    -
    589  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    -
    590  if (TestUnitReady(lun)) {
    -
    591  LUNOk[lun] = false;
    -
    592  continue;
    -
    593  }
    -
    594  if (!LUNOk[lun])
    -
    595  LUNOk[lun] = CheckLUN(lun);
    -
    596  }
    -
    597 #if 0
    -
    598  printf("}}}}}}}}}}}}}}}}STATUS ");
    -
    599  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    -
    600  if (LUNOk[lun])
    -
    601  printf("#");
    -
    602  else printf(".");
    -
    603  }
    -
    604  printf("\r\n");
    -
    605 #endif
    -
    606  qNextPollTime = millis() + 2000;
    -
    607 }
    -
    608 
    -
    614 uint8_t BulkOnly::Poll() {
    -
    615  uint8_t rcode = 0;
    +
    460 #if 0
    +
    461  {
    +
    462  bool good;
    +
    463  for (uint8_t i = 1; i == 0; i++) {
    +
    464  good = false;
    +
    465  CheckMedia();
    +
    466  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) good |= LUNOk[lun];
    +
    467  if (good) break;
    +
    468  delay(118); // 255 loops =~ 30 seconds to allow for spin up, as per SCSI spec.
    +
    469  }
    +
    470  }
    +
    471 #else
    +
    472  CheckMedia();
    +
    473 #endif
    +
    474 
    +
    475  rcode = OnInit();
    +
    476 
    +
    477  if (rcode)
    +
    478  goto FailOnInit;
    +
    479 
    +
    480  USBTRACE("MS configured\r\n\r\n");
    +
    481 
    +
    482  bPollEnable = true;
    +
    483 
    +
    484  //USBTRACE("Poll enabled\r\n");
    +
    485  return 0;
    +
    486 
    +
    487 FailSetConfDescr:
    +
    488 #ifdef DEBUG_USB_HOST
    +
    489  NotifyFailSetConfDescr();
    +
    490  goto Fail;
    +
    491 #endif
    +
    492 
    +
    493 FailOnInit:
    +
    494 #ifdef DEBUG_USB_HOST
    +
    495  USBTRACE("OnInit:");
    +
    496  goto Fail;
    +
    497 #endif
    +
    498 
    +
    499 FailGetMaxLUN:
    +
    500 #ifdef DEBUG_USB_HOST
    +
    501  USBTRACE("GetMaxLUN:");
    +
    502  goto Fail;
    +
    503 #endif
    +
    504 
    +
    505 FailInvalidSectorSize:
    +
    506 #ifdef DEBUG_USB_HOST
    +
    507  USBTRACE("Sector Size is NOT VALID: ");
    +
    508  goto Fail;
    +
    509 #endif
    +
    510 
    +
    511 FailSetDevTblEntry:
    +
    512 #ifdef DEBUG_USB_HOST
    +
    513  NotifyFailSetDevTblEntry();
    +
    514  goto Fail;
    +
    515 #endif
    +
    516 
    +
    517 FailGetConfDescr:
    +
    518 #ifdef DEBUG_USB_HOST
    +
    519  NotifyFailGetConfDescr();
    +
    520 #endif
    +
    521 
    +
    522 Fail:
    +
    523 #ifdef DEBUG_USB_HOST
    +
    524  NotifyFail(rcode);
    +
    525 #endif
    +
    526  Release();
    +
    527  return rcode;
    +
    528 }
    +
    529 
    +
    539 void BulkOnly::EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR * pep) {
    +
    540  ErrorMessage<uint8_t > (PSTR("Conf.Val"), conf);
    +
    541  ErrorMessage<uint8_t > (PSTR("Iface Num"), iface);
    +
    542  ErrorMessage<uint8_t > (PSTR("Alt.Set"), alt);
    +
    543 
    +
    544  bConfNum = conf;
    +
    545 
    +
    546  uint8_t index;
    +
    547 
    +
    548  if ((pep->bmAttributes & 0x03) == 3 && (pep->bEndpointAddress & 0x80) == 0x80)
    +
    549  index = epInterruptInIndex;
    +
    550  else
    +
    551  if ((pep->bmAttributes & 0x02) == 2)
    +
    552  index = ((pep->bEndpointAddress & 0x80) == 0x80) ? epDataInIndex : epDataOutIndex;
    +
    553  else
    +
    554  return;
    +
    555 
    +
    556  // Fill in the endpoint info structure
    +
    557  epInfo[index].epAddr = (pep->bEndpointAddress & 0x0F);
    +
    558  epInfo[index].maxPktSize = (uint8_t)pep->wMaxPacketSize;
    +
    559  epInfo[index].epAttribs = 0;
    +
    560 
    +
    561  bNumEP++;
    +
    562 
    +
    563  PrintEndpointDescriptor(pep);
    +
    564 }
    +
    565 
    +
    571 uint8_t BulkOnly::Release() {
    +
    572  ClearAllEP();
    +
    573  pUsb->GetAddressPool().FreeAddress(bAddress);
    +
    574  return 0;
    +
    575 }
    +
    576 
    +
    583 boolean BulkOnly::CheckLUN(uint8_t lun) {
    +
    584  uint8_t rcode;
    +
    585  Capacity capacity;
    +
    586  for (uint8_t i = 0; i<sizeof (Capacity); i++) capacity.data[i] = 0;
    +
    587 
    +
    588  rcode = ReadCapacity(lun, sizeof (Capacity), (uint8_t*) & capacity);
    +
    589  if (rcode) {
    +
    590  //printf(">>>>>>>>>>>>>>>>ReadCapacity returned %i\r\n", rcode);
    +
    591  return false;
    +
    592  }
    +
    593  ErrorMessage<uint8_t > (PSTR(">>>>>>>>>>>>>>>>CAPACITY OK ON LUN"), lun);
    +
    594  for (uint8_t i = 0; i<sizeof (Capacity); i++)
    +
    595  D_PrintHex<uint8_t > (capacity.data[i], 0x80);
    +
    596  Notify(PSTR("\r\n\r\n"), 0x80);
    +
    597  // Only 512/1024/2048/4096 are valid values!
    +
    598  uint32_t c = ((uint32_t)capacity.data[4] << 24) + ((uint32_t)capacity.data[5] << 16) + ((uint32_t)capacity.data[6] << 8) + (uint32_t)capacity.data[7];
    +
    599  if (c != 0x0200LU && c != 0x0400LU && c != 0x0800LU && c != 0x1000LU) {
    +
    600  return false;
    +
    601  }
    +
    602  // Store capacity information.
    +
    603  CurrentSectorSize[lun] = (uint16_t)(c & 0xFFFF);
    +
    604  CurrentCapacity[lun] = ((uint32_t)capacity.data[0] << 24) + ((uint32_t)capacity.data[1] << 16) + ((uint32_t)capacity.data[2] << 8) + (uint32_t)capacity.data[3];
    +
    605  if (CurrentCapacity[lun] == 0xffffffffLU || CurrentCapacity[lun] == 0x00LU) {
    +
    606  // Buggy firmware will report 0xffffffff or 0 for no media
    +
    607  if (CurrentCapacity[lun])
    +
    608  ErrorMessage<uint8_t > (PSTR(">>>>>>>>>>>>>>>>BUGGY FIRMWARE. CAPACITY FAIL ON LUN"), lun);
    +
    609  return false;
    +
    610  }
    +
    611  delay(20);
    +
    612  Page3F(lun);
    +
    613  if (!TestUnitReady(lun)) return true;
    +
    614  return false;
    +
    615 }
    616 
    -
    617  if (!bPollEnable)
    -
    618  return 0;
    -
    619 
    -
    620  if (qNextPollTime <= millis()) {
    -
    621  CheckMedia();
    -
    622  }
    -
    623  rcode = 0;
    -
    624 
    -
    625  return rcode;
    -
    626 }
    -
    627 
    -
    629 
    -
    630 
    -
    631 // SCSI code
    -
    632 
    -
    633 
    -
    635 
    -
    642 uint8_t BulkOnly::GetMaxLUN(uint8_t *plun) {
    -
    643  uint8_t ret = pUsb->ctrlReq(bAddress, 0, bmREQ_MASSIN, MASS_REQ_GET_MAX_LUN, 0, 0, bIface, 1, 1, plun, NULL);
    -
    644 
    -
    645  if (ret == hrSTALL)
    -
    646  *plun = 0;
    -
    647 
    -
    648  return 0;
    -
    649 }
    -
    650 
    +
    617 
    +
    623 void BulkOnly::CheckMedia() {
    +
    624  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    +
    625  if (TestUnitReady(lun)) {
    +
    626  LUNOk[lun] = false;
    +
    627  continue;
    +
    628  }
    +
    629  if (!LUNOk[lun])
    +
    630  LUNOk[lun] = CheckLUN(lun);
    +
    631  }
    +
    632 #if 0
    +
    633  printf("}}}}}}}}}}}}}}}}STATUS ");
    +
    634  for (uint8_t lun = 0; lun <= bMaxLUN; lun++) {
    +
    635  if (LUNOk[lun])
    +
    636  printf("#");
    +
    637  else printf(".");
    +
    638  }
    +
    639  printf("\r\n");
    +
    640 #endif
    +
    641  qNextPollTime = millis() + 2000;
    +
    642 }
    +
    643 
    +
    649 uint8_t BulkOnly::Poll() {
    +
    650  uint8_t rcode = 0;
    651 
    -
    660 uint8_t BulkOnly::Inquiry(uint8_t lun, uint16_t bsize, uint8_t *buf) {
    -
    661  Notify(PSTR("\r\nInquiry\r\n"), 0x80);
    -
    662  Notify(PSTR("---------\r\n"), 0x80);
    -
    663 
    -
    664  CommandBlockWrapper cbw;
    -
    665  SetCurLUN(lun);
    -
    666  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    667  cbw.dCBWTag = ++dCBWTag;
    -
    668  cbw.dCBWDataTransferLength = bsize;
    -
    669  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    -
    670  cbw.bmCBWLUN = lun;
    -
    671  cbw.bmCBWCBLength = 6;
    -
    672 
    -
    673  for (uint8_t i = 0; i < 16; i++)
    -
    674  cbw.CBWCB[i] = 0;
    -
    675 
    -
    676  cbw.CBWCB[0] = SCSI_CMD_INQUIRY;
    -
    677  cbw.CBWCB[1] = lun << 5;
    -
    678  cbw.CBWCB[4] = bsize;
    +
    652  if (!bPollEnable)
    +
    653  return 0;
    +
    654 
    +
    655  if (qNextPollTime <= millis()) {
    +
    656  CheckMedia();
    +
    657  }
    +
    658  rcode = 0;
    +
    659 
    +
    660  return rcode;
    +
    661 }
    +
    662 
    +
    664 
    +
    665 
    +
    666 // SCSI code
    +
    667 
    +
    668 
    +
    670 
    +
    677 uint8_t BulkOnly::GetMaxLUN(uint8_t *plun) {
    +
    678  uint8_t ret = pUsb->ctrlReq(bAddress, 0, bmREQ_MASSIN, MASS_REQ_GET_MAX_LUN, 0, 0, bIface, 1, 1, plun, NULL);
    679 
    -
    680  uint8_t rc = HandleSCSIError(Transaction(&cbw, bsize, buf, 0));
    -
    681 #if 0
    -
    682  if (!rc) {
    -
    683  printf("LUN %i `", lun);
    -
    684  for (int i = 8; i < 36; i++) printf("%c", buf[i]);
    -
    685  printf("'\r\nQualifier %1.1X ", (buf[0]&0xE0) >> 5);
    -
    686  printf("Device type %2.2X ", buf[0]&0x1f);
    -
    687  printf("RMB %1.1X ", buf[1]&0x80 >> 7);
    -
    688  printf("SSCS% 1.1X ", buf[5]&0x80 >> 7);
    -
    689  uint8_t sv = buf[2];
    -
    690  printf("SCSI version %2.2X\r\nDevice conforms to ", sv);
    -
    691  switch (sv) {
    -
    692  case 0:
    -
    693  printf("No specific");
    -
    694  break;
    -
    695  /*
    -
    696  case 1:
    -
    697  printf("");
    -
    698  break;
    -
    699  */
    -
    700  case 2:
    -
    701  printf("ANSI 2");
    -
    702  break;
    -
    703  case 3:
    -
    704  printf("ANSI INCITS 301-1997 (SPC)");
    -
    705  break;
    -
    706  case 4:
    -
    707  printf("ANSI INCITS 351-2001 (SPC-2)");
    -
    708  break;
    -
    709  case 5:
    -
    710  printf("ANSI INCITS 408-2005 (SPC-4)");
    -
    711  break;
    -
    712  case 6:
    -
    713  printf("T10/1731-D (SPC-4)");
    -
    714  break;
    -
    715  default:
    -
    716  printf("unknown");
    -
    717  }
    -
    718  printf(" standards.\r\n");
    -
    719  }
    -
    720 #endif
    -
    721  return rc;
    -
    722 }
    -
    723 
    -
    732 uint8_t BulkOnly::RequestSense(uint8_t lun, uint16_t size, uint8_t *buf) {
    -
    733  Notify(PSTR("\r\nRequestSense\r\n"), 0x80);
    -
    734  Notify(PSTR("----------------\r\n"), 0x80);
    -
    735 
    -
    736  CommandBlockWrapper cbw;
    -
    737  SetCurLUN(lun);
    -
    738 
    -
    739  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    740  cbw.dCBWTag = ++dCBWTag;
    -
    741  cbw.dCBWDataTransferLength = size;
    -
    742  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    -
    743  cbw.bmCBWLUN = lun;
    -
    744  cbw.bmCBWCBLength = 6;
    -
    745 
    -
    746  for (uint8_t i = 0; i < 16; i++)
    -
    747  cbw.CBWCB[i] = 0;
    -
    748 
    -
    749  cbw.CBWCB[0] = SCSI_CMD_REQUEST_SENSE;
    -
    750  cbw.CBWCB[1] = lun << 5;
    -
    751  cbw.CBWCB[4] = size;
    -
    752 
    -
    753  return Transaction(&cbw, size, buf, 0);
    -
    754 }
    -
    755 
    -
    764 uint8_t BulkOnly::ReadCapacity(uint8_t lun, uint16_t bsize, uint8_t *buf) {
    -
    765  Notify(PSTR("\r\nReadCapacity\r\n"), 0x80);
    -
    766  Notify(PSTR("---------------\r\n"), 0x80);
    -
    767  CommandBlockWrapper cbw;
    -
    768 
    -
    769  SetCurLUN(lun);
    -
    770  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    771  cbw.dCBWTag = ++dCBWTag;
    -
    772  cbw.dCBWDataTransferLength = bsize;
    -
    773  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    -
    774  cbw.bmCBWLUN = lun;
    -
    775  cbw.bmCBWCBLength = 10;
    -
    776 
    -
    777  for (uint8_t i = 0; i < 16; i++)
    -
    778  cbw.CBWCB[i] = 0;
    -
    779 
    -
    780  cbw.CBWCB[0] = SCSI_CMD_READ_CAPACITY_10;
    -
    781  cbw.CBWCB[1] = lun << 5;
    -
    782 
    -
    783  return HandleSCSIError(Transaction(&cbw, bsize, buf, 0));
    -
    784 }
    -
    785 
    -
    792 uint8_t BulkOnly::TestUnitReady(uint8_t lun) {
    -
    793  SetCurLUN(lun);
    -
    794  if (!bAddress)
    -
    795  return MASS_ERR_UNIT_NOT_READY;
    -
    796 
    -
    797  Notify(PSTR("\r\nTestUnitReady\r\n"), 0x80);
    -
    798  Notify(PSTR("-----------------\r\n"), 0x80);
    -
    799 
    -
    800  CommandBlockWrapper cbw;
    -
    801  uint8_t rc;
    -
    802 
    -
    803  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    804  cbw.dCBWTag = ++dCBWTag;
    -
    805  cbw.dCBWDataTransferLength = 0;
    -
    806  cbw.bmCBWFlags = MASS_CMD_DIR_OUT;
    -
    807  cbw.bmCBWLUN = lun;
    -
    808  cbw.bmCBWCBLength = 6;
    -
    809 
    -
    810  for (uint8_t i = 0; i < 16; i++)
    -
    811  cbw.CBWCB[i] = 0;
    -
    812 
    -
    813  cbw.CBWCB[0] = SCSI_CMD_TEST_UNIT_READY;
    -
    814  cbw.CBWCB[1] = lun;
    -
    815  rc = HandleSCSIError(Transaction(&cbw, 0, NULL, 0));
    -
    816  return (rc);
    -
    817 }
    -
    818 
    -
    827 uint8_t BulkOnly::Page3F(uint8_t lun) {
    -
    828  uint8_t buf[192];
    -
    829  for (int i = 0; i < 192; i++) {
    -
    830  buf[i] = 0x00;
    -
    831  }
    -
    832  WriteOk[lun] = true;
    -
    833  uint8_t rc = ModeSense(lun, 0, 0x3f, 0, 192, buf);
    -
    834  if (!rc) {
    -
    835  WriteOk[lun] = ((buf[2] & 0x80) == 0);
    -
    836  Notify(PSTR("Mode Sense: "), 0x80);
    -
    837  for (int i = 0; i < 4; i++) {
    -
    838  PrintHex<uint8_t > (buf[i], 0x80);
    -
    839  Notify(PSTR(" "), 0x80);
    -
    840  }
    -
    841  Notify(PSTR("\r\n"), 0x80);
    -
    842  }
    -
    843  return rc;
    -
    844 }
    -
    845 
    -
    846 
    +
    680  if (ret == hrSTALL)
    +
    681  *plun = 0;
    +
    682 
    +
    683  return 0;
    +
    684 }
    +
    685 
    +
    686 
    +
    695 uint8_t BulkOnly::Inquiry(uint8_t lun, uint16_t bsize, uint8_t *buf) {
    +
    696  Notify(PSTR("\r\nInquiry\r\n"), 0x80);
    +
    697  Notify(PSTR("---------\r\n"), 0x80);
    +
    698 
    +
    699  CommandBlockWrapper cbw;
    +
    700  SetCurLUN(lun);
    +
    701  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    702  cbw.dCBWTag = ++dCBWTag;
    +
    703  cbw.dCBWDataTransferLength = bsize;
    +
    704  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    +
    705  cbw.bmCBWLUN = lun;
    +
    706  cbw.bmCBWCBLength = 6;
    +
    707 
    +
    708  for (uint8_t i = 0; i < 16; i++)
    +
    709  cbw.CBWCB[i] = 0;
    +
    710 
    +
    711  cbw.CBWCB[0] = SCSI_CMD_INQUIRY;
    +
    712  cbw.CBWCB[1] = lun << 5;
    +
    713  cbw.CBWCB[4] = bsize;
    +
    714 
    +
    715  uint8_t rc = HandleSCSIError(Transaction(&cbw, bsize, buf, 0));
    +
    716 #if 0
    +
    717  if (!rc) {
    +
    718  printf("LUN %i `", lun);
    +
    719  for (int i = 8; i < 36; i++) printf("%c", buf[i]);
    +
    720  printf("'\r\nQualifier %1.1X ", (buf[0]&0xE0) >> 5);
    +
    721  printf("Device type %2.2X ", buf[0]&0x1f);
    +
    722  printf("RMB %1.1X ", buf[1]&0x80 >> 7);
    +
    723  printf("SSCS% 1.1X ", buf[5]&0x80 >> 7);
    +
    724  uint8_t sv = buf[2];
    +
    725  printf("SCSI version %2.2X\r\nDevice conforms to ", sv);
    +
    726  switch (sv) {
    +
    727  case 0:
    +
    728  printf("No specific");
    +
    729  break;
    +
    730  /*
    +
    731  case 1:
    +
    732  printf("");
    +
    733  break;
    +
    734  */
    +
    735  case 2:
    +
    736  printf("ANSI 2");
    +
    737  break;
    +
    738  case 3:
    +
    739  printf("ANSI INCITS 301-1997 (SPC)");
    +
    740  break;
    +
    741  case 4:
    +
    742  printf("ANSI INCITS 351-2001 (SPC-2)");
    +
    743  break;
    +
    744  case 5:
    +
    745  printf("ANSI INCITS 408-2005 (SPC-4)");
    +
    746  break;
    +
    747  case 6:
    +
    748  printf("T10/1731-D (SPC-4)");
    +
    749  break;
    +
    750  default:
    +
    751  printf("unknown");
    +
    752  }
    +
    753  printf(" standards.\r\n");
    +
    754  }
    +
    755 #endif
    +
    756  return rc;
    +
    757 }
    +
    758 
    +
    767 uint8_t BulkOnly::RequestSense(uint8_t lun, uint16_t size, uint8_t *buf) {
    +
    768  Notify(PSTR("\r\nRequestSense\r\n"), 0x80);
    +
    769  Notify(PSTR("----------------\r\n"), 0x80);
    +
    770 
    +
    771  CommandBlockWrapper cbw;
    +
    772  SetCurLUN(lun);
    +
    773 
    +
    774  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    775  cbw.dCBWTag = ++dCBWTag;
    +
    776  cbw.dCBWDataTransferLength = size;
    +
    777  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    +
    778  cbw.bmCBWLUN = lun;
    +
    779  cbw.bmCBWCBLength = 6;
    +
    780 
    +
    781  for (uint8_t i = 0; i < 16; i++)
    +
    782  cbw.CBWCB[i] = 0;
    +
    783 
    +
    784  cbw.CBWCB[0] = SCSI_CMD_REQUEST_SENSE;
    +
    785  cbw.CBWCB[1] = lun << 5;
    +
    786  cbw.CBWCB[4] = size;
    +
    787 
    +
    788  return Transaction(&cbw, size, buf, 0);
    +
    789 }
    +
    790 
    +
    799 uint8_t BulkOnly::ReadCapacity(uint8_t lun, uint16_t bsize, uint8_t *buf) {
    +
    800  Notify(PSTR("\r\nReadCapacity\r\n"), 0x80);
    +
    801  Notify(PSTR("---------------\r\n"), 0x80);
    +
    802  CommandBlockWrapper cbw;
    +
    803 
    +
    804  SetCurLUN(lun);
    +
    805  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    806  cbw.dCBWTag = ++dCBWTag;
    +
    807  cbw.dCBWDataTransferLength = bsize;
    +
    808  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    +
    809  cbw.bmCBWLUN = lun;
    +
    810  cbw.bmCBWCBLength = 10;
    +
    811 
    +
    812  for (uint8_t i = 0; i < 16; i++)
    +
    813  cbw.CBWCB[i] = 0;
    +
    814 
    +
    815  cbw.CBWCB[0] = SCSI_CMD_READ_CAPACITY_10;
    +
    816  cbw.CBWCB[1] = lun << 5;
    +
    817 
    +
    818  return HandleSCSIError(Transaction(&cbw, bsize, buf, 0));
    +
    819 }
    +
    820 
    +
    827 uint8_t BulkOnly::TestUnitReady(uint8_t lun) {
    +
    828  SetCurLUN(lun);
    +
    829  if (!bAddress)
    +
    830  return MASS_ERR_UNIT_NOT_READY;
    +
    831 
    +
    832  Notify(PSTR("\r\nTestUnitReady\r\n"), 0x80);
    +
    833  Notify(PSTR("-----------------\r\n"), 0x80);
    +
    834 
    +
    835  CommandBlockWrapper cbw;
    +
    836  uint8_t rc;
    +
    837 
    +
    838  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    839  cbw.dCBWTag = ++dCBWTag;
    +
    840  cbw.dCBWDataTransferLength = 0;
    +
    841  cbw.bmCBWFlags = MASS_CMD_DIR_OUT;
    +
    842  cbw.bmCBWLUN = lun;
    +
    843  cbw.bmCBWCBLength = 6;
    +
    844 
    +
    845  for (uint8_t i = 0; i < 16; i++)
    +
    846  cbw.CBWCB[i] = 0;
    847 
    -
    849 
    -
    850 
    -
    851 // USB code
    -
    852 
    +
    848  cbw.CBWCB[0] = SCSI_CMD_TEST_UNIT_READY;
    +
    849  cbw.CBWCB[1] = lun;
    +
    850  rc = HandleSCSIError(Transaction(&cbw, 0, NULL, 0));
    +
    851  return (rc);
    +
    852 }
    853 
    -
    855 
    -
    856 
    -
    857 
    -
    864 uint8_t BulkOnly::ClearEpHalt(uint8_t index) {
    -
    865  if (index == 0)
    -
    866  return 0;
    -
    867 
    -
    868  uint8_t ret = 0;
    -
    869 
    -
    870  while (ret = (pUsb->ctrlReq(bAddress, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_STANDARD | USB_SETUP_RECIPIENT_ENDPOINT,
    -
    871  USB_REQUEST_CLEAR_FEATURE, USB_FEATURE_ENDPOINT_HALT, 0, ((index == epDataInIndex) ? (0x80 | epInfo[index].epAddr) : epInfo[index].epAddr), 0, 0, NULL, NULL))
    -
    872  == 0x01) delay(6);
    -
    873 
    -
    874  if (ret) {
    -
    875  ErrorMessage<uint8_t > (PSTR("ClearEpHalt"), ret);
    -
    876  ErrorMessage<uint8_t > (PSTR("EP"), ((index == epDataInIndex) ? (0x80 | epInfo[index].epAddr) : epInfo[index].epAddr));
    -
    877  return ret;
    -
    878  }
    -
    879  epInfo[index].bmSndToggle = 0;
    -
    880  epInfo[index].bmRcvToggle = 0;
    -
    881  // epAttribs = 0;
    -
    882  return 0;
    -
    883 }
    +
    862 uint8_t BulkOnly::Page3F(uint8_t lun) {
    +
    863  uint8_t buf[192];
    +
    864  for (int i = 0; i < 192; i++) {
    +
    865  buf[i] = 0x00;
    +
    866  }
    +
    867  WriteOk[lun] = true;
    +
    868  uint8_t rc = ModeSense(lun, 0, 0x3f, 0, 192, buf);
    +
    869  if (!rc) {
    +
    870  WriteOk[lun] = ((buf[2] & 0x80) == 0);
    +
    871  Notify(PSTR("Mode Sense: "), 0x80);
    +
    872  for (int i = 0; i < 4; i++) {
    +
    873  D_PrintHex<uint8_t > (buf[i], 0x80);
    +
    874  Notify(PSTR(" "), 0x80);
    +
    875  }
    +
    876  Notify(PSTR("\r\n"), 0x80);
    +
    877  }
    +
    878  return rc;
    +
    879 }
    +
    880 
    +
    881 
    +
    882 
    884 
    -
    889 void BulkOnly::Reset() {
    -
    890  while (pUsb->ctrlReq(bAddress, 0, bmREQ_MASSOUT, MASS_REQ_BOMSR, 0, 0, bIface, 0, 0, NULL, NULL) == 0x01) delay(6);
    -
    891 }
    +
    885 
    +
    886 // USB code
    +
    887 
    +
    888 
    +
    890 
    +
    891 
    892 
    -
    898 uint8_t BulkOnly::ResetRecovery() {
    -
    899  Notify(PSTR("\r\nResetRecovery\r\n"), 0x80);
    -
    900  Notify(PSTR("-----------------\r\n"), 0x80);
    -
    901 
    -
    902  delay(6);
    -
    903  Reset();
    -
    904  delay(6);
    -
    905  ClearEpHalt(epDataInIndex);
    -
    906  delay(6);
    -
    907  bLastUsbError = ClearEpHalt(epDataOutIndex);
    -
    908  delay(6);
    -
    909  return bLastUsbError;
    -
    910 }
    -
    911 
    -
    917 void BulkOnly::ClearAllEP() {
    -
    918  for (uint8_t i = 0; i < MASS_MAX_ENDPOINTS; i++) {
    -
    919  epInfo[i].epAddr = 0;
    -
    920  epInfo[i].maxPktSize = (i) ? 0 : 8;
    -
    921  epInfo[i].epAttribs = 0;
    -
    922 
    -
    923  epInfo[i].bmNakPower = USB_NAK_DEFAULT;
    -
    924  }
    -
    925 
    -
    926  for (uint8_t i = 0; i < MASS_MAX_SUPPORTED_LUN; i++) LUNOk[i] = false;
    -
    927  bIface = 0;
    -
    928  bNumEP = 1;
    -
    929 
    -
    930  bAddress = 0;
    -
    931  qNextPollTime = 0;
    -
    932  bPollEnable = false;
    -
    933  bLastUsbError = 0;
    -
    934  bMaxLUN = 0;
    -
    935  bTheLUN = 0;
    -
    936 }
    -
    937 
    -
    938 
    -
    946 bool BulkOnly::IsValidCSW(CommandStatusWrapper *pcsw, CommandBlockWrapperBase *pcbw) {
    -
    947  if (pcsw->dCSWSignature != MASS_CSW_SIGNATURE) {
    -
    948  Notify(PSTR("CSW:Sig error\r\n"), 0x80);
    -
    949  //printf("%lx != %lx\r\n", MASS_CSW_SIGNATURE, pcsw->dCSWSignature);
    -
    950  return false;
    -
    951  }
    -
    952  if (pcsw->dCSWTag != pcbw->dCBWTag) {
    -
    953  Notify(PSTR("CSW:Wrong tag\r\n"), 0x80);
    -
    954  //printf("%lx != %lx\r\n", pcsw->dCSWTag, pcbw->dCBWTag);
    -
    955  return false;
    -
    956  }
    -
    957  return true;
    -
    958 }
    -
    959 
    -
    967 uint8_t BulkOnly::HandleUsbError(uint8_t error, uint8_t index) {
    -
    968  uint8_t count = 3;
    -
    969 
    -
    970  bLastUsbError = error;
    -
    971  //if (error)
    -
    972  //ClearEpHalt(index);
    -
    973  while (error && count) {
    -
    974  if (error != hrSUCCESS) {
    -
    975  ErrorMessage<uint8_t > (PSTR("USB Error"), error);
    -
    976  ErrorMessage<uint8_t > (PSTR("Index"), index);
    -
    977  }
    -
    978  switch (error) {
    -
    979  // case hrWRONGPID:
    -
    980  case hrSUCCESS:
    -
    981  return MASS_ERR_SUCCESS;
    -
    982  case hrBUSY:
    -
    983  // SIE is busy, just hang out and try again.
    -
    984  return MASS_ERR_UNIT_BUSY;
    -
    985  case hrTIMEOUT:
    -
    986  case hrJERR: return MASS_ERR_DEVICE_DISCONNECTED;
    -
    987  case hrSTALL:
    -
    988  if (index == 0)
    -
    989  return MASS_ERR_STALL;
    -
    990  ClearEpHalt(index);
    -
    991  if (index != epDataInIndex)
    -
    992  return MASS_ERR_WRITE_STALL;
    -
    993  return MASS_ERR_STALL;
    +
    899 uint8_t BulkOnly::ClearEpHalt(uint8_t index) {
    +
    900  if (index == 0)
    +
    901  return 0;
    +
    902 
    +
    903  uint8_t ret = 0;
    +
    904 
    +
    905  while (ret = (pUsb->ctrlReq(bAddress, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_STANDARD | USB_SETUP_RECIPIENT_ENDPOINT,
    +
    906  USB_REQUEST_CLEAR_FEATURE, USB_FEATURE_ENDPOINT_HALT, 0, ((index == epDataInIndex) ? (0x80 | epInfo[index].epAddr) : epInfo[index].epAddr), 0, 0, NULL, NULL))
    +
    907  == 0x01) delay(6);
    +
    908 
    +
    909  if (ret) {
    +
    910  ErrorMessage<uint8_t > (PSTR("ClearEpHalt"), ret);
    +
    911  ErrorMessage<uint8_t > (PSTR("EP"), ((index == epDataInIndex) ? (0x80 | epInfo[index].epAddr) : epInfo[index].epAddr));
    +
    912  return ret;
    +
    913  }
    +
    914  epInfo[index].bmSndToggle = 0;
    +
    915  epInfo[index].bmRcvToggle = 0;
    +
    916  // epAttribs = 0;
    +
    917  return 0;
    +
    918 }
    +
    919 
    +
    924 void BulkOnly::Reset() {
    +
    925  while (pUsb->ctrlReq(bAddress, 0, bmREQ_MASSOUT, MASS_REQ_BOMSR, 0, 0, bIface, 0, 0, NULL, NULL) == 0x01) delay(6);
    +
    926 }
    +
    927 
    +
    933 uint8_t BulkOnly::ResetRecovery() {
    +
    934  Notify(PSTR("\r\nResetRecovery\r\n"), 0x80);
    +
    935  Notify(PSTR("-----------------\r\n"), 0x80);
    +
    936 
    +
    937  delay(6);
    +
    938  Reset();
    +
    939  delay(6);
    +
    940  ClearEpHalt(epDataInIndex);
    +
    941  delay(6);
    +
    942  bLastUsbError = ClearEpHalt(epDataOutIndex);
    +
    943  delay(6);
    +
    944  return bLastUsbError;
    +
    945 }
    +
    946 
    +
    952 void BulkOnly::ClearAllEP() {
    +
    953  for (uint8_t i = 0; i < MASS_MAX_ENDPOINTS; i++) {
    +
    954  epInfo[i].epAddr = 0;
    +
    955  epInfo[i].maxPktSize = (i) ? 0 : 8;
    +
    956  epInfo[i].epAttribs = 0;
    +
    957 
    +
    958  epInfo[i].bmNakPower = USB_NAK_DEFAULT;
    +
    959  }
    +
    960 
    +
    961  for (uint8_t i = 0; i < MASS_MAX_SUPPORTED_LUN; i++) LUNOk[i] = false;
    +
    962  bIface = 0;
    +
    963  bNumEP = 1;
    +
    964 
    +
    965  bAddress = 0;
    +
    966  qNextPollTime = 0;
    +
    967  bPollEnable = false;
    +
    968  bLastUsbError = 0;
    +
    969  bMaxLUN = 0;
    +
    970  bTheLUN = 0;
    +
    971 }
    +
    972 
    +
    973 
    +
    981 bool BulkOnly::IsValidCSW(CommandStatusWrapper *pcsw, CommandBlockWrapperBase *pcbw) {
    +
    982  if (pcsw->dCSWSignature != MASS_CSW_SIGNATURE) {
    +
    983  Notify(PSTR("CSW:Sig error\r\n"), 0x80);
    +
    984  //printf("%lx != %lx\r\n", MASS_CSW_SIGNATURE, pcsw->dCSWSignature);
    +
    985  return false;
    +
    986  }
    +
    987  if (pcsw->dCSWTag != pcbw->dCBWTag) {
    +
    988  Notify(PSTR("CSW:Wrong tag\r\n"), 0x80);
    +
    989  //printf("%lx != %lx\r\n", pcsw->dCSWTag, pcbw->dCBWTag);
    +
    990  return false;
    +
    991  }
    +
    992  return true;
    +
    993 }
    994 
    -
    995  case hrNAK:
    -
    996  if (index == 0)
    -
    997  return MASS_ERR_UNIT_BUSY;
    -
    998  return MASS_ERR_UNIT_BUSY;
    -
    999  //ClearEpHalt(index);
    -
    1000  //ResetRecovery();
    -
    1001  //if (index != epDataInIndex)
    -
    1002  // return MASS_ERR_WRITE_NAKS;
    -
    1003  //return MASS_ERR_READ_NAKS;
    -
    1004  case hrTOGERR:
    -
    1005  // Handle a very super rare corner case, where toggles become de-synched.
    -
    1006  // I have only ran into one device that has this firmware bug, and this is
    -
    1007  // the only clean way to get back into sync with the buggy device firmware.
    -
    1008  // --AJK
    -
    1009  if (bAddress && bConfNum) {
    -
    1010  error = pUsb->setConf(bAddress, 0, bConfNum);
    -
    1011 
    -
    1012  if (error)
    -
    1013  break;
    -
    1014  }
    -
    1015  return MASS_ERR_SUCCESS;
    -
    1016  default:
    -
    1017  ErrorMessage<uint8_t > (PSTR("\r\nUSB"), error);
    -
    1018  return MASS_ERR_GENERAL_USB_ERROR;
    -
    1019  }
    -
    1020  count--;
    -
    1021  } // while
    -
    1022 
    -
    1023  return ((error && !count) ? MASS_ERR_GENERAL_USB_ERROR : MASS_ERR_SUCCESS);
    -
    1024 }
    -
    1025 
    -
    1035 uint8_t BulkOnly::Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void *buf, uint8_t flags) {
    -
    1036  uint16_t bytes = (pcbw->dCBWDataTransferLength > buf_size) ? buf_size : pcbw->dCBWDataTransferLength;
    -
    1037  boolean write = (pcbw->bmCBWFlags & MASS_CMD_DIR_IN) != MASS_CMD_DIR_IN;
    -
    1038  boolean callback = (flags & MASS_TRANS_FLG_CALLBACK) == MASS_TRANS_FLG_CALLBACK;
    -
    1039  uint8_t ret = 0;
    -
    1040  uint8_t usberr;
    -
    1041  CommandStatusWrapper csw; // up here, we allocate ahead to save cpu cycles.
    -
    1042  // Fix reserved bits.
    -
    1043  pcbw->bmReserved1 = 0;
    -
    1044  pcbw->bmReserved2 = 0;
    -
    1045  ErrorMessage<uint32_t > (PSTR("CBW.dCBWTag"), pcbw->dCBWTag);
    +
    1002 uint8_t BulkOnly::HandleUsbError(uint8_t error, uint8_t index) {
    +
    1003  uint8_t count = 3;
    +
    1004 
    +
    1005  bLastUsbError = error;
    +
    1006  //if (error)
    +
    1007  //ClearEpHalt(index);
    +
    1008  while (error && count) {
    +
    1009  if (error != hrSUCCESS) {
    +
    1010  ErrorMessage<uint8_t > (PSTR("USB Error"), error);
    +
    1011  ErrorMessage<uint8_t > (PSTR("Index"), index);
    +
    1012  }
    +
    1013  switch (error) {
    +
    1014  // case hrWRONGPID:
    +
    1015  case hrSUCCESS:
    +
    1016  return MASS_ERR_SUCCESS;
    +
    1017  case hrBUSY:
    +
    1018  // SIE is busy, just hang out and try again.
    +
    1019  return MASS_ERR_UNIT_BUSY;
    +
    1020  case hrTIMEOUT:
    +
    1021  case hrJERR: return MASS_ERR_DEVICE_DISCONNECTED;
    +
    1022  case hrSTALL:
    +
    1023  if (index == 0)
    +
    1024  return MASS_ERR_STALL;
    +
    1025  ClearEpHalt(index);
    +
    1026  if (index != epDataInIndex)
    +
    1027  return MASS_ERR_WRITE_STALL;
    +
    1028  return MASS_ERR_STALL;
    +
    1029 
    +
    1030  case hrNAK:
    +
    1031  if (index == 0)
    +
    1032  return MASS_ERR_UNIT_BUSY;
    +
    1033  return MASS_ERR_UNIT_BUSY;
    +
    1034  //ClearEpHalt(index);
    +
    1035  //ResetRecovery();
    +
    1036  //if (index != epDataInIndex)
    +
    1037  // return MASS_ERR_WRITE_NAKS;
    +
    1038  //return MASS_ERR_READ_NAKS;
    +
    1039  case hrTOGERR:
    +
    1040  // Handle a very super rare corner case, where toggles become de-synched.
    +
    1041  // I have only ran into one device that has this firmware bug, and this is
    +
    1042  // the only clean way to get back into sync with the buggy device firmware.
    +
    1043  // --AJK
    +
    1044  if (bAddress && bConfNum) {
    +
    1045  error = pUsb->setConf(bAddress, 0, bConfNum);
    1046 
    -
    1047  while ((usberr = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, sizeof (CommandBlockWrapper), (uint8_t*)pcbw)) == hrBUSY) delay(1);
    -
    1048 
    -
    1049  ret = HandleUsbError(usberr, epDataOutIndex);
    -
    1050  //ret = HandleUsbError(pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, sizeof (CommandBlockWrapper), (uint8_t*)pcbw), epDataOutIndex);
    -
    1051  if (ret) {
    -
    1052  ErrorMessage<uint8_t > (PSTR("============================ CBW"), ret);
    -
    1053  } else {
    -
    1054  if (bytes) {
    -
    1055  if (!write) {
    -
    1056  if (callback) {
    -
    1057  uint8_t rbuf[bytes];
    -
    1058  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, rbuf)) == hrBUSY) delay(1);
    -
    1059  if (usberr == hrSUCCESS) ((USBReadParser*)buf)->Parse(bytes, rbuf, 0);
    -
    1060  } else {
    -
    1061  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, (uint8_t*)buf)) == hrBUSY) delay(1);
    -
    1062  }
    -
    1063  ret = HandleUsbError(usberr, epDataInIndex);
    -
    1064  } else {
    -
    1065  while ((usberr = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, bytes, (uint8_t*)buf)) == hrBUSY) delay(1);
    -
    1066  ret = HandleUsbError(usberr, epDataOutIndex);
    -
    1067  }
    -
    1068  if (ret) {
    -
    1069  ErrorMessage<uint8_t > (PSTR("============================ DAT"), ret);
    -
    1070  }
    -
    1071  }
    -
    1072  }
    -
    1073 
    -
    1074  //if (!ret || ret == MASS_ERR_WRITE_STALL || ret == MASS_ERR_STALL) {
    -
    1075  {
    -
    1076  bytes = sizeof (CommandStatusWrapper);
    -
    1077  int tries = 2;
    -
    1078  while (tries--) {
    -
    1079  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, (uint8_t*) & csw)) == hrBUSY) delay(1);
    -
    1080  if (!usberr) break;
    -
    1081  ClearEpHalt(epDataInIndex);
    -
    1082  //HandleUsbError(usberr, epDataInIndex);
    -
    1083  if (tries) ResetRecovery();
    -
    1084  }
    -
    1085  if (!ret) {
    -
    1086  Notify(PSTR("CBW:\t\tOK\r\n"), 0x80);
    -
    1087  Notify(PSTR("Data Stage:\tOK\r\n"), 0x80);
    -
    1088  } else {
    -
    1089  // Throw away csw, IT IS NOT OF ANY USE.
    -
    1090  //HandleUsbError(usberr, epDataInIndex);
    -
    1091  ResetRecovery();
    -
    1092  return ret;
    -
    1093  }
    -
    1094  ret = HandleUsbError(usberr, epDataInIndex);
    -
    1095  if (ret) {
    -
    1096  ErrorMessage<uint8_t > (PSTR("============================ CSW"), ret);
    -
    1097  }
    -
    1098  if (usberr == hrSUCCESS) {
    -
    1099  if (IsValidCSW(&csw, pcbw)) {
    -
    1100  //ErrorMessage<uint32_t > (PSTR("CSW.dCBWTag"), csw.dCSWTag);
    -
    1101  //ErrorMessage<uint8_t > (PSTR("bCSWStatus"), csw.bCSWStatus);
    -
    1102  //ErrorMessage<uint32_t > (PSTR("dCSWDataResidue"), csw.dCSWDataResidue);
    -
    1103  Notify(PSTR("CSW:\t\tOK\r\n\r\n"), 0x80);
    -
    1104  return csw.bCSWStatus;
    -
    1105  } else {
    -
    1106  Notify(PSTR("Invalid CSW\r\n"), 0x80);
    -
    1107  ResetRecovery();
    -
    1108  //return MASS_ERR_SUCCESS;
    -
    1109  return MASS_ERR_INVALID_CSW;
    -
    1110  }
    -
    1111  }
    -
    1112 
    -
    1113  }
    -
    1114  return ret;
    -
    1115 }
    -
    1116 
    -
    1128 uint8_t BulkOnly::ModeSense(uint8_t lun, uint8_t pc, uint8_t page, uint8_t subpage, uint8_t len, uint8_t * pbuf) {
    -
    1129  Notify(PSTR("\r\rModeSense\r\n"), 0x80);
    -
    1130  Notify(PSTR("------------\r\n"), 0x80);
    -
    1131 
    -
    1132  CommandBlockWrapper cbw;
    -
    1133  SetCurLUN(lun);
    -
    1134 
    -
    1135  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    1136  cbw.dCBWTag = ++dCBWTag;
    -
    1137  cbw.dCBWDataTransferLength = ((uint32_t)len);
    -
    1138  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    -
    1139  cbw.bmCBWLUN = lun;
    -
    1140  cbw.bmCBWCBLength = 6;
    -
    1141 
    -
    1142  for (uint8_t i = 0; i < 16; i++)
    -
    1143  cbw.CBWCB[i] = 0;
    -
    1144 
    -
    1145  cbw.CBWCB[0] = SCSI_CMD_MODE_SENSE_6;
    -
    1146  cbw.CBWCB[2] = ((pc << 6) | page);
    -
    1147  cbw.CBWCB[3] = subpage;
    -
    1148  cbw.CBWCB[4] = len;
    -
    1149 
    -
    1150  return HandleSCSIError(Transaction(&cbw, 512, pbuf, 0));
    -
    1151 }
    -
    1152 
    -
    1159 uint8_t BulkOnly::SetCurLUN(uint8_t lun) {
    -
    1160  if (lun > bMaxLUN)
    -
    1161  return MASS_ERR_INVALID_LUN;
    -
    1162  bTheLUN = lun;
    -
    1163  return MASS_ERR_SUCCESS;
    -
    1164 };
    -
    1165 
    -
    1172 uint8_t BulkOnly::HandleSCSIError(uint8_t status) {
    -
    1173  uint8_t ret = 0;
    -
    1174 
    -
    1175  switch (status) {
    -
    1176  case 0: return MASS_ERR_SUCCESS;
    -
    1177  //case 4: return MASS_ERR_UNIT_BUSY; // Busy means retry later.
    -
    1178  // case 0x05/0x14: we stalled out
    -
    1179  // case 0x15/0x16: we naked out.
    -
    1180  case 2:
    -
    1181  ErrorMessage<uint8_t > (PSTR("Phase Error"), status);
    -
    1182  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    -
    1183  ResetRecovery();
    -
    1184  return MASS_ERR_GENERAL_SCSI_ERROR;
    -
    1185  case 1:
    -
    1186  ErrorMessage<uint8_t > (PSTR("SCSI Error"), status);
    -
    1187  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    -
    1188  RequestSenseResponce rsp;
    -
    1189 
    -
    1190  ret = RequestSense(bTheLUN, sizeof (RequestSenseResponce), (uint8_t*) & rsp);
    -
    1191 
    -
    1192  if (ret) {
    -
    1193  //ResetRecovery();
    -
    1194  return MASS_ERR_GENERAL_SCSI_ERROR;
    -
    1195  }
    -
    1196  ErrorMessage<uint8_t > (PSTR("Response Code"), rsp.bResponseCode);
    -
    1197  if (rsp.bResponseCode & 0x80) {
    -
    1198  Notify(PSTR("Information field: "), 0x80);
    -
    1199  for (int i = 0; i < 4; i++) {
    -
    1200  PrintHex<uint8_t > (rsp.CmdSpecificInformation[i], 0x80);
    -
    1201  Notify(PSTR(" "), 0x80);
    -
    1202  }
    -
    1203  Notify(PSTR("\r\n"), 0x80);
    -
    1204  }
    -
    1205  ErrorMessage<uint8_t > (PSTR("Sense Key"), rsp.bmSenseKey);
    -
    1206  ErrorMessage<uint8_t > (PSTR("Add Sense Code"), rsp.bAdditionalSenseCode);
    -
    1207  ErrorMessage<uint8_t > (PSTR("Add Sense Qual"), rsp.bAdditionalSenseQualifier);
    -
    1208  // warning, this is not testing ASQ, only SK and ASC.
    -
    1209  switch (rsp.bmSenseKey) {
    -
    1210  /* bug...
    -
    1211  case 0:
    -
    1212  return MASS_ERR_SUCCESS;
    -
    1213  */
    -
    1214  case SCSI_S_UNIT_ATTENTION:
    -
    1215  switch (rsp.bAdditionalSenseCode) {
    -
    1216  case SCSI_ASC_MEDIA_CHANGED:
    -
    1217  return MASS_ERR_MEDIA_CHANGED;
    -
    1218  default:
    -
    1219  return MASS_ERR_UNIT_NOT_READY;
    -
    1220  }
    -
    1221  case SCSI_S_NOT_READY:
    -
    1222  switch (rsp.bAdditionalSenseCode) {
    -
    1223  case SCSI_ASC_MEDIUM_NOT_PRESENT:
    -
    1224  return MASS_ERR_NO_MEDIA;
    -
    1225  //return MASS_ERR_SUCCESS;
    -
    1226  default:
    -
    1227  return MASS_ERR_UNIT_NOT_READY;
    -
    1228  }
    -
    1229  case SCSI_S_ILLEGAL_REQUEST:
    -
    1230  switch (rsp.bAdditionalSenseCode) {
    -
    1231  case SCSI_ASC_LBA_OUT_OF_RANGE:
    -
    1232  return MASS_ERR_BAD_LBA;
    -
    1233  default:
    -
    1234  return MASS_ERR_CMD_NOT_SUPPORTED;
    -
    1235  }
    -
    1236  default:
    -
    1237  return MASS_ERR_GENERAL_SCSI_ERROR;
    -
    1238  }
    -
    1239 
    -
    1240  default:
    -
    1241  // Should have been handled already in HandleUsbError.
    -
    1242  // ResetRecovery();
    -
    1243  ErrorMessage<uint8_t > (PSTR("Gen SCSI Err"), status);
    -
    1244  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    -
    1245  return status; //MASS_ERR_GENERAL_SCSI_ERROR;
    -
    1246  } // switch
    -
    1247 }
    -
    1248 
    -
    1249 
    -
    1251 
    -
    1252 
    -
    1253 // Debugging code
    -
    1254 
    -
    1255 
    -
    1257 
    -
    1258 
    -
    1268 void BulkOnly::EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR * pep) {
    -
    1269  ErrorMessage<uint8_t > (PSTR("Conf.Val"), conf);
    -
    1270  ErrorMessage<uint8_t > (PSTR("Iface Num"), iface);
    -
    1271  ErrorMessage<uint8_t > (PSTR("Alt.Set"), alt);
    -
    1272 
    -
    1273  bConfNum = conf;
    +
    1047  if (error)
    +
    1048  break;
    +
    1049  }
    +
    1050  return MASS_ERR_SUCCESS;
    +
    1051  default:
    +
    1052  ErrorMessage<uint8_t > (PSTR("\r\nUSB"), error);
    +
    1053  return MASS_ERR_GENERAL_USB_ERROR;
    +
    1054  }
    +
    1055  count--;
    +
    1056  } // while
    +
    1057 
    +
    1058  return ((error && !count) ? MASS_ERR_GENERAL_USB_ERROR : MASS_ERR_SUCCESS);
    +
    1059 }
    +
    1060 
    +
    1070 uint8_t BulkOnly::Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void *buf, uint8_t flags) {
    +
    1071  uint16_t bytes = (pcbw->dCBWDataTransferLength > buf_size) ? buf_size : pcbw->dCBWDataTransferLength;
    +
    1072  boolean write = (pcbw->bmCBWFlags & MASS_CMD_DIR_IN) != MASS_CMD_DIR_IN;
    +
    1073  boolean callback = (flags & MASS_TRANS_FLG_CALLBACK) == MASS_TRANS_FLG_CALLBACK;
    +
    1074  uint8_t ret = 0;
    +
    1075  uint8_t usberr;
    +
    1076  CommandStatusWrapper csw; // up here, we allocate ahead to save cpu cycles.
    +
    1077  // Fix reserved bits.
    +
    1078  pcbw->bmReserved1 = 0;
    +
    1079  pcbw->bmReserved2 = 0;
    +
    1080  ErrorMessage<uint32_t > (PSTR("CBW.dCBWTag"), pcbw->dCBWTag);
    +
    1081 
    +
    1082  while ((usberr = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, sizeof (CommandBlockWrapper), (uint8_t*)pcbw)) == hrBUSY) delay(1);
    +
    1083 
    +
    1084  ret = HandleUsbError(usberr, epDataOutIndex);
    +
    1085  //ret = HandleUsbError(pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, sizeof (CommandBlockWrapper), (uint8_t*)pcbw), epDataOutIndex);
    +
    1086  if (ret) {
    +
    1087  ErrorMessage<uint8_t > (PSTR("============================ CBW"), ret);
    +
    1088  } else {
    +
    1089  if (bytes) {
    +
    1090  if (!write) {
    +
    1091  if (callback) {
    +
    1092  uint8_t rbuf[bytes];
    +
    1093  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, rbuf)) == hrBUSY) delay(1);
    +
    1094  if (usberr == hrSUCCESS) ((USBReadParser*)buf)->Parse(bytes, rbuf, 0);
    +
    1095  } else {
    +
    1096  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, (uint8_t*)buf)) == hrBUSY) delay(1);
    +
    1097  }
    +
    1098  ret = HandleUsbError(usberr, epDataInIndex);
    +
    1099  } else {
    +
    1100  while ((usberr = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, bytes, (uint8_t*)buf)) == hrBUSY) delay(1);
    +
    1101  ret = HandleUsbError(usberr, epDataOutIndex);
    +
    1102  }
    +
    1103  if (ret) {
    +
    1104  ErrorMessage<uint8_t > (PSTR("============================ DAT"), ret);
    +
    1105  }
    +
    1106  }
    +
    1107  }
    +
    1108 
    +
    1109  //if (!ret || ret == MASS_ERR_WRITE_STALL || ret == MASS_ERR_STALL) {
    +
    1110  {
    +
    1111  bytes = sizeof (CommandStatusWrapper);
    +
    1112  int tries = 2;
    +
    1113  while (tries--) {
    +
    1114  while ((usberr = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, &bytes, (uint8_t*) & csw)) == hrBUSY) delay(1);
    +
    1115  if (!usberr) break;
    +
    1116  ClearEpHalt(epDataInIndex);
    +
    1117  //HandleUsbError(usberr, epDataInIndex);
    +
    1118  if (tries) ResetRecovery();
    +
    1119  }
    +
    1120  if (!ret) {
    +
    1121  Notify(PSTR("CBW:\t\tOK\r\n"), 0x80);
    +
    1122  Notify(PSTR("Data Stage:\tOK\r\n"), 0x80);
    +
    1123  } else {
    +
    1124  // Throw away csw, IT IS NOT OF ANY USE.
    +
    1125  //HandleUsbError(usberr, epDataInIndex);
    +
    1126  ResetRecovery();
    +
    1127  return ret;
    +
    1128  }
    +
    1129  ret = HandleUsbError(usberr, epDataInIndex);
    +
    1130  if (ret) {
    +
    1131  ErrorMessage<uint8_t > (PSTR("============================ CSW"), ret);
    +
    1132  }
    +
    1133  if (usberr == hrSUCCESS) {
    +
    1134  if (IsValidCSW(&csw, pcbw)) {
    +
    1135  //ErrorMessage<uint32_t > (PSTR("CSW.dCBWTag"), csw.dCSWTag);
    +
    1136  //ErrorMessage<uint8_t > (PSTR("bCSWStatus"), csw.bCSWStatus);
    +
    1137  //ErrorMessage<uint32_t > (PSTR("dCSWDataResidue"), csw.dCSWDataResidue);
    +
    1138  Notify(PSTR("CSW:\t\tOK\r\n\r\n"), 0x80);
    +
    1139  return csw.bCSWStatus;
    +
    1140  } else {
    +
    1141  Notify(PSTR("Invalid CSW\r\n"), 0x80);
    +
    1142  ResetRecovery();
    +
    1143  //return MASS_ERR_SUCCESS;
    +
    1144  return MASS_ERR_INVALID_CSW;
    +
    1145  }
    +
    1146  }
    +
    1147 
    +
    1148  }
    +
    1149  return ret;
    +
    1150 }
    +
    1151 
    +
    1163 uint8_t BulkOnly::ModeSense(uint8_t lun, uint8_t pc, uint8_t page, uint8_t subpage, uint8_t len, uint8_t * pbuf) {
    +
    1164  Notify(PSTR("\r\rModeSense\r\n"), 0x80);
    +
    1165  Notify(PSTR("------------\r\n"), 0x80);
    +
    1166 
    +
    1167  CommandBlockWrapper cbw;
    +
    1168  SetCurLUN(lun);
    +
    1169 
    +
    1170  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    1171  cbw.dCBWTag = ++dCBWTag;
    +
    1172  cbw.dCBWDataTransferLength = ((uint32_t)len);
    +
    1173  cbw.bmCBWFlags = MASS_CMD_DIR_IN;
    +
    1174  cbw.bmCBWLUN = lun;
    +
    1175  cbw.bmCBWCBLength = 6;
    +
    1176 
    +
    1177  for (uint8_t i = 0; i < 16; i++)
    +
    1178  cbw.CBWCB[i] = 0;
    +
    1179 
    +
    1180  cbw.CBWCB[0] = SCSI_CMD_MODE_SENSE_6;
    +
    1181  cbw.CBWCB[2] = ((pc << 6) | page);
    +
    1182  cbw.CBWCB[3] = subpage;
    +
    1183  cbw.CBWCB[4] = len;
    +
    1184 
    +
    1185  return HandleSCSIError(Transaction(&cbw, 512, pbuf, 0));
    +
    1186 }
    +
    1187 
    +
    1194 uint8_t BulkOnly::SetCurLUN(uint8_t lun) {
    +
    1195  if (lun > bMaxLUN)
    +
    1196  return MASS_ERR_INVALID_LUN;
    +
    1197  bTheLUN = lun;
    +
    1198  return MASS_ERR_SUCCESS;
    +
    1199 };
    +
    1200 
    +
    1207 uint8_t BulkOnly::HandleSCSIError(uint8_t status) {
    +
    1208  uint8_t ret = 0;
    +
    1209 
    +
    1210  switch (status) {
    +
    1211  case 0: return MASS_ERR_SUCCESS;
    +
    1212  //case 4: return MASS_ERR_UNIT_BUSY; // Busy means retry later.
    +
    1213  // case 0x05/0x14: we stalled out
    +
    1214  // case 0x15/0x16: we naked out.
    +
    1215  case 2:
    +
    1216  ErrorMessage<uint8_t > (PSTR("Phase Error"), status);
    +
    1217  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    +
    1218  ResetRecovery();
    +
    1219  return MASS_ERR_GENERAL_SCSI_ERROR;
    +
    1220  case 1:
    +
    1221  ErrorMessage<uint8_t > (PSTR("SCSI Error"), status);
    +
    1222  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    +
    1223  RequestSenseResponce rsp;
    +
    1224 
    +
    1225  ret = RequestSense(bTheLUN, sizeof (RequestSenseResponce), (uint8_t*) & rsp);
    +
    1226 
    +
    1227  if (ret) {
    +
    1228  //ResetRecovery();
    +
    1229  return MASS_ERR_GENERAL_SCSI_ERROR;
    +
    1230  }
    +
    1231  ErrorMessage<uint8_t > (PSTR("Response Code"), rsp.bResponseCode);
    +
    1232  if (rsp.bResponseCode & 0x80) {
    +
    1233  Notify(PSTR("Information field: "), 0x80);
    +
    1234  for (int i = 0; i < 4; i++) {
    +
    1235  D_PrintHex<uint8_t > (rsp.CmdSpecificInformation[i], 0x80);
    +
    1236  Notify(PSTR(" "), 0x80);
    +
    1237  }
    +
    1238  Notify(PSTR("\r\n"), 0x80);
    +
    1239  }
    +
    1240  ErrorMessage<uint8_t > (PSTR("Sense Key"), rsp.bmSenseKey);
    +
    1241  ErrorMessage<uint8_t > (PSTR("Add Sense Code"), rsp.bAdditionalSenseCode);
    +
    1242  ErrorMessage<uint8_t > (PSTR("Add Sense Qual"), rsp.bAdditionalSenseQualifier);
    +
    1243  // warning, this is not testing ASQ, only SK and ASC.
    +
    1244  switch (rsp.bmSenseKey) {
    +
    1245  /* bug...
    +
    1246  case 0:
    +
    1247  return MASS_ERR_SUCCESS;
    +
    1248  */
    +
    1249  case SCSI_S_UNIT_ATTENTION:
    +
    1250  switch (rsp.bAdditionalSenseCode) {
    +
    1251  case SCSI_ASC_MEDIA_CHANGED:
    +
    1252  return MASS_ERR_MEDIA_CHANGED;
    +
    1253  default:
    +
    1254  return MASS_ERR_UNIT_NOT_READY;
    +
    1255  }
    +
    1256  case SCSI_S_NOT_READY:
    +
    1257  switch (rsp.bAdditionalSenseCode) {
    +
    1258  case SCSI_ASC_MEDIUM_NOT_PRESENT:
    +
    1259  return MASS_ERR_NO_MEDIA;
    +
    1260  //return MASS_ERR_SUCCESS;
    +
    1261  default:
    +
    1262  return MASS_ERR_UNIT_NOT_READY;
    +
    1263  }
    +
    1264  case SCSI_S_ILLEGAL_REQUEST:
    +
    1265  switch (rsp.bAdditionalSenseCode) {
    +
    1266  case SCSI_ASC_LBA_OUT_OF_RANGE:
    +
    1267  return MASS_ERR_BAD_LBA;
    +
    1268  default:
    +
    1269  return MASS_ERR_CMD_NOT_SUPPORTED;
    +
    1270  }
    +
    1271  default:
    +
    1272  return MASS_ERR_GENERAL_SCSI_ERROR;
    +
    1273  }
    1274 
    -
    1275  uint8_t index;
    -
    1276 
    -
    1277  if ((pep->bmAttributes & 0x03) == 3 && (pep->bEndpointAddress & 0x80) == 0x80)
    -
    1278  index = epInterruptInIndex;
    -
    1279  else
    -
    1280  if ((pep->bmAttributes & 0x02) == 2)
    -
    1281  index = ((pep->bEndpointAddress & 0x80) == 0x80) ? epDataInIndex : epDataOutIndex;
    -
    1282  else
    -
    1283  return;
    +
    1275  default:
    +
    1276  // Should have been handled already in HandleUsbError.
    +
    1277  // ResetRecovery();
    +
    1278  ErrorMessage<uint8_t > (PSTR("Gen SCSI Err"), status);
    +
    1279  ErrorMessage<uint8_t > (PSTR("LUN"), bTheLUN);
    +
    1280  return status; //MASS_ERR_GENERAL_SCSI_ERROR;
    +
    1281  } // switch
    +
    1282 }
    +
    1283 
    1284 
    -
    1285  // Fill in the endpoint info structure
    -
    1286  epInfo[index].epAddr = (pep->bEndpointAddress & 0x0F);
    -
    1287  epInfo[index].maxPktSize = (uint8_t)pep->wMaxPacketSize;
    -
    1288  epInfo[index].epAttribs = 0;
    +
    1286 
    +
    1287 
    +
    1288 // Debugging code
    1289 
    -
    1290  bNumEP++;
    -
    1291 
    -
    1292  PrintEndpointDescriptor(pep);
    -
    1293 }
    -
    1294 
    -
    1299 void BulkOnly::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR * ep_ptr) {
    -
    1300  Notify(PSTR("Endpoint descriptor:"), 0x80);
    -
    1301  Notify(PSTR("\r\nLength:\t\t"), 0x80);
    -
    1302  PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
    -
    1303  Notify(PSTR("\r\nType:\t\t"), 0x80);
    -
    1304  PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
    -
    1305  Notify(PSTR("\r\nAddress:\t"), 0x80);
    -
    1306  PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
    -
    1307  Notify(PSTR("\r\nAttributes:\t"), 0x80);
    -
    1308  PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
    -
    1309  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
    -
    1310  PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
    -
    1311  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
    -
    1312  PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
    -
    1313  Notify(PSTR("\r\n"), 0x80);
    -
    1314 }
    +
    1290 
    +
    1292 
    +
    1293 
    +
    1298 void BulkOnly::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR * ep_ptr) {
    +
    1299  Notify(PSTR("Endpoint descriptor:"), 0x80);
    +
    1300  Notify(PSTR("\r\nLength:\t\t"), 0x80);
    +
    1301  D_PrintHex<uint8_t > (ep_ptr->bLength, 0x80);
    +
    1302  Notify(PSTR("\r\nType:\t\t"), 0x80);
    +
    1303  D_PrintHex<uint8_t > (ep_ptr->bDescriptorType, 0x80);
    +
    1304  Notify(PSTR("\r\nAddress:\t"), 0x80);
    +
    1305  D_PrintHex<uint8_t > (ep_ptr->bEndpointAddress, 0x80);
    +
    1306  Notify(PSTR("\r\nAttributes:\t"), 0x80);
    +
    1307  D_PrintHex<uint8_t > (ep_ptr->bmAttributes, 0x80);
    +
    1308  Notify(PSTR("\r\nMaxPktSize:\t"), 0x80);
    +
    1309  D_PrintHex<uint16_t > (ep_ptr->wMaxPacketSize, 0x80);
    +
    1310  Notify(PSTR("\r\nPoll Intrv:\t"), 0x80);
    +
    1311  D_PrintHex<uint8_t > (ep_ptr->bInterval, 0x80);
    +
    1312  Notify(PSTR("\r\n"), 0x80);
    +
    1313 }
    +
    1314 
    1315 
    -
    1316 
    +
    1317 
    1318 
    -
    1319 
    -
    1320 // misc/to kill/to-do
    +
    1319 // misc/to kill/to-do
    +
    1320 
    1321 
    -
    1322 
    +
    1323 
    1324 
    -
    1325 
    -
    1326 /* We won't be needing this... */
    -
    1327 uint8_t BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser * prs) {
    -
    1328  if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA;
    -
    1329 #if 0
    -
    1330  Notify(PSTR("\r\nRead (With parser)\r\n"), 0x80);
    -
    1331  Notify(PSTR("---------\r\n"), 0x80);
    -
    1332 
    -
    1333  CommandBlockWrapper cbw;
    -
    1334 
    -
    1335  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    1336  cbw.dCBWTag = ++dCBWTag;
    -
    1337  cbw.dCBWDataTransferLength = ((uint32_t)bsize * blocks);
    -
    1338  cbw.bmCBWFlags = MASS_CMD_DIR_IN,
    -
    1339  cbw.bmCBWLUN = lun;
    -
    1340  cbw.bmCBWCBLength = 10;
    -
    1341 
    -
    1342  for (uint8_t i = 0; i < 16; i++)
    -
    1343  cbw.CBWCB[i] = 0;
    -
    1344 
    -
    1345  cbw.CBWCB[0] = SCSI_CMD_READ_10;
    -
    1346  cbw.CBWCB[8] = blocks;
    -
    1347  cbw.CBWCB[2] = ((addr >> 24) & 0xff);
    -
    1348  cbw.CBWCB[3] = ((addr >> 16) & 0xff);
    -
    1349  cbw.CBWCB[4] = ((addr >> 8) & 0xff);
    -
    1350  cbw.CBWCB[5] = (addr & 0xff);
    -
    1351 
    -
    1352  return HandleSCSIError(Transaction(&cbw, bsize, prs, 1));
    -
    1353 #endif
    -
    1354 }
    -
    1355 
    -
    1356 #if 0
    -
    1357 // TO-DO: Unify CBW creation as much as possible.
    -
    1358 // Make and submit CBW.
    -
    1359 // if stalled, delay retry
    -
    1360 // exit on 100 retries, or anything except stall.
    -
    1361 
    -
    1362 uint8_t SubmitCBW(uint8_t cmd, uint8_t cmdsz, uint8_t lun, uint16_t bsize, uint8_t *buf, uint8_t flags) {
    -
    1363  CommandBlockWrapper cbw;
    -
    1364  SetCurLUN(lun);
    -
    1365  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    -
    1366  cbw.dCBWTag = ++dCBWTag;
    -
    1367  cbw.dCBWDataTransferLength = bsize;
    -
    1368  cbw.bmCBWFlags = flags;
    -
    1369  cbw.bmCBWLUN = lun;
    -
    1370  cbw.bmCBWCBLength = cmdsz;
    -
    1371  for (uint8_t i = 0; i < 16; i++) cbw.CBWCB[i] = 0;
    -
    1372  cbw.CBWCB[0] = cmd;
    -
    1373  cbw.CBWCB[1] = lun << 5;
    -
    1374  cbw.CBWCB[4] = bsize;
    -
    1375 }
    -
    1376 #endif
    +
    1325 /* We won't be needing this... */
    +
    1326 uint8_t BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser * prs) {
    +
    1327  if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA;
    +
    1328 #if 0
    +
    1329  Notify(PSTR("\r\nRead (With parser)\r\n"), 0x80);
    +
    1330  Notify(PSTR("---------\r\n"), 0x80);
    +
    1331 
    +
    1332  CommandBlockWrapper cbw;
    +
    1333 
    +
    1334  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    1335  cbw.dCBWTag = ++dCBWTag;
    +
    1336  cbw.dCBWDataTransferLength = ((uint32_t)bsize * blocks);
    +
    1337  cbw.bmCBWFlags = MASS_CMD_DIR_IN,
    +
    1338  cbw.bmCBWLUN = lun;
    +
    1339  cbw.bmCBWCBLength = 10;
    +
    1340 
    +
    1341  for (uint8_t i = 0; i < 16; i++)
    +
    1342  cbw.CBWCB[i] = 0;
    +
    1343 
    +
    1344  cbw.CBWCB[0] = SCSI_CMD_READ_10;
    +
    1345  cbw.CBWCB[8] = blocks;
    +
    1346  cbw.CBWCB[2] = ((addr >> 24) & 0xff);
    +
    1347  cbw.CBWCB[3] = ((addr >> 16) & 0xff);
    +
    1348  cbw.CBWCB[4] = ((addr >> 8) & 0xff);
    +
    1349  cbw.CBWCB[5] = (addr & 0xff);
    +
    1350 
    +
    1351  return HandleSCSIError(Transaction(&cbw, bsize, prs, 1));
    +
    1352 #endif
    +
    1353 }
    +
    1354 
    +
    1355 #if 0
    +
    1356 // TO-DO: Unify CBW creation as much as possible.
    +
    1357 // Make and submit CBW.
    +
    1358 // if stalled, delay retry
    +
    1359 // exit on 100 retries, or anything except stall.
    +
    1360 
    +
    1361 uint8_t SubmitCBW(uint8_t cmd, uint8_t cmdsz, uint8_t lun, uint16_t bsize, uint8_t *buf, uint8_t flags) {
    +
    1362  CommandBlockWrapper cbw;
    +
    1363  SetCurLUN(lun);
    +
    1364  cbw.dCBWSignature = MASS_CBW_SIGNATURE;
    +
    1365  cbw.dCBWTag = ++dCBWTag;
    +
    1366  cbw.dCBWDataTransferLength = bsize;
    +
    1367  cbw.bmCBWFlags = flags;
    +
    1368  cbw.bmCBWLUN = lun;
    +
    1369  cbw.bmCBWCBLength = cmdsz;
    +
    1370  for (uint8_t i = 0; i < 16; i++) cbw.CBWCB[i] = 0;
    +
    1371  cbw.CBWCB[0] = cmd;
    +
    1372  cbw.CBWCB[1] = lun << 5;
    +
    1373  cbw.CBWCB[4] = bsize;
    +
    1374 }
    +
    1375 #endif
    diff --git a/masstorage_8h_source.html b/masstorage_8h_source.html index 96f0c508..7ce7370d 100644 --- a/masstorage_8h_source.html +++ b/masstorage_8h_source.html @@ -366,34 +366,36 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    275 
    276  // UsbConfigXtracter implementation
    277  virtual void EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *ep);
    -
    278 
    -
    279 private:
    -
    280  uint8_t Inquiry(uint8_t lun, uint16_t size, uint8_t *buf);
    -
    281  uint8_t TestUnitReady(uint8_t lun);
    -
    282  uint8_t RequestSense(uint8_t lun, uint16_t size, uint8_t *buf);
    -
    283  uint8_t ModeSense(uint8_t lun, uint8_t pc, uint8_t page, uint8_t subpage, uint8_t len, uint8_t *buf);
    -
    284  uint8_t GetMaxLUN(uint8_t *max_lun);
    -
    285  uint8_t SetCurLUN(uint8_t lun);
    -
    286  void Reset();
    -
    287  uint8_t ResetRecovery();
    -
    288  uint8_t ReadCapacity(uint8_t lun, uint16_t size, uint8_t *buf);
    -
    289  void ClearAllEP();
    -
    290  void CheckMedia();
    -
    291  boolean CheckLUN(uint8_t lun);
    -
    292  uint8_t Page3F(uint8_t lun);
    -
    293  bool IsValidCBW(uint8_t size, uint8_t *pcbw);
    -
    294  bool IsMeaningfulCBW(uint8_t size, uint8_t *pcbw);
    -
    295 
    -
    296  bool IsValidCSW(CommandStatusWrapper *pcsw, CommandBlockWrapperBase *pcbw);
    +
    278  virtual boolean DEVCLASSOK(uint8_t klass) { return (klass == USB_CLASS_MASS_STORAGE); }
    +
    279 
    +
    280 
    +
    281 private:
    +
    282  uint8_t Inquiry(uint8_t lun, uint16_t size, uint8_t *buf);
    +
    283  uint8_t TestUnitReady(uint8_t lun);
    +
    284  uint8_t RequestSense(uint8_t lun, uint16_t size, uint8_t *buf);
    +
    285  uint8_t ModeSense(uint8_t lun, uint8_t pc, uint8_t page, uint8_t subpage, uint8_t len, uint8_t *buf);
    +
    286  uint8_t GetMaxLUN(uint8_t *max_lun);
    +
    287  uint8_t SetCurLUN(uint8_t lun);
    +
    288  void Reset();
    +
    289  uint8_t ResetRecovery();
    +
    290  uint8_t ReadCapacity(uint8_t lun, uint16_t size, uint8_t *buf);
    +
    291  void ClearAllEP();
    +
    292  void CheckMedia();
    +
    293  boolean CheckLUN(uint8_t lun);
    +
    294  uint8_t Page3F(uint8_t lun);
    +
    295  bool IsValidCBW(uint8_t size, uint8_t *pcbw);
    +
    296  bool IsMeaningfulCBW(uint8_t size, uint8_t *pcbw);
    297 
    -
    298  uint8_t ClearEpHalt(uint8_t index);
    -
    299  uint8_t Transaction(CommandBlockWrapper *cbw, uint16_t bsize, void *buf, uint8_t flags);
    -
    300  uint8_t HandleUsbError(uint8_t error, uint8_t index);
    -
    301  uint8_t HandleSCSIError(uint8_t status);
    -
    302 
    -
    303 };
    +
    298  bool IsValidCSW(CommandStatusWrapper *pcsw, CommandBlockWrapperBase *pcbw);
    +
    299 
    +
    300  uint8_t ClearEpHalt(uint8_t index);
    +
    301  uint8_t Transaction(CommandBlockWrapper *cbw, uint16_t bsize, void *buf, uint8_t flags);
    +
    302  uint8_t HandleUsbError(uint8_t error, uint8_t index);
    +
    303  uint8_t HandleSCSIError(uint8_t status);
    304 
    -
    305 #endif // __MASSTORAGE_H__
    +
    305 };
    +
    306 
    +
    307 #endif // __MASSTORAGE_H__
    diff --git a/message_8cpp.html b/message_8cpp.html index 54db722e..a100c8de 100644 --- a/message_8cpp.html +++ b/message_8cpp.html @@ -115,6 +115,24 @@ Functions   void E_Notify (double d, int lvl)   +void NotifyFailGetDevDescr (void) +  +void NotifyFailSetDevTblEntry (void) +  +void NotifyFailGetConfDescr (void) +  +void NotifyFailSetConfDescr (void) +  +void NotifyFailGetDevDescr (uint8_t reason) +  +void NotifyFailSetDevTblEntry (uint8_t reason) +  +void NotifyFailGetConfDescr (uint8_t reason) +  +void NotifyFailUnknownDevice (uint16_t VID, uint16_t PID) +  +void NotifyFail (uint8_t rcode) +  @@ -260,6 +278,178 @@ Variables

    Definition at line 60 of file message.cpp.

    + + + +
    +
    +

    Variables

    + + + + + + + +
    void NotifyFailGetDevDescr (void )
    +
    + +

    Definition at line 67 of file message.cpp.

    + +
    + + +
    +
    + + + + + + + + +
    void NotifyFailSetDevTblEntry (void )
    +
    + +

    Definition at line 71 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetConfDescr (void )
    +
    + +

    Definition at line 74 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailSetConfDescr (void )
    +
    + +

    Definition at line 78 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetDevDescr (uint8_t reason)
    +
    + +

    Definition at line 82 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailSetDevTblEntry (uint8_t reason)
    +
    + +

    Definition at line 87 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetConfDescr (uint8_t reason)
    +
    + +

    Definition at line 93 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    void NotifyFailUnknownDevice (uint16_t VID,
    uint16_t PID 
    )
    +
    + +

    Definition at line 104 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFail (uint8_t rcode)
    +
    + +

    Definition at line 111 of file message.cpp.

    +

    Variable Documentation

    diff --git a/message_8cpp_source.html b/message_8cpp_source.html index 397791f0..90ded52b 100644 --- a/message_8cpp_source.html +++ b/message_8cpp_source.html @@ -155,35 +155,35 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    64 }
    65 
    66 #ifdef DEBUG_USB_HOST
    -
    67 void NotifyFailGetDevDescr(void) {
    -
    68  Notify(PSTR("\r\ngetDevDescr"), 0x80);
    +
    67 void NotifyFailGetDevDescr(void) {
    +
    68  Notify(PSTR("\r\ngetDevDescr"), 0x80);
    69 }
    70 
    -
    71 void NotifyFailSetDevTblEntry(void) {
    -
    72  Notify(PSTR("\r\nsetDevTblEn"), 0x80);
    +
    71 void NotifyFailSetDevTblEntry(void) {
    +
    72  Notify(PSTR("\r\nsetDevTblEn"), 0x80);
    73 }
    -
    74 void NotifyFailGetConfDescr(void) {
    -
    75  Notify(PSTR("\r\ngetConf"), 0x80);
    +
    74 void NotifyFailGetConfDescr(void) {
    +
    75  Notify(PSTR("\r\ngetConf"), 0x80);
    76 }
    77 
    -
    78 void NotifyFailSetConfDescr(void) {
    -
    79  Notify(PSTR("\r\nsetConf"), 0x80);
    +
    78 void NotifyFailSetConfDescr(void) {
    +
    79  Notify(PSTR("\r\nsetConf"), 0x80);
    80 }
    81 
    -
    82 void NotifyFailGetDevDescr(uint8_t reason) {
    -
    83  NotifyFailGetDevDescr();
    -
    84  NotifyFail(reason);
    +
    82 void NotifyFailGetDevDescr(uint8_t reason) {
    +
    83  NotifyFailGetDevDescr();
    +
    84  NotifyFail(reason);
    85 }
    86 
    -
    87 void NotifyFailSetDevTblEntry(uint8_t reason) {
    -
    88  NotifyFailSetDevTblEntry();
    -
    89  NotifyFail(reason);
    +
    87 void NotifyFailSetDevTblEntry(uint8_t reason) {
    +
    88  NotifyFailSetDevTblEntry();
    +
    89  NotifyFail(reason);
    90 
    91 }
    92 
    -
    93 void NotifyFailGetConfDescr(uint8_t reason) {
    -
    94  NotifyFailGetConfDescr();
    -
    95  NotifyFail(reason);
    +
    93 void NotifyFailGetConfDescr(uint8_t reason) {
    +
    94  NotifyFailGetConfDescr();
    +
    95  NotifyFail(reason);
    96 }
    97 
    98 /* Will we need this in the future?
    @@ -192,16 +192,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    101  NotifyFail(reason);
    102 }
    103 */
    -
    104 void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID) {
    -
    105  Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
    -
    106  PrintHex<uint16_t > (VID, 0x80);
    -
    107  Notify(PSTR(" PID: "), 0x80);
    -
    108  PrintHex<uint16_t > (PID, 0x80);
    +
    104 void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID) {
    +
    105  Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
    +
    106  D_PrintHex<uint16_t > (VID, 0x80);
    +
    107  Notify(PSTR(" PID: "), 0x80);
    +
    108  D_PrintHex<uint16_t > (PID, 0x80);
    109 }
    110 
    -
    111 void NotifyFail(uint8_t rcode) {
    -
    112  PrintHex<uint8_t > (rcode, 0x80);
    -
    113  Notify(PSTR("\r\n"), 0x80);
    +
    111 void NotifyFail(uint8_t rcode) {
    +
    112  D_PrintHex<uint8_t > (rcode, 0x80);
    +
    113  Notify(PSTR("\r\n"), 0x80);
    114 }
    115 #endif
    diff --git a/message_8h.html b/message_8h.html index 9e8b7998..3a663922 100644 --- a/message_8h.html +++ b/message_8h.html @@ -116,32 +116,16 @@ This graph shows which files directly or indirectly include this file: + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +

    Macros

    #define DEBUG_USB_HOST
     
    #define USB_HOST_SERIAL   Serial
     
    #define Notify(...)   ((void)0)
     
    #define NotifyStr(...)   ((void)0)
     
    #define Notifyc(...)   ((void)0)
     
    #define NotifyFailGetDevDescr(...)   ((void)0)
     
    #define NotifyFailSetDevTblEntry(...)   ((void)0)
     
    #define NotifyFailGetConfDescr(...)   ((void)0)
     
    #define NotifyFailGetDevDescr(...)   ((void)0)
     
    #define NotifyFailSetDevTblEntry(...)   ((void)0)
     
    #define NotifyFailGetConfDescr(...)   ((void)0)
     
    #define NotifyFailSetConfDescr(...)   ((void)0)
     
    #define NotifyFailUnknownDevice(...)   ((void)0)
     
    #define NotifyFail(...)   ((void)0)
     
    #define Notify   E_Notify
     
    #define NotifyStr   E_NotifyStr
     
    #define Notifyc   E_Notifyc
     
    @@ -153,6 +137,24 @@ Functions + + + + + + + + + + + + + + + + + + @@ -166,6 +168,20 @@ Variables

    Functions

     
    void E_Notifyc (char c, int lvl)
     
    void NotifyFailGetDevDescr (uint8_t reason)
     
    void NotifyFailSetDevTblEntry (uint8_t reason)
     
    void NotifyFailGetConfDescr (uint8_t reason)
     
    void NotifyFailGetDevDescr (void)
     
    void NotifyFailSetDevTblEntry (void)
     
    void NotifyFailGetConfDescr (void)
     
    void NotifyFailSetConfDescr (void)
     
    void NotifyFailUnknownDevice (uint16_t VID, uint16_t PID)
     
    void NotifyFail (uint8_t rcode)
     
    template<class ERROR_TYPE >
    void ErrorMessage (uint8_t level, char const *msg, ERROR_TYPE rcode=0)
     
     

    Macro Definition Documentation

    + +
    +
    + + + + +
    #define DEBUG_USB_HOST
    +
    + +

    Definition at line 21 of file message.h.

    + +
    +
    @@ -180,219 +196,45 @@ Variables
    - +
    - - - - - +
    #define Notify( ...)   ((void)0)#define Notify   E_Notify
    -

    Definition at line 53 of file message.h.

    +

    Definition at line 40 of file message.h.

    - +
    - - - - - +
    #define NotifyStr( ...)   ((void)0)#define NotifyStr   E_NotifyStr
    -

    Definition at line 54 of file message.h.

    +

    Definition at line 41 of file message.h.

    - +
    - - - - - +
    #define Notifyc( ...)   ((void)0)#define Notifyc   E_Notifyc
    -

    Definition at line 55 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailGetDevDescr( ...)   ((void)0)
    -
    - -

    Definition at line 59 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailSetDevTblEntry( ...)   ((void)0)
    -
    - -

    Definition at line 60 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailGetConfDescr( ...)   ((void)0)
    -
    - -

    Definition at line 61 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailGetDevDescr( ...)   ((void)0)
    -
    - -

    Definition at line 59 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailSetDevTblEntry( ...)   ((void)0)
    -
    - -

    Definition at line 60 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailGetConfDescr( ...)   ((void)0)
    -
    - -

    Definition at line 61 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailSetConfDescr( ...)   ((void)0)
    -
    - -

    Definition at line 62 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFailUnknownDevice( ...)   ((void)0)
    -
    - -

    Definition at line 63 of file message.h.

    - -
    -
    - -
    -
    - - - - - - - - -
    #define NotifyFail( ...)   ((void)0)
    -
    - -

    Definition at line 64 of file message.h.

    +

    Definition at line 42 of file message.h.

    @@ -507,6 +349,178 @@ Variables

    Definition at line 24 of file message.cpp.

    + + + +
    +
    + + + + + + + + +
    void NotifyFailGetDevDescr (uint8_t reason)
    +
    + +

    Definition at line 82 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailSetDevTblEntry (uint8_t reason)
    +
    + +

    Definition at line 87 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetConfDescr (uint8_t reason)
    +
    + +

    Definition at line 93 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetDevDescr (void )
    +
    + +

    Definition at line 67 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailSetDevTblEntry (void )
    +
    + +

    Definition at line 71 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailGetConfDescr (void )
    +
    + +

    Definition at line 74 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFailSetConfDescr (void )
    +
    + +

    Definition at line 78 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    void NotifyFailUnknownDevice (uint16_t VID,
    uint16_t PID 
    )
    +
    + +

    Definition at line 104 of file message.cpp.

    + +
    +
    + +
    +
    + + + + + + + + +
    void NotifyFail (uint8_t rcode)
    +
    + +

    Definition at line 111 of file message.cpp.

    +
    diff --git a/message_8h_source.html b/message_8h_source.html index 243f4e18..ae2c7872 100644 --- a/message_8h_source.html +++ b/message_8h_source.html @@ -109,8 +109,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    18 #define __MESSAGE_H__
    19 
    20 // uncomment to activate
    -
    21 //#define DEBUG_USB_HOST
    -
    22 
    +
    21 #define DEBUG_USB_HOST
    +
    22 
    23 
    24 #ifndef USB_HOST_SERIAL
    25 #define USB_HOST_SERIAL Serial
    @@ -128,50 +128,50 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    37 void E_Notifyc(char c, int lvl);
    38 
    39 #ifdef DEBUG_USB_HOST
    -
    40 #define Notify E_Notify
    -
    41 #define NotifyStr E_NotifyStr
    -
    42 #define Notifyc E_Notifyc
    -
    43 void NotifyFailGetDevDescr(uint8_t reason);
    -
    44 void NotifyFailSetDevTblEntry(uint8_t reason);
    -
    45 void NotifyFailGetConfDescr(uint8_t reason);
    -
    46 void NotifyFailGetDevDescr(void);
    -
    47 void NotifyFailSetDevTblEntry(void);
    -
    48 void NotifyFailGetConfDescr(void);
    -
    49 void NotifyFailSetConfDescr(void);
    -
    50 void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID);
    -
    51 void NotifyFail(uint8_t rcode);
    +
    40 #define Notify E_Notify
    +
    41 #define NotifyStr E_NotifyStr
    +
    42 #define Notifyc E_Notifyc
    +
    43 void NotifyFailGetDevDescr(uint8_t reason);
    +
    44 void NotifyFailSetDevTblEntry(uint8_t reason);
    +
    45 void NotifyFailGetConfDescr(uint8_t reason);
    +
    46 void NotifyFailGetDevDescr(void);
    +
    47 void NotifyFailSetDevTblEntry(void);
    +
    48 void NotifyFailGetConfDescr(void);
    +
    49 void NotifyFailSetConfDescr(void);
    +
    50 void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID);
    +
    51 void NotifyFail(uint8_t rcode);
    52 #else
    -
    53 #define Notify(...) ((void)0)
    -
    54 #define NotifyStr(...) ((void)0)
    -
    55 #define Notifyc(...) ((void)0)
    +
    53 #define Notify(...) ((void)0)
    +
    54 #define NotifyStr(...) ((void)0)
    +
    55 #define Notifyc(...) ((void)0)
    56 #define NotifyFailGetDevDescr(...) ((void)0)
    57 #define NotifyFailSetDevTblEntry(...) ((void)0)
    58 #define NotifyFailGetConfDescr(...) ((void)0)
    -
    59 #define NotifyFailGetDevDescr(...) ((void)0)
    -
    60 #define NotifyFailSetDevTblEntry(...) ((void)0)
    -
    61 #define NotifyFailGetConfDescr(...) ((void)0)
    -
    62 #define NotifyFailSetConfDescr(...) ((void)0)
    -
    63 #define NotifyFailUnknownDevice(...) ((void)0)
    -
    64 #define NotifyFail(...) ((void)0)
    +
    59 #define NotifyFailGetDevDescr(...) ((void)0)
    +
    60 #define NotifyFailSetDevTblEntry(...) ((void)0)
    +
    61 #define NotifyFailGetConfDescr(...) ((void)0)
    +
    62 #define NotifyFailSetConfDescr(...) ((void)0)
    +
    63 #define NotifyFailUnknownDevice(...) ((void)0)
    +
    64 #define NotifyFail(...) ((void)0)
    65 #endif
    66 
    67 template <class ERROR_TYPE>
    68 void ErrorMessage(uint8_t level, char const * msg, ERROR_TYPE rcode = 0) {
    69 #ifdef DEBUG_USB_HOST
    -
    70  Notify(msg, level);
    -
    71  Notify(PSTR(": "), level);
    -
    72  PrintHex<ERROR_TYPE > (rcode, level);
    -
    73  Notify(PSTR("\r\n"), level);
    +
    70  Notify(msg, level);
    +
    71  Notify(PSTR(": "), level);
    +
    72  D_PrintHex<ERROR_TYPE > (rcode, level);
    +
    73  Notify(PSTR("\r\n"), level);
    74 #endif
    75 }
    76 
    77 template <class ERROR_TYPE>
    78 void ErrorMessage(char const * msg, ERROR_TYPE rcode = 0) {
    79 #ifdef DEBUG_USB_HOST
    -
    80  Notify(msg, 0x80);
    -
    81  Notify(PSTR(": "), 0x80);
    -
    82  PrintHex<ERROR_TYPE > (rcode, 0x80);
    -
    83  Notify(PSTR("\r\n"), 0x80);
    +
    80  Notify(msg, 0x80);
    +
    81  Notify(PSTR(": "), 0x80);
    +
    82  D_PrintHex<ERROR_TYPE > (rcode, 0x80);
    +
    83  Notify(PSTR("\r\n"), 0x80);
    84 #endif
    85 }
    86 
    diff --git a/parsetools_8cpp_source.html b/parsetools_8cpp_source.html index 0a041b8b..01fd9b1a 100644 --- a/parsetools_8cpp_source.html +++ b/parsetools_8cpp_source.html @@ -109,7 +109,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    18 
    19 bool MultiByteValueParser::Parse(uint8_t **pp, uint16_t *pcntdn) {
    20  if (!pBuf) {
    -
    21  Notify(PSTR("Buffer pointer is NULL!\r\n"), 0x80);
    +
    21  Notify(PSTR("Buffer pointer is NULL!\r\n"), 0x80);
    22  return false;
    23  }
    24  for (; countDown && (*pcntdn); countDown--, (*pcntdn)--, (*pp)++)
    diff --git a/printhex_8h.html b/printhex_8h.html index 0612100e..e2a0afa4 100644 --- a/printhex_8h.html +++ b/printhex_8h.html @@ -131,6 +131,12 @@ Functions template<class T > void PrintHex2 (Print *prn, T val)   +template<class T > +void D_PrintHex (T val, int lvl) +  +template<class T > +void D_PrintBin (T val, int lvl) + 

    Macro Definition Documentation

    @@ -143,7 +149,7 @@ Functions
    -

    Definition at line 26 of file printhex.h.

    +

    Definition at line 27 of file printhex.h.

    @@ -202,7 +208,7 @@ template<class T >
    -

    Definition at line 31 of file printhex.h.

    +

    Definition at line 33 of file printhex.h.

    @@ -252,7 +258,7 @@ template<class T >
    -

    Definition at line 55 of file printhex.h.

    +

    Definition at line 53 of file printhex.h.

    @@ -282,7 +288,67 @@ template<class T >
    -

    Definition at line 68 of file printhex.h.

    +

    Definition at line 64 of file printhex.h.

    + +
    + + +
    +
    +
    +template<class T >
    + + + + + + + + + + + + + + + + + + +
    void D_PrintHex (T val,
    int lvl 
    )
    +
    + +

    Definition at line 76 of file printhex.h.

    + +
    +
    + +
    +
    +
    +template<class T >
    + + + + + + + + + + + + + + + + + + +
    void D_PrintBin (T val,
    int lvl 
    )
    +
    + +

    Definition at line 83 of file printhex.h.

    diff --git a/printhex_8h_source.html b/printhex_8h_source.html index 10d19ad2..8ade1d0c 100644 --- a/printhex_8h_source.html +++ b/printhex_8h_source.html @@ -114,63 +114,72 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    23 #include <WProgram.h>
    24 #endif
    25 
    -
    26 #define USB_HOST_SERIAL Serial
    -
    27 
    -
    28 void E_Notifyc(char c, int lvl);
    -
    29 
    -
    30 template <class T>
    -
    31 void PrintHex(T val, int lvl) {
    -
    32 //#ifdef DEBUG_USB_HOST
    -
    33  int num_nibbles = sizeof(T) * 2;
    -
    34 
    -
    35  do {
    -
    36  char v = 48 + (((val >> (num_nibbles - 1) * 4)) & 0x0f);
    -
    37  if(v > 57) v += 7;
    -
    38  E_Notifyc(v, lvl);
    -
    39  } while(--num_nibbles);
    -
    40 //#endif
    +
    26 #ifndef USB_HOST_SERIAL
    +
    27 #define USB_HOST_SERIAL Serial
    +
    28 #endif
    +
    29 
    +
    30 void E_Notifyc(char c, int lvl);
    +
    31 
    +
    32 template <class T>
    +
    33 void PrintHex(T val, int lvl) {
    +
    34  int num_nibbles = sizeof(T) * 2;
    +
    35 
    +
    36  do {
    +
    37  char v = 48 + (((val >> (num_nibbles - 1) * 4)) & 0x0f);
    +
    38  if(v > 57) v += 7;
    +
    39  E_Notifyc(v, lvl);
    +
    40  } while(--num_nibbles);
    41 }
    42 
    43 template <class T>
    44 void PrintBin(T val, int lvl) {
    -
    45 //#ifdef DEBUG_USB_HOST
    -
    46  for(T mask = (((T) 1) << ((sizeof(T) << 3) - 1)); mask; mask >>= 1)
    -
    47  if(val & mask)
    -
    48  E_Notifyc('1', lvl);
    -
    49  else
    -
    50  E_Notifyc('0', lvl);
    -
    51 //#endif
    -
    52 }
    -
    53 
    -
    54 template <class T>
    -
    55 void SerialPrintHex(T val) {
    -
    56 //#ifdef DEBUG_USB_HOST
    -
    57  int num_nibbles = sizeof(T) * 2;
    -
    58 
    -
    59  do {
    -
    60  char v = 48 + (((val >> (num_nibbles - 1) * 4)) & 0x0f);
    -
    61  if(v > 57) v += 7;
    -
    62  USB_HOST_SERIAL.print(v);
    -
    63  } while(--num_nibbles);
    -
    64 //#endif
    -
    65 }
    +
    45  for(T mask = (((T) 1) << ((sizeof(T) << 3) - 1)); mask; mask >>= 1)
    +
    46  if(val & mask)
    +
    47  E_Notifyc('1', lvl);
    +
    48  else
    +
    49  E_Notifyc('0', lvl);
    +
    50 }
    +
    51 
    +
    52 template <class T>
    +
    53 void SerialPrintHex(T val) {
    +
    54  int num_nibbles = sizeof(T) * 2;
    +
    55 
    +
    56  do {
    +
    57  char v = 48 + (((val >> (num_nibbles - 1) * 4)) & 0x0f);
    +
    58  if(v > 57) v += 7;
    +
    59  USB_HOST_SERIAL.print(v);
    +
    60  } while(--num_nibbles);
    +
    61 }
    +
    62 
    +
    63 template <class T>
    +
    64 void PrintHex2(Print *prn, T val) {
    +
    65  T mask = (((T) 1) << (((sizeof(T) << 1) - 1) << 2));
    66 
    -
    67 template <class T>
    -
    68 void PrintHex2(Print *prn, T val) {
    -
    69 //#ifdef DEBUG_USB_HOST
    -
    70  T mask = (((T) 1) << (((sizeof(T) << 1) - 1) << 2));
    -
    71 
    -
    72  while(mask > 1) {
    -
    73  if(val < mask)
    -
    74  prn->print("0");
    +
    67  while(mask > 1) {
    +
    68  if(val < mask)
    +
    69  prn->print("0");
    +
    70 
    +
    71  mask >>= 4;
    +
    72  }
    +
    73  prn->print((T) val, HEX);
    +
    74 }
    75 
    -
    76  mask >>= 4;
    -
    77  }
    -
    78  prn->print((T) val, HEX);
    -
    79 //#endif
    -
    80 }
    +
    76 template <class T> void D_PrintHex(T val, int lvl) {
    +
    77 #ifdef DEBUG_USB_HOST
    +
    78  PrintHex<T>(val, lvl);
    +
    79 #endif
    +
    80 }
    81 
    -
    82 #endif // __PRINTHEX_H__
    +
    82 template <class T>
    +
    83 void D_PrintBin(T val, int lvl) {
    +
    84 #ifdef DEBUG_USB_HOST
    +
    85  PrintBin<T>(val, lvl);
    +
    86 #endif
    +
    87 }
    +
    88 
    +
    89 
    +
    90 
    +
    91 #endif // __PRINTHEX_H__
    diff --git a/search/all_64.js b/search/all_64.js index 1dcc5487..d302c955 100644 --- a/search/all_64.js +++ b/search/all_64.js @@ -1,5 +1,7 @@ var searchData= [ + ['d_5fprintbin',['D_PrintBin',['../printhex_8h.html#a1cfed3721d1a9d723e13613db4ebe82d',1,'printhex.h']]], + ['d_5fprinthex',['D_PrintHex',['../printhex_8h.html#a87dd4758587ab680b721b0bffde8c3b8',1,'printhex.h']]], ['data',['data',['../struct_capacity.html#ae6dd521cd2ece3d6fa6fe58180fb9e8a',1,'Capacity']]], ['data_5fsize_5f0',['DATA_SIZE_0',['../hid_8h.html#ac4c40e44b6ef0e020230df304a75f8c7',1,'hid.h']]], ['data_5fsize_5f1',['DATA_SIZE_1',['../hid_8h.html#a81e8f549407197122ec10d84b8c42794',1,'hid.h']]], @@ -19,12 +21,14 @@ var searchData= ['dcswdataresidue',['dCSWDataResidue',['../struct_command_status_wrapper.html#adf944665d28bb394a3d9756e8418d09e',1,'CommandStatusWrapper']]], ['dcswsignature',['dCSWSignature',['../struct_command_status_wrapper.html#a498a87759e737395829b6ff4b6420ad1',1,'CommandStatusWrapper']]], ['dcswtag',['dCSWTag',['../struct_command_status_wrapper.html#af872c29cfee3fb74e7ad9471ee4461fb',1,'CommandStatusWrapper']]], + ['debug_5fusb_5fhost',['DEBUG_USB_HOST',['../message_8h.html#aded3b733d68d3c49e69a3b87db37028c',1,'message.h']]], ['default_5fauto',['DEFAULT_AUTO',['../cdcprolific_8h.html#acc570c15816dfccb107fa119c255dc26',1,'cdcprolific.h']]], ['default_5fnotify',['DEFAULT_NOTIFY',['../cdcprolific_8h.html#a858860d62527650b80da4ef4aaac1317',1,'cdcprolific.h']]], ['default_5fstate',['DEFAULT_STATE',['../cdcprolific_8h.html#af93d7c80faa6ebd086460cde2d5dd27e',1,'cdcprolific.h']]], ['defaultaddressing',['DefaultAddressing',['../class_u_s_b.html#a5eb0d31372d26f0015a0d7be0b9ff4e1',1,'USB']]], ['dev_5fdescr_5flen',['DEV_DESCR_LEN',['../usb__ch9_8h.html#ab7e334b0d473aca9604a2522c0702e78',1,'usb_ch9.h']]], ['devaddress',['devAddress',['../struct_usb_device_address.html#a79ed442d6a357907ddb4d1697bd6af5f',1,'UsbDeviceAddress']]], + ['devclassok',['DEVCLASSOK',['../class_bulk_only.html#a509fdebcff72a9c0c8db706416f5bf23',1,'BulkOnly::DEVCLASSOK()'],['../class_u_s_b_device_config.html#a7f13c42ed2c8e72e1f63562576ca82d2',1,'USBDeviceConfig::DEVCLASSOK()'],['../class_u_s_b_hub.html#adb0cf72e220cc16a87da685899dfb820',1,'USBHub::DEVCLASSOK()']]], ['devicetype',['DeviceType',['../struct_inquiry_response.html#abc2af027a176dc85d4e83f14eec7972e',1,'InquiryResponse']]], ['digittitles0',['digitTitles0',['../class_report_desc_parser_base.html#a298396c59609fab20c2a5eedb3ca0b87',1,'ReportDescParserBase']]], ['digittitles1',['digitTitles1',['../class_report_desc_parser_base.html#abc5202f47578494d3f6008413f632873',1,'ReportDescParserBase']]], diff --git a/search/all_67.js b/search/all_67.js index 62d4f09c..da6464fe 100644 --- a/search/all_67.js +++ b/search/all_67.js @@ -12,7 +12,7 @@ var searchData= ['get_5fdcr0',['GET_DCR0',['../cdcprolific_8h.html#a27f1e77863200d1f798db253340e05e0',1,'cdcprolific.h']]], ['get_5fdcr1',['GET_DCR1',['../cdcprolific_8h.html#a62ab8c44b9b3111fe0ba193e30d2612d',1,'cdcprolific.h']]], ['get_5fdcr2',['GET_DCR2',['../cdcprolific_8h.html#aedd5c473d7ee45d806c4d7c13856089f',1,'cdcprolific.h']]], - ['getaddress',['GetAddress',['../class_a_d_k.html#a1a972e8dc98b60ab27528db3af2618c3',1,'ADK::GetAddress()'],['../class_b_t_d.html#aecdd9d00fc9c12bb3677ed213a6687c3',1,'BTD::GetAddress()'],['../class_a_c_m.html#a7e0bb108012af9a99bb98aefca036d84',1,'ACM::GetAddress()'],['../class_f_t_d_i.html#ae224d7ea581e5df3b11416410a679086',1,'FTDI::GetAddress()'],['../class_h_i_d_boot.html#a6fafa2711d72ff4efd6bf91984585aba',1,'HIDBoot::GetAddress()'],['../class_h_i_d_universal.html#abcc6921b7beaf0aac2acbcdddd535626',1,'HIDUniversal::GetAddress()'],['../class_bulk_only.html#a376cb3367071555816e2b0c74ad7eb12',1,'BulkOnly::GetAddress()'],['../class_p_s3_u_s_b.html#a04b79c271ca14e1e095c6e305c672627',1,'PS3USB::GetAddress()'],['../class_u_s_b_device_config.html#aae3130517514c902bad5f153849b3811',1,'USBDeviceConfig::GetAddress()'],['../class_u_s_b_hub.html#af4052e34bdafa21db5376a3011778b99',1,'USBHub::GetAddress()'],['../class_x_b_o_x_r_e_c_v.html#a2d58b0a20eb804d853713ade83d01631',1,'XBOXRECV::GetAddress()'],['../class_x_b_o_x_u_s_b.html#a42c870e64582980634423248d64500b4',1,'XBOXUSB::GetAddress()']]], + ['getaddress',['GetAddress',['../class_a_d_k.html#a1a972e8dc98b60ab27528db3af2618c3',1,'ADK::GetAddress()'],['../class_b_t_d.html#aecdd9d00fc9c12bb3677ed213a6687c3',1,'BTD::GetAddress()'],['../class_a_c_m.html#a7e0bb108012af9a99bb98aefca036d84',1,'ACM::GetAddress()'],['../class_f_t_d_i.html#ae224d7ea581e5df3b11416410a679086',1,'FTDI::GetAddress()'],['../class_h_i_d_boot.html#a6fafa2711d72ff4efd6bf91984585aba',1,'HIDBoot::GetAddress()'],['../class_h_i_d_universal.html#abcc6921b7beaf0aac2acbcdddd535626',1,'HIDUniversal::GetAddress()'],['../class_bulk_only.html#a376cb3367071555816e2b0c74ad7eb12',1,'BulkOnly::GetAddress()'],['../class_p_s3_u_s_b.html#a04b79c271ca14e1e095c6e305c672627',1,'PS3USB::GetAddress()'],['../class_u_s_b_device_config.html#a2bfde6c290d32888a6f4e97fa1e222f1',1,'USBDeviceConfig::GetAddress()'],['../class_u_s_b_hub.html#af4052e34bdafa21db5376a3011778b99',1,'USBHub::GetAddress()'],['../class_x_b_o_x_r_e_c_v.html#a2d58b0a20eb804d853713ade83d01631',1,'XBOXRECV::GetAddress()'],['../class_x_b_o_x_u_s_b.html#a42c870e64582980634423248d64500b4',1,'XBOXUSB::GetAddress()']]], ['getaddresspool',['GetAddressPool',['../class_u_s_b.html#a66ab8f5eda239e761d5a48741ea1f9d4',1,'USB']]], ['getanalogbutton',['getAnalogButton',['../class_p_s3_b_t.html#a8c04e0e821dcbfb8825d4b31ab270f00',1,'PS3BT::getAnalogButton()'],['../class_p_s3_u_s_b.html#a2d30813a3f5c4729b5c1662832d5a6e0',1,'PS3USB::getAnalogButton()']]], ['getanaloghat',['getAnalogHat',['../class_p_s3_b_t.html#a9da5c045fafc3436dc2d2820cb234384',1,'PS3BT::getAnalogHat()'],['../class_p_s3_u_s_b.html#a2b0f391b8ae3e80b18cf9108c3e8f7e3',1,'PS3USB::getAnalogHat()'],['../class_w_i_i.html#ab16e907132354be9848fd91a6a5171db',1,'WII::getAnalogHat(Hat a)'],['../class_w_i_i.html#ab684ac791f235aed4d5ccf485081c075',1,'WII::getAnalogHat(AnalogHat a)'],['../class_x_b_o_x_r_e_c_v.html#aef2c97b6f1d6eba631477f2d6c9f6de5',1,'XBOXRECV::getAnalogHat()'],['../class_x_b_o_x_u_s_b.html#a7fcef8741de99d56f3a4d7fad9f954ff',1,'XBOXUSB::getAnalogHat()']]], diff --git a/search/all_69.js b/search/all_69.js index 1cff5116..0ae712b1 100644 --- a/search/all_69.js +++ b/search/all_69.js @@ -7,7 +7,7 @@ var searchData= ['imanufacturer',['iManufacturer',['../struct_u_s_b___d_e_v_i_c_e___d_e_s_c_r_i_p_t_o_r.html#ad16528e2a4018962f8d7d97036386eac',1,'USB_DEVICE_DESCRIPTOR']]], ['incomingwii',['incomingWii',['../class_b_t_d.html#a4dc8f94fe85028f3d54f13dde1e5b4ee',1,'BTD']]], ['information',['Information',['../struct_request_sense_responce.html#a4342aa28405753a185d867060fec931e',1,'RequestSenseResponce']]], - ['init',['Init',['../class_a_d_k.html#a8c5c2e212c748966ccd863499d202063',1,'ADK::Init()'],['../class_b_t_d.html#a48608619d8253972dd132edbb3001c5f',1,'BTD::Init()'],['../class_a_c_m.html#ad3210651d58c77d3ded4b4b83a9476b7',1,'ACM::Init()'],['../class_f_t_d_i.html#a2d40115414dadfee8c284e0f5d397621',1,'FTDI::Init()'],['../class_p_l2303.html#a23c849fb504c1fe6f46c84d04c0a47cf',1,'PL2303::Init()'],['../class_h_i_d_boot.html#aa30d7cf292378153f41d8a13380c6119',1,'HIDBoot::Init()'],['../class_h_i_d_universal.html#a384b0e219f763e2d6407636bfd4ccea7',1,'HIDUniversal::Init()'],['../class_bulk_only.html#a51870da9badc037166b86da60bcda6ea',1,'BulkOnly::Init()'],['../class_p_s3_u_s_b.html#a0083545cb99fb8786e60281fe7a9050d',1,'PS3USB::Init()'],['../class_u_s_b_device_config.html#a391dc824a3271671890cebeb829b35ed',1,'USBDeviceConfig::Init()'],['../class_m_a_x3421e.html#a8414e5a161ca272e435b9ab7f5db92ea',1,'MAX3421e::Init()'],['../class_u_s_b_hub.html#ab2b2e257556e3d59f9258dd84d6f636e',1,'USBHub::Init()'],['../class_x_b_o_x_r_e_c_v.html#a07de216bf16a83501d74463c00bf1fc8',1,'XBOXRECV::Init()'],['../class_x_b_o_x_u_s_b.html#a9d2ad06354787bc252058bb28015b56e',1,'XBOXUSB::Init()'],['../class_max___l_c_d.html#a3205e9a432c808422867c1398d665247',1,'Max_LCD::init()'],['../class_s_pi.html#ad26219fa147c50cd1cac105a235ee997',1,'SPi::init()']]], + ['init',['init',['../class_max___l_c_d.html#a3205e9a432c808422867c1398d665247',1,'Max_LCD::init()'],['../class_s_pi.html#ad26219fa147c50cd1cac105a235ee997',1,'SPi::init()'],['../class_a_d_k.html#a8c5c2e212c748966ccd863499d202063',1,'ADK::Init()'],['../class_b_t_d.html#a48608619d8253972dd132edbb3001c5f',1,'BTD::Init()'],['../class_a_c_m.html#ad3210651d58c77d3ded4b4b83a9476b7',1,'ACM::Init()'],['../class_f_t_d_i.html#a2d40115414dadfee8c284e0f5d397621',1,'FTDI::Init()'],['../class_p_l2303.html#a23c849fb504c1fe6f46c84d04c0a47cf',1,'PL2303::Init()'],['../class_h_i_d_boot.html#aa30d7cf292378153f41d8a13380c6119',1,'HIDBoot::Init()'],['../class_h_i_d_universal.html#a384b0e219f763e2d6407636bfd4ccea7',1,'HIDUniversal::Init()'],['../class_bulk_only.html#a51870da9badc037166b86da60bcda6ea',1,'BulkOnly::Init()'],['../class_p_s3_u_s_b.html#a0083545cb99fb8786e60281fe7a9050d',1,'PS3USB::Init()'],['../class_u_s_b_device_config.html#a3706cf6b18785aff823171e280bab738',1,'USBDeviceConfig::Init()'],['../class_m_a_x3421e.html#a8414e5a161ca272e435b9ab7f5db92ea',1,'MAX3421e::Init()'],['../class_u_s_b_hub.html#ab2b2e257556e3d59f9258dd84d6f636e',1,'USBHub::Init()'],['../class_x_b_o_x_r_e_c_v.html#a07de216bf16a83501d74463c00bf1fc8',1,'XBOXRECV::Init()'],['../class_x_b_o_x_u_s_b.html#a9d2ad06354787bc252058bb28015b56e',1,'XBOXUSB::Init()']]], ['initialize',['Initialize',['../class_hex_dumper.html#accd2712258f54a8072eae3d2ad8cceba',1,'HexDumper::Initialize()'],['../class_multi_byte_value_parser.html#a9bd52b4e180d68dbb8f97c059250f4c3',1,'MultiByteValueParser::Initialize()'],['../class_byte_skipper.html#a274a09686d5535e11961d2ccf38ffa08',1,'ByteSkipper::Initialize()'],['../class_p_t_p_list_parser.html#a18f6c785d1ddb51d7e158810644079b7',1,'PTPListParser::Initialize()']]], ['inquiryresponse',['InquiryResponse',['../struct_inquiry_response.html',1,'']]], ['internal_5fdelay',['INTERNAL_DELAY',['../cdcprolific_8h.html#ad77e166d8f5931c693952f5e89c2b732',1,'cdcprolific.h']]], diff --git a/search/all_6e.js b/search/all_6e.js index 31ddd871..74dfafcb 100644 --- a/search/all_6e.js +++ b/search/all_6e.js @@ -7,15 +7,15 @@ var searchData= ['nodisplay',['noDisplay',['../class_max___l_c_d.html#ab865f37d0df98270e5ea3c4fb0f28a80',1,'Max_LCD']]], ['normaca',['NormACA',['../struct_inquiry_response.html#a02cb9a4f4f1a080853eeb3fe3a97b6fe',1,'InquiryResponse']]], ['notcharging',['NotCharging',['../_p_s3_enums_8h.html#a67a0db04d321a74b7e7fcfd3f1a3f70bac138cecbd4ef1ba0f9e0ab12440a6df6',1,'PS3Enums.h']]], - ['notify',['Notify',['../message_8h.html#a27117e124c5d66d5512fe8d494fe6338',1,'message.h']]], - ['notifyc',['Notifyc',['../message_8h.html#ab5d8177365493b21dbc092f6557bd508',1,'message.h']]], - ['notifyfail',['NotifyFail',['../message_8h.html#a22695bdc18ebde4a87dbe8633cb39593',1,'message.h']]], - ['notifyfailgetconfdescr',['NotifyFailGetConfDescr',['../message_8h.html#a38aabfb47a8bf743b0532e356c39faaf',1,'NotifyFailGetConfDescr(): message.h'],['../message_8h.html#a38aabfb47a8bf743b0532e356c39faaf',1,'NotifyFailGetConfDescr(): message.h']]], - ['notifyfailgetdevdescr',['NotifyFailGetDevDescr',['../message_8h.html#ae65e02f44cfdc490efd1b33f9882fbbd',1,'NotifyFailGetDevDescr(): message.h'],['../message_8h.html#ae65e02f44cfdc490efd1b33f9882fbbd',1,'NotifyFailGetDevDescr(): message.h']]], - ['notifyfailsetconfdescr',['NotifyFailSetConfDescr',['../message_8h.html#a03e4088aafca36fd7a4be69e3a22b601',1,'message.h']]], - ['notifyfailsetdevtblentry',['NotifyFailSetDevTblEntry',['../message_8h.html#a69619d86b1636f141c830ca82c7f45e7',1,'NotifyFailSetDevTblEntry(): message.h'],['../message_8h.html#a69619d86b1636f141c830ca82c7f45e7',1,'NotifyFailSetDevTblEntry(): message.h']]], - ['notifyfailunknowndevice',['NotifyFailUnknownDevice',['../message_8h.html#a0ce3a725ee65614d7f95cda10e4d2e91',1,'message.h']]], - ['notifystr',['NotifyStr',['../message_8h.html#aa41f0e761e43cb026f1c7f04f75fa24e',1,'message.h']]], + ['notify',['Notify',['../message_8h.html#a747819b0aa34f5c3ba0332c2db28c846',1,'message.h']]], + ['notifyc',['Notifyc',['../message_8h.html#a1cfb80dd289cf19d4d6c762e9891daf3',1,'message.h']]], + ['notifyfail',['NotifyFail',['../message_8cpp.html#a5ae2cb9bf877595104f2425f50e2057f',1,'NotifyFail(uint8_t rcode): message.cpp'],['../message_8h.html#a5ae2cb9bf877595104f2425f50e2057f',1,'NotifyFail(uint8_t rcode): message.cpp']]], + ['notifyfailgetconfdescr',['NotifyFailGetConfDescr',['../message_8cpp.html#a8990b7c46c3f20489c3f205fa173f110',1,'NotifyFailGetConfDescr(void): message.cpp'],['../message_8cpp.html#ab3a7edeb63265b6f362a5f26cc033d7d',1,'NotifyFailGetConfDescr(uint8_t reason): message.cpp'],['../message_8h.html#ab3a7edeb63265b6f362a5f26cc033d7d',1,'NotifyFailGetConfDescr(uint8_t reason): message.cpp'],['../message_8h.html#a8990b7c46c3f20489c3f205fa173f110',1,'NotifyFailGetConfDescr(void): message.cpp']]], + ['notifyfailgetdevdescr',['NotifyFailGetDevDescr',['../message_8cpp.html#ace40a5d826a882de0c5a25aece111d3f',1,'NotifyFailGetDevDescr(void): message.cpp'],['../message_8cpp.html#a2727e613ef57acf8d906d6250d084ae1',1,'NotifyFailGetDevDescr(uint8_t reason): message.cpp'],['../message_8h.html#a2727e613ef57acf8d906d6250d084ae1',1,'NotifyFailGetDevDescr(uint8_t reason): message.cpp'],['../message_8h.html#ace40a5d826a882de0c5a25aece111d3f',1,'NotifyFailGetDevDescr(void): message.cpp']]], + ['notifyfailsetconfdescr',['NotifyFailSetConfDescr',['../message_8cpp.html#a08b840c377ca6f8154d6924d51338d89',1,'NotifyFailSetConfDescr(void): message.cpp'],['../message_8h.html#a08b840c377ca6f8154d6924d51338d89',1,'NotifyFailSetConfDescr(void): message.cpp']]], + ['notifyfailsetdevtblentry',['NotifyFailSetDevTblEntry',['../message_8cpp.html#aa65008f9251787149e391f89e68b32be',1,'NotifyFailSetDevTblEntry(void): message.cpp'],['../message_8cpp.html#a39ba2835e6dca2d85d8cd2174292458d',1,'NotifyFailSetDevTblEntry(uint8_t reason): message.cpp'],['../message_8h.html#a39ba2835e6dca2d85d8cd2174292458d',1,'NotifyFailSetDevTblEntry(uint8_t reason): message.cpp'],['../message_8h.html#aa65008f9251787149e391f89e68b32be',1,'NotifyFailSetDevTblEntry(void): message.cpp']]], + ['notifyfailunknowndevice',['NotifyFailUnknownDevice',['../message_8cpp.html#a7103129ed2b7b7896461c0a3cd924eb4',1,'NotifyFailUnknownDevice(uint16_t VID, uint16_t PID): message.cpp'],['../message_8h.html#a7103129ed2b7b7896461c0a3cd924eb4',1,'NotifyFailUnknownDevice(uint16_t VID, uint16_t PID): message.cpp']]], + ['notifystr',['NotifyStr',['../message_8h.html#a89ba2ee6d833ac1f466a5e1326d13902',1,'message.h']]], ['number',['Number',['../class_t_pin.html#a65a50f1383fc714442726481039c5fc6ab6c67ae50b9d371577e7fa78775b6fdb',1,'TPin']]], ['nunchuck_5fconnected_5fflag',['nunchuck_connected_flag',['../_wii_8h.html#a7ae9154397104e4df34302ed0884bbfb',1,'Wii.h']]], ['nunchuckconnected',['nunchuckConnected',['../class_w_i_i.html#a7cb4cec343c65fd350e6b05043d7f1a8',1,'WII']]], diff --git a/search/all_70.js b/search/all_70.js index a01f9ad3..363f7501 100644 --- a/search/all_70.js +++ b/search/all_70.js @@ -24,7 +24,7 @@ var searchData= ['pl_5fvid',['PL_VID',['../cdcprolific_8h.html#ac33a32ea1e6c88a3041b8fd579bb439b',1,'cdcprolific.h']]], ['plugged',['Plugged',['../_p_s3_enums_8h.html#a67a0db04d321a74b7e7fcfd3f1a3f70baff01ce39b42bec30132b0fc53c882387',1,'PS3Enums.h']]], ['plus',['PLUS',['../controller_enums_8h.html#a03bfec859eac87be20f8952c1eb89de0a87fe59ef12c3d13dc2a4d14c9b16c1f9',1,'controllerEnums.h']]], - ['poll',['Poll',['../class_a_d_k.html#af3784434ee6a1c6f3dc5b591f467e703',1,'ADK::Poll()'],['../class_b_t_d.html#a76e201c5b561e3a6d0405894ba5c2e41',1,'BTD::Poll()'],['../class_a_c_m.html#a79e4da2cae9145d895a6a1211a96fe36',1,'ACM::Poll()'],['../class_f_t_d_i.html#a5f383dd8eb114563194da011f1d613fd',1,'FTDI::Poll()'],['../class_h_i_d_boot.html#aa950fe6f7e492c2048f59c98a58ac005',1,'HIDBoot::Poll()'],['../class_h_i_d_universal.html#ac27e857a0d9619c8abc31be0b690c83c',1,'HIDUniversal::Poll()'],['../class_bulk_only.html#a51b8a76f5e16697476ce2dcff2514bc6',1,'BulkOnly::Poll()'],['../class_p_s3_u_s_b.html#a9068e2a036012614c0db163830cbcf00',1,'PS3USB::Poll()'],['../class_u_s_b_device_config.html#a4961e92df3e75c38e6953fb08b11f8b6',1,'USBDeviceConfig::Poll()'],['../class_u_s_b_hub.html#ae2d621225444f3186792617cecffbb1b',1,'USBHub::Poll()'],['../class_x_b_o_x_r_e_c_v.html#aafe1688ba3dc9b9ac425ebbbf001a1cc',1,'XBOXRECV::Poll()'],['../class_x_b_o_x_u_s_b.html#a2f4684fe0785e50de434d95f4336fa12',1,'XBOXUSB::Poll()']]], + ['poll',['Poll',['../class_a_d_k.html#af3784434ee6a1c6f3dc5b591f467e703',1,'ADK::Poll()'],['../class_b_t_d.html#a76e201c5b561e3a6d0405894ba5c2e41',1,'BTD::Poll()'],['../class_a_c_m.html#a79e4da2cae9145d895a6a1211a96fe36',1,'ACM::Poll()'],['../class_f_t_d_i.html#a5f383dd8eb114563194da011f1d613fd',1,'FTDI::Poll()'],['../class_h_i_d_boot.html#aa950fe6f7e492c2048f59c98a58ac005',1,'HIDBoot::Poll()'],['../class_h_i_d_universal.html#ac27e857a0d9619c8abc31be0b690c83c',1,'HIDUniversal::Poll()'],['../class_bulk_only.html#a51b8a76f5e16697476ce2dcff2514bc6',1,'BulkOnly::Poll()'],['../class_p_s3_u_s_b.html#a9068e2a036012614c0db163830cbcf00',1,'PS3USB::Poll()'],['../class_u_s_b_device_config.html#a893ea73deab98be837c257201e7da25a',1,'USBDeviceConfig::Poll()'],['../class_u_s_b_hub.html#ae2d621225444f3186792617cecffbb1b',1,'USBHub::Poll()'],['../class_x_b_o_x_r_e_c_v.html#aafe1688ba3dc9b9ac425ebbbf001a1cc',1,'XBOXRECV::Poll()'],['../class_x_b_o_x_u_s_b.html#a2f4684fe0785e50de434d95f4336fa12',1,'XBOXUSB::Poll()']]], ['port',['Port',['../class_t_pin.html#a5fec2c05b7fdbf314753b983beb7c79a',1,'TPin']]], ['portindicatorssupported',['PortIndicatorsSupported',['../struct_hub_descriptor.html#a6478c259c7397e89d50b42f6f3d4f4e4',1,'HubDescriptor']]], ['prevstate',['prevState',['../class_keyboard_report_parser.html#aea2971182f9022436206092132aead32',1,'KeyboardReportParser']]], diff --git a/search/all_72.js b/search/all_72.js index 44a20bfa..ca899055 100644 --- a/search/all_72.js +++ b/search/all_72.js @@ -17,7 +17,7 @@ var searchData= ['regrd',['regRd',['../class_m_a_x3421e.html#ae7faae82a8d68c38b43833b8fddcb8e8',1,'MAX3421e']]], ['regwr',['regWr',['../class_m_a_x3421e.html#a74e387200f57bc03152247d630c166aa',1,'MAX3421e']]], ['reladdr',['RelAddr',['../struct_inquiry_response.html#a64121510090cb38926bbb321e98b1a13',1,'InquiryResponse']]], - ['release',['Release',['../class_a_d_k.html#a7f64af34d7890f87ceab5d144f6c26ef',1,'ADK::Release()'],['../class_b_t_d.html#aa87c23bce56a20f2db47c6a40c8eda87',1,'BTD::Release()'],['../class_a_c_m.html#a768c0fd4ef7f5c52de9e5e7431685279',1,'ACM::Release()'],['../class_f_t_d_i.html#aadee262e2eda31deda790d5d10090b6f',1,'FTDI::Release()'],['../class_h_i_d_boot.html#aa21946ce7a4531c036180b5de2941502',1,'HIDBoot::Release()'],['../class_h_i_d_universal.html#af999fc50ef4b5dec0391bda79ec83bda',1,'HIDUniversal::Release()'],['../class_bulk_only.html#a8a9b213d1800db2d8e661d242b57b195',1,'BulkOnly::Release()'],['../class_p_s3_u_s_b.html#a5750c5448bf1ec73a7669ca2e4799c98',1,'PS3USB::Release()'],['../class_u_s_b_device_config.html#a74c06c5fe641b20faeeebd39e33248b3',1,'USBDeviceConfig::Release()'],['../class_u_s_b_hub.html#a3f0631a3bb6018319107af2fa2373fab',1,'USBHub::Release()'],['../class_x_b_o_x_r_e_c_v.html#ad0e6b53a818516b7d6af0beaa8cebc7a',1,'XBOXRECV::Release()'],['../class_x_b_o_x_u_s_b.html#a9a296b98b40f5a36d46297d98ef0f9b5',1,'XBOXUSB::Release()']]], + ['release',['Release',['../class_a_d_k.html#a7f64af34d7890f87ceab5d144f6c26ef',1,'ADK::Release()'],['../class_b_t_d.html#aa87c23bce56a20f2db47c6a40c8eda87',1,'BTD::Release()'],['../class_a_c_m.html#a768c0fd4ef7f5c52de9e5e7431685279',1,'ACM::Release()'],['../class_f_t_d_i.html#aadee262e2eda31deda790d5d10090b6f',1,'FTDI::Release()'],['../class_h_i_d_boot.html#aa21946ce7a4531c036180b5de2941502',1,'HIDBoot::Release()'],['../class_h_i_d_universal.html#af999fc50ef4b5dec0391bda79ec83bda',1,'HIDUniversal::Release()'],['../class_bulk_only.html#a8a9b213d1800db2d8e661d242b57b195',1,'BulkOnly::Release()'],['../class_p_s3_u_s_b.html#a5750c5448bf1ec73a7669ca2e4799c98',1,'PS3USB::Release()'],['../class_u_s_b_device_config.html#a61e301efedae55c6ac12c6cce154e432',1,'USBDeviceConfig::Release()'],['../class_u_s_b_hub.html#a3f0631a3bb6018319107af2fa2373fab',1,'USBHub::Release()'],['../class_x_b_o_x_r_e_c_v.html#ad0e6b53a818516b7d6af0beaa8cebc7a',1,'XBOXRECV::Release()'],['../class_x_b_o_x_u_s_b.html#a9a296b98b40f5a36d46297d98ef0f9b5',1,'XBOXUSB::Release()']]], ['releasedevice',['ReleaseDevice',['../class_u_s_b.html#ac681c6c98e1641f705bc14d670a2663a',1,'USB']]], ['remote_5fname',['remote_name',['../class_b_t_d.html#aede42d995c384c238fd49d728df01e4e',1,'BTD']]], ['removable',['Removable',['../struct_inquiry_response.html#ab6572ef8e5cd457e0699095f6a0c7a3d',1,'InquiryResponse']]], @@ -30,9 +30,10 @@ var searchData= ['reserved2',['Reserved2',['../struct_inquiry_response.html#abe5677b01f709411d446dfa6246ca110',1,'InquiryResponse']]], ['reserved3',['Reserved3',['../struct_inquiry_response.html#a3ee7e8654e1216110896e27c97125923',1,'InquiryResponse']]], ['reserved4',['Reserved4',['../struct_inquiry_response.html#ae5c315ca0c47104b17d5bde7c4d485a6',1,'InquiryResponse']]], - ['reset',['reset',['../class_m_a_x3421e.html#ad2b85831a551d8e30496882ce7e57fd2',1,'MAX3421e::reset()'],['../class_bluetooth_service.html#a1dff7caf251f1d8a5f358b368445cb48',1,'BluetoothService::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()']]], + ['reset',['Reset',['../class_bluetooth_service.html#a1dff7caf251f1d8a5f358b368445cb48',1,'BluetoothService::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()'],['../class_m_a_x3421e.html#ad2b85831a551d8e30496882ce7e57fd2',1,'MAX3421e::reset()']]], ['reset_5fdownstream_5fdata_5fpipe',['RESET_DOWNSTREAM_DATA_PIPE',['../cdcprolific_8h.html#a810fdf3da740b4c9e309cefb29f4eb3a',1,'cdcprolific.h']]], ['reset_5fupstream_5fdata_5fpipe',['RESET_UPSTREAM_DATA_PIPE',['../cdcprolific_8h.html#aea64b328d877a5eead187856dd28f847',1,'cdcprolific.h']]], + ['resethubport',['ResetHubPort',['../class_u_s_b_device_config.html#a12bb63558ded5bb6661bb173b07ff391',1,'USBDeviceConfig::ResetHubPort()'],['../class_u_s_b_hub.html#ae7e4c1e231ce7cb56bae1688c0e95e58',1,'USBHub::ResetHubPort()']]], ['resethubpremask',['ResetHubPreMask',['../class_u_s_b.html#a5b4de045ea7fefe0fab967ddf44c39b1',1,'USB']]], ['response_5favailable',['RESPONSE_AVAILABLE',['../cdcacm_8h.html#ac0ba0ade7f2d2a3b9c4cef90931e8237',1,'cdcacm.h']]], ['responsedataformat',['ResponseDataFormat',['../struct_inquiry_response.html#a801e10546dedbd134568bef84f1b287a',1,'InquiryResponse']]], diff --git a/search/all_76.js b/search/all_76.js index 6a9b5e01..cd5c596c 100644 --- a/search/all_76.js +++ b/search/all_76.js @@ -9,6 +9,7 @@ var searchData= ['vendor_5fwrite_5frequest_5ftype',['VENDOR_WRITE_REQUEST_TYPE',['../cdcprolific_8h.html#a242bbbe616270b5c01d3614dbe57fe45',1,'cdcprolific.h']]], ['vendorid',['VendorID',['../struct_inquiry_response.html#acc610ff84bef225f8826585725ad9802',1,'InquiryResponse']]], ['version',['Version',['../struct_inquiry_response.html#a86832a5def98c1e21447497177a8cc3a',1,'InquiryResponse']]], + ['vidpidok',['VIDPIDOK',['../class_u_s_b_device_config.html#a1cf695242e2e22893eea9c892282221b',1,'USBDeviceConfig']]], ['vrtitles0',['vrTitles0',['../class_report_desc_parser_base.html#a42d34a0a49f987c9dcfdd4fb8d42bf0d',1,'ReportDescParserBase']]], ['vrtitles1',['vrTitles1',['../class_report_desc_parser_base.html#a41af57cb0fb0bbed7277bcd04a9e9fe9',1,'ReportDescParserBase']]] ]; diff --git a/search/defines_64.js b/search/defines_64.js index a0c2429d..f3a5ada3 100644 --- a/search/defines_64.js +++ b/search/defines_64.js @@ -12,6 +12,7 @@ var searchData= ['dcr1_5finit_5fx',['DCR1_INIT_X',['../cdcprolific_8h.html#ae539702b1c81f50770d282c4ab425709',1,'cdcprolific.h']]], ['dcr2_5finit_5fh',['DCR2_INIT_H',['../cdcprolific_8h.html#af9f58d0a0dbcd375b60f17beba78cbca',1,'cdcprolific.h']]], ['dcr2_5finit_5fx',['DCR2_INIT_X',['../cdcprolific_8h.html#a195b68bbe6b9e565f2dc133c010f617f',1,'cdcprolific.h']]], + ['debug_5fusb_5fhost',['DEBUG_USB_HOST',['../message_8h.html#aded3b733d68d3c49e69a3b87db37028c',1,'message.h']]], ['default_5fauto',['DEFAULT_AUTO',['../cdcprolific_8h.html#acc570c15816dfccb107fa119c255dc26',1,'cdcprolific.h']]], ['default_5fnotify',['DEFAULT_NOTIFY',['../cdcprolific_8h.html#a858860d62527650b80da4ef4aaac1317',1,'cdcprolific.h']]], ['default_5fstate',['DEFAULT_STATE',['../cdcprolific_8h.html#af93d7c80faa6ebd086460cde2d5dd27e',1,'cdcprolific.h']]], diff --git a/search/defines_6e.js b/search/defines_6e.js index 23c9c599..155a85fc 100644 --- a/search/defines_6e.js +++ b/search/defines_6e.js @@ -1,14 +1,8 @@ var searchData= [ ['network_5fconnection',['NETWORK_CONNECTION',['../cdcacm_8h.html#a9e48b736a3dbd35ebbe8507b29dec86a',1,'cdcacm.h']]], - ['notify',['Notify',['../message_8h.html#a27117e124c5d66d5512fe8d494fe6338',1,'message.h']]], - ['notifyc',['Notifyc',['../message_8h.html#ab5d8177365493b21dbc092f6557bd508',1,'message.h']]], - ['notifyfail',['NotifyFail',['../message_8h.html#a22695bdc18ebde4a87dbe8633cb39593',1,'message.h']]], - ['notifyfailgetconfdescr',['NotifyFailGetConfDescr',['../message_8h.html#a38aabfb47a8bf743b0532e356c39faaf',1,'NotifyFailGetConfDescr(): message.h'],['../message_8h.html#a38aabfb47a8bf743b0532e356c39faaf',1,'NotifyFailGetConfDescr(): message.h']]], - ['notifyfailgetdevdescr',['NotifyFailGetDevDescr',['../message_8h.html#ae65e02f44cfdc490efd1b33f9882fbbd',1,'NotifyFailGetDevDescr(): message.h'],['../message_8h.html#ae65e02f44cfdc490efd1b33f9882fbbd',1,'NotifyFailGetDevDescr(): message.h']]], - ['notifyfailsetconfdescr',['NotifyFailSetConfDescr',['../message_8h.html#a03e4088aafca36fd7a4be69e3a22b601',1,'message.h']]], - ['notifyfailsetdevtblentry',['NotifyFailSetDevTblEntry',['../message_8h.html#a69619d86b1636f141c830ca82c7f45e7',1,'NotifyFailSetDevTblEntry(): message.h'],['../message_8h.html#a69619d86b1636f141c830ca82c7f45e7',1,'NotifyFailSetDevTblEntry(): message.h']]], - ['notifyfailunknowndevice',['NotifyFailUnknownDevice',['../message_8h.html#a0ce3a725ee65614d7f95cda10e4d2e91',1,'message.h']]], - ['notifystr',['NotifyStr',['../message_8h.html#aa41f0e761e43cb026f1c7f04f75fa24e',1,'message.h']]], + ['notify',['Notify',['../message_8h.html#a747819b0aa34f5c3ba0332c2db28c846',1,'message.h']]], + ['notifyc',['Notifyc',['../message_8h.html#a1cfb80dd289cf19d4d6c762e9891daf3',1,'message.h']]], + ['notifystr',['NotifyStr',['../message_8h.html#a89ba2ee6d833ac1f466a5e1326d13902',1,'message.h']]], ['nunchuck_5fconnected_5fflag',['nunchuck_connected_flag',['../_wii_8h.html#a7ae9154397104e4df34302ed0884bbfb',1,'Wii.h']]] ]; diff --git a/search/functions_64.js b/search/functions_64.js index d3919e2d..14b3ec76 100644 --- a/search/functions_64.js +++ b/search/functions_64.js @@ -1,6 +1,9 @@ var searchData= [ + ['d_5fprintbin',['D_PrintBin',['../printhex_8h.html#a1cfed3721d1a9d723e13613db4ebe82d',1,'printhex.h']]], + ['d_5fprinthex',['D_PrintHex',['../printhex_8h.html#a87dd4758587ab680b721b0bffde8c3b8',1,'printhex.h']]], ['defaultaddressing',['DefaultAddressing',['../class_u_s_b.html#a5eb0d31372d26f0015a0d7be0b9ff4e1',1,'USB']]], + ['devclassok',['DEVCLASSOK',['../class_bulk_only.html#a509fdebcff72a9c0c8db706416f5bf23',1,'BulkOnly::DEVCLASSOK()'],['../class_u_s_b_device_config.html#a7f13c42ed2c8e72e1f63562576ca82d2',1,'USBDeviceConfig::DEVCLASSOK()'],['../class_u_s_b_hub.html#adb0cf72e220cc16a87da685899dfb820',1,'USBHub::DEVCLASSOK()']]], ['disconnect',['disconnect',['../class_bluetooth_service.html#a66ee2f09c6087b82e3920c3d652a99b2',1,'BluetoothService::disconnect()'],['../class_b_t_d.html#a610183f9ddf04155ef2612d1839af7da',1,'BTD::disconnect()'],['../class_p_s3_b_t.html#a39ad8810c67e85eddc68c8a16d38a985',1,'PS3BT::disconnect()'],['../class_s_p_p.html#a2b4b1f85f553c6a2fdd523e50c75c7b0',1,'SPP::disconnect()'],['../class_w_i_i.html#aabe4780f258dada1c0564a4ac7607370',1,'WII::disconnect()']]], ['dispatchpkt',['dispatchPkt',['../class_u_s_b.html#a343d4b321cf8e99f0504cb04c7ce8b10',1,'USB']]], ['display',['display',['../class_max___l_c_d.html#a9eeefc04930595cc168129d159547124',1,'Max_LCD']]] diff --git a/search/functions_67.js b/search/functions_67.js index c2301ade..5f8a0298 100644 --- a/search/functions_67.js +++ b/search/functions_67.js @@ -1,7 +1,7 @@ var searchData= [ ['get9dofvalues',['get9DOFValues',['../class_p_s3_b_t.html#af9386c460169ea8f07e79c86a8938965',1,'PS3BT']]], - ['getaddress',['GetAddress',['../class_a_d_k.html#a1a972e8dc98b60ab27528db3af2618c3',1,'ADK::GetAddress()'],['../class_b_t_d.html#aecdd9d00fc9c12bb3677ed213a6687c3',1,'BTD::GetAddress()'],['../class_a_c_m.html#a7e0bb108012af9a99bb98aefca036d84',1,'ACM::GetAddress()'],['../class_f_t_d_i.html#ae224d7ea581e5df3b11416410a679086',1,'FTDI::GetAddress()'],['../class_h_i_d_boot.html#a6fafa2711d72ff4efd6bf91984585aba',1,'HIDBoot::GetAddress()'],['../class_h_i_d_universal.html#abcc6921b7beaf0aac2acbcdddd535626',1,'HIDUniversal::GetAddress()'],['../class_bulk_only.html#a376cb3367071555816e2b0c74ad7eb12',1,'BulkOnly::GetAddress()'],['../class_p_s3_u_s_b.html#a04b79c271ca14e1e095c6e305c672627',1,'PS3USB::GetAddress()'],['../class_u_s_b_device_config.html#aae3130517514c902bad5f153849b3811',1,'USBDeviceConfig::GetAddress()'],['../class_u_s_b_hub.html#af4052e34bdafa21db5376a3011778b99',1,'USBHub::GetAddress()'],['../class_x_b_o_x_r_e_c_v.html#a2d58b0a20eb804d853713ade83d01631',1,'XBOXRECV::GetAddress()'],['../class_x_b_o_x_u_s_b.html#a42c870e64582980634423248d64500b4',1,'XBOXUSB::GetAddress()']]], + ['getaddress',['GetAddress',['../class_a_d_k.html#a1a972e8dc98b60ab27528db3af2618c3',1,'ADK::GetAddress()'],['../class_b_t_d.html#aecdd9d00fc9c12bb3677ed213a6687c3',1,'BTD::GetAddress()'],['../class_a_c_m.html#a7e0bb108012af9a99bb98aefca036d84',1,'ACM::GetAddress()'],['../class_f_t_d_i.html#ae224d7ea581e5df3b11416410a679086',1,'FTDI::GetAddress()'],['../class_h_i_d_boot.html#a6fafa2711d72ff4efd6bf91984585aba',1,'HIDBoot::GetAddress()'],['../class_h_i_d_universal.html#abcc6921b7beaf0aac2acbcdddd535626',1,'HIDUniversal::GetAddress()'],['../class_bulk_only.html#a376cb3367071555816e2b0c74ad7eb12',1,'BulkOnly::GetAddress()'],['../class_p_s3_u_s_b.html#a04b79c271ca14e1e095c6e305c672627',1,'PS3USB::GetAddress()'],['../class_u_s_b_device_config.html#a2bfde6c290d32888a6f4e97fa1e222f1',1,'USBDeviceConfig::GetAddress()'],['../class_u_s_b_hub.html#af4052e34bdafa21db5376a3011778b99',1,'USBHub::GetAddress()'],['../class_x_b_o_x_r_e_c_v.html#a2d58b0a20eb804d853713ade83d01631',1,'XBOXRECV::GetAddress()'],['../class_x_b_o_x_u_s_b.html#a42c870e64582980634423248d64500b4',1,'XBOXUSB::GetAddress()']]], ['getaddresspool',['GetAddressPool',['../class_u_s_b.html#a66ab8f5eda239e761d5a48741ea1f9d4',1,'USB']]], ['getanalogbutton',['getAnalogButton',['../class_p_s3_b_t.html#a8c04e0e821dcbfb8825d4b31ab270f00',1,'PS3BT::getAnalogButton()'],['../class_p_s3_u_s_b.html#a2d30813a3f5c4729b5c1662832d5a6e0',1,'PS3USB::getAnalogButton()']]], ['getanaloghat',['getAnalogHat',['../class_p_s3_b_t.html#a9da5c045fafc3436dc2d2820cb234384',1,'PS3BT::getAnalogHat()'],['../class_p_s3_u_s_b.html#a2b0f391b8ae3e80b18cf9108c3e8f7e3',1,'PS3USB::getAnalogHat()'],['../class_w_i_i.html#ab16e907132354be9848fd91a6a5171db',1,'WII::getAnalogHat(Hat a)'],['../class_w_i_i.html#ab684ac791f235aed4d5ccf485081c075',1,'WII::getAnalogHat(AnalogHat a)'],['../class_x_b_o_x_r_e_c_v.html#aef2c97b6f1d6eba631477f2d6c9f6de5',1,'XBOXRECV::getAnalogHat()'],['../class_x_b_o_x_u_s_b.html#a7fcef8741de99d56f3a4d7fad9f954ff',1,'XBOXUSB::getAnalogHat()']]], diff --git a/search/functions_69.js b/search/functions_69.js index f477979b..ae637258 100644 --- a/search/functions_69.js +++ b/search/functions_69.js @@ -1,6 +1,6 @@ var searchData= [ - ['init',['Init',['../class_a_d_k.html#a8c5c2e212c748966ccd863499d202063',1,'ADK::Init()'],['../class_b_t_d.html#a48608619d8253972dd132edbb3001c5f',1,'BTD::Init()'],['../class_a_c_m.html#ad3210651d58c77d3ded4b4b83a9476b7',1,'ACM::Init()'],['../class_f_t_d_i.html#a2d40115414dadfee8c284e0f5d397621',1,'FTDI::Init()'],['../class_p_l2303.html#a23c849fb504c1fe6f46c84d04c0a47cf',1,'PL2303::Init()'],['../class_h_i_d_boot.html#aa30d7cf292378153f41d8a13380c6119',1,'HIDBoot::Init()'],['../class_h_i_d_universal.html#a384b0e219f763e2d6407636bfd4ccea7',1,'HIDUniversal::Init()'],['../class_bulk_only.html#a51870da9badc037166b86da60bcda6ea',1,'BulkOnly::Init()'],['../class_p_s3_u_s_b.html#a0083545cb99fb8786e60281fe7a9050d',1,'PS3USB::Init()'],['../class_u_s_b_device_config.html#a391dc824a3271671890cebeb829b35ed',1,'USBDeviceConfig::Init()'],['../class_m_a_x3421e.html#a8414e5a161ca272e435b9ab7f5db92ea',1,'MAX3421e::Init()'],['../class_u_s_b_hub.html#ab2b2e257556e3d59f9258dd84d6f636e',1,'USBHub::Init()'],['../class_x_b_o_x_r_e_c_v.html#a07de216bf16a83501d74463c00bf1fc8',1,'XBOXRECV::Init()'],['../class_x_b_o_x_u_s_b.html#a9d2ad06354787bc252058bb28015b56e',1,'XBOXUSB::Init()'],['../class_max___l_c_d.html#a3205e9a432c808422867c1398d665247',1,'Max_LCD::init()'],['../class_s_pi.html#ad26219fa147c50cd1cac105a235ee997',1,'SPi::init()']]], + ['init',['init',['../class_max___l_c_d.html#a3205e9a432c808422867c1398d665247',1,'Max_LCD::init()'],['../class_s_pi.html#ad26219fa147c50cd1cac105a235ee997',1,'SPi::init()'],['../class_a_d_k.html#a8c5c2e212c748966ccd863499d202063',1,'ADK::Init()'],['../class_b_t_d.html#a48608619d8253972dd132edbb3001c5f',1,'BTD::Init()'],['../class_a_c_m.html#ad3210651d58c77d3ded4b4b83a9476b7',1,'ACM::Init()'],['../class_f_t_d_i.html#a2d40115414dadfee8c284e0f5d397621',1,'FTDI::Init()'],['../class_p_l2303.html#a23c849fb504c1fe6f46c84d04c0a47cf',1,'PL2303::Init()'],['../class_h_i_d_boot.html#aa30d7cf292378153f41d8a13380c6119',1,'HIDBoot::Init()'],['../class_h_i_d_universal.html#a384b0e219f763e2d6407636bfd4ccea7',1,'HIDUniversal::Init()'],['../class_bulk_only.html#a51870da9badc037166b86da60bcda6ea',1,'BulkOnly::Init()'],['../class_p_s3_u_s_b.html#a0083545cb99fb8786e60281fe7a9050d',1,'PS3USB::Init()'],['../class_u_s_b_device_config.html#a3706cf6b18785aff823171e280bab738',1,'USBDeviceConfig::Init()'],['../class_m_a_x3421e.html#a8414e5a161ca272e435b9ab7f5db92ea',1,'MAX3421e::Init()'],['../class_u_s_b_hub.html#ab2b2e257556e3d59f9258dd84d6f636e',1,'USBHub::Init()'],['../class_x_b_o_x_r_e_c_v.html#a07de216bf16a83501d74463c00bf1fc8',1,'XBOXRECV::Init()'],['../class_x_b_o_x_u_s_b.html#a9d2ad06354787bc252058bb28015b56e',1,'XBOXUSB::Init()']]], ['initialize',['Initialize',['../class_hex_dumper.html#accd2712258f54a8072eae3d2ad8cceba',1,'HexDumper::Initialize()'],['../class_multi_byte_value_parser.html#a9bd52b4e180d68dbb8f97c059250f4c3',1,'MultiByteValueParser::Initialize()'],['../class_byte_skipper.html#a274a09686d5535e11961d2ccf38ffa08',1,'ByteSkipper::Initialize()'],['../class_p_t_p_list_parser.html#a18f6c785d1ddb51d7e158810644079b7',1,'PTPListParser::Initialize()']]], ['inthandler',['IntHandler',['../class_m_a_x3421e.html#a6da568ef3f5a7188d94f0287f6e7ad3a',1,'MAX3421e']]], ['intransfer',['inTransfer',['../class_u_s_b.html#ad75d64f648b102fab2bd75e53e1324a4',1,'USB']]], diff --git a/search/functions_6e.js b/search/functions_6e.js index c7240df6..faf13dff 100644 --- a/search/functions_6e.js +++ b/search/functions_6e.js @@ -3,5 +3,11 @@ var searchData= ['noautoscroll',['noAutoscroll',['../class_max___l_c_d.html#a4c8f565edc600b24b30533756e5a48e7',1,'Max_LCD']]], ['noblink',['noBlink',['../class_max___l_c_d.html#a2469e6d8f2959728b35f04eacb23cd29',1,'Max_LCD']]], ['nocursor',['noCursor',['../class_max___l_c_d.html#acafae0286b5fb7790f5694d17c1af85d',1,'Max_LCD']]], - ['nodisplay',['noDisplay',['../class_max___l_c_d.html#ab865f37d0df98270e5ea3c4fb0f28a80',1,'Max_LCD']]] + ['nodisplay',['noDisplay',['../class_max___l_c_d.html#ab865f37d0df98270e5ea3c4fb0f28a80',1,'Max_LCD']]], + ['notifyfail',['NotifyFail',['../message_8cpp.html#a5ae2cb9bf877595104f2425f50e2057f',1,'NotifyFail(uint8_t rcode): message.cpp'],['../message_8h.html#a5ae2cb9bf877595104f2425f50e2057f',1,'NotifyFail(uint8_t rcode): message.cpp']]], + ['notifyfailgetconfdescr',['NotifyFailGetConfDescr',['../message_8cpp.html#a8990b7c46c3f20489c3f205fa173f110',1,'NotifyFailGetConfDescr(void): message.cpp'],['../message_8cpp.html#ab3a7edeb63265b6f362a5f26cc033d7d',1,'NotifyFailGetConfDescr(uint8_t reason): message.cpp'],['../message_8h.html#ab3a7edeb63265b6f362a5f26cc033d7d',1,'NotifyFailGetConfDescr(uint8_t reason): message.cpp'],['../message_8h.html#a8990b7c46c3f20489c3f205fa173f110',1,'NotifyFailGetConfDescr(void): message.cpp']]], + ['notifyfailgetdevdescr',['NotifyFailGetDevDescr',['../message_8cpp.html#ace40a5d826a882de0c5a25aece111d3f',1,'NotifyFailGetDevDescr(void): message.cpp'],['../message_8cpp.html#a2727e613ef57acf8d906d6250d084ae1',1,'NotifyFailGetDevDescr(uint8_t reason): message.cpp'],['../message_8h.html#a2727e613ef57acf8d906d6250d084ae1',1,'NotifyFailGetDevDescr(uint8_t reason): message.cpp'],['../message_8h.html#ace40a5d826a882de0c5a25aece111d3f',1,'NotifyFailGetDevDescr(void): message.cpp']]], + ['notifyfailsetconfdescr',['NotifyFailSetConfDescr',['../message_8cpp.html#a08b840c377ca6f8154d6924d51338d89',1,'NotifyFailSetConfDescr(void): message.cpp'],['../message_8h.html#a08b840c377ca6f8154d6924d51338d89',1,'NotifyFailSetConfDescr(void): message.cpp']]], + ['notifyfailsetdevtblentry',['NotifyFailSetDevTblEntry',['../message_8cpp.html#aa65008f9251787149e391f89e68b32be',1,'NotifyFailSetDevTblEntry(void): message.cpp'],['../message_8cpp.html#a39ba2835e6dca2d85d8cd2174292458d',1,'NotifyFailSetDevTblEntry(uint8_t reason): message.cpp'],['../message_8h.html#a39ba2835e6dca2d85d8cd2174292458d',1,'NotifyFailSetDevTblEntry(uint8_t reason): message.cpp'],['../message_8h.html#aa65008f9251787149e391f89e68b32be',1,'NotifyFailSetDevTblEntry(void): message.cpp']]], + ['notifyfailunknowndevice',['NotifyFailUnknownDevice',['../message_8cpp.html#a7103129ed2b7b7896461c0a3cd924eb4',1,'NotifyFailUnknownDevice(uint16_t VID, uint16_t PID): message.cpp'],['../message_8h.html#a7103129ed2b7b7896461c0a3cd924eb4',1,'NotifyFailUnknownDevice(uint16_t VID, uint16_t PID): message.cpp']]] ]; diff --git a/search/functions_70.js b/search/functions_70.js index b5ecbd45..41d46979 100644 --- a/search/functions_70.js +++ b/search/functions_70.js @@ -6,7 +6,7 @@ var searchData= ['parseitem',['ParseItem',['../class_report_desc_parser_base.html#ac1d6c015d9a2527bb2044e9a96fcaaf9',1,'ReportDescParserBase::ParseItem()'],['../class_report_desc_parser2.html#a84242b62a5d202b5d2d6fe26809bc0e2',1,'ReportDescParser2::ParseItem()']]], ['peek',['peek',['../class_s_p_p.html#a3149d75ba4646ba5b5428c465e983144',1,'SPP']]], ['pl2303',['PL2303',['../class_p_l2303.html#ab3dfad9e451152abbdab4856accbb80c',1,'PL2303']]], - ['poll',['Poll',['../class_a_d_k.html#af3784434ee6a1c6f3dc5b591f467e703',1,'ADK::Poll()'],['../class_b_t_d.html#a76e201c5b561e3a6d0405894ba5c2e41',1,'BTD::Poll()'],['../class_a_c_m.html#a79e4da2cae9145d895a6a1211a96fe36',1,'ACM::Poll()'],['../class_f_t_d_i.html#a5f383dd8eb114563194da011f1d613fd',1,'FTDI::Poll()'],['../class_h_i_d_boot.html#aa950fe6f7e492c2048f59c98a58ac005',1,'HIDBoot::Poll()'],['../class_h_i_d_universal.html#ac27e857a0d9619c8abc31be0b690c83c',1,'HIDUniversal::Poll()'],['../class_bulk_only.html#a51b8a76f5e16697476ce2dcff2514bc6',1,'BulkOnly::Poll()'],['../class_p_s3_u_s_b.html#a9068e2a036012614c0db163830cbcf00',1,'PS3USB::Poll()'],['../class_u_s_b_device_config.html#a4961e92df3e75c38e6953fb08b11f8b6',1,'USBDeviceConfig::Poll()'],['../class_u_s_b_hub.html#ae2d621225444f3186792617cecffbb1b',1,'USBHub::Poll()'],['../class_x_b_o_x_r_e_c_v.html#aafe1688ba3dc9b9ac425ebbbf001a1cc',1,'XBOXRECV::Poll()'],['../class_x_b_o_x_u_s_b.html#a2f4684fe0785e50de434d95f4336fa12',1,'XBOXUSB::Poll()']]], + ['poll',['Poll',['../class_a_d_k.html#af3784434ee6a1c6f3dc5b591f467e703',1,'ADK::Poll()'],['../class_b_t_d.html#a76e201c5b561e3a6d0405894ba5c2e41',1,'BTD::Poll()'],['../class_a_c_m.html#a79e4da2cae9145d895a6a1211a96fe36',1,'ACM::Poll()'],['../class_f_t_d_i.html#a5f383dd8eb114563194da011f1d613fd',1,'FTDI::Poll()'],['../class_h_i_d_boot.html#aa950fe6f7e492c2048f59c98a58ac005',1,'HIDBoot::Poll()'],['../class_h_i_d_universal.html#ac27e857a0d9619c8abc31be0b690c83c',1,'HIDUniversal::Poll()'],['../class_bulk_only.html#a51b8a76f5e16697476ce2dcff2514bc6',1,'BulkOnly::Poll()'],['../class_p_s3_u_s_b.html#a9068e2a036012614c0db163830cbcf00',1,'PS3USB::Poll()'],['../class_u_s_b_device_config.html#a893ea73deab98be837c257201e7da25a',1,'USBDeviceConfig::Poll()'],['../class_u_s_b_hub.html#ae2d621225444f3186792617cecffbb1b',1,'USBHub::Poll()'],['../class_x_b_o_x_r_e_c_v.html#aafe1688ba3dc9b9ac425ebbbf001a1cc',1,'XBOXRECV::Poll()'],['../class_x_b_o_x_u_s_b.html#a2f4684fe0785e50de434d95f4336fa12',1,'XBOXUSB::Poll()']]], ['printalphanumdisplaypageusage',['PrintAlphanumDisplayPageUsage',['../class_report_desc_parser_base.html#af2d133ba2b6b7d5ac3c0db3ffac531d0',1,'ReportDescParserBase']]], ['printbin',['PrintBin',['../printhex_8h.html#a802fc671eccc3eb6f8e8255f43c997ac',1,'printhex.h']]], ['printbuttonpageusage',['PrintButtonPageUsage',['../class_report_desc_parser_base.html#a928f2b689012051dfe20e46bd7b21ed3',1,'ReportDescParserBase']]], diff --git a/search/functions_72.js b/search/functions_72.js index 8f6f73ef..7387ecd2 100644 --- a/search/functions_72.js +++ b/search/functions_72.js @@ -7,11 +7,12 @@ var searchData= ['registerserviceclass',['registerServiceClass',['../class_b_t_d.html#a4adfc7e51ad3b3c03e7c37d1af159e73',1,'BTD']]], ['regrd',['regRd',['../class_m_a_x3421e.html#ae7faae82a8d68c38b43833b8fddcb8e8',1,'MAX3421e']]], ['regwr',['regWr',['../class_m_a_x3421e.html#a74e387200f57bc03152247d630c166aa',1,'MAX3421e']]], - ['release',['Release',['../class_a_d_k.html#a7f64af34d7890f87ceab5d144f6c26ef',1,'ADK::Release()'],['../class_b_t_d.html#aa87c23bce56a20f2db47c6a40c8eda87',1,'BTD::Release()'],['../class_a_c_m.html#a768c0fd4ef7f5c52de9e5e7431685279',1,'ACM::Release()'],['../class_f_t_d_i.html#aadee262e2eda31deda790d5d10090b6f',1,'FTDI::Release()'],['../class_h_i_d_boot.html#aa21946ce7a4531c036180b5de2941502',1,'HIDBoot::Release()'],['../class_h_i_d_universal.html#af999fc50ef4b5dec0391bda79ec83bda',1,'HIDUniversal::Release()'],['../class_bulk_only.html#a8a9b213d1800db2d8e661d242b57b195',1,'BulkOnly::Release()'],['../class_p_s3_u_s_b.html#a5750c5448bf1ec73a7669ca2e4799c98',1,'PS3USB::Release()'],['../class_u_s_b_device_config.html#a74c06c5fe641b20faeeebd39e33248b3',1,'USBDeviceConfig::Release()'],['../class_u_s_b_hub.html#a3f0631a3bb6018319107af2fa2373fab',1,'USBHub::Release()'],['../class_x_b_o_x_r_e_c_v.html#ad0e6b53a818516b7d6af0beaa8cebc7a',1,'XBOXRECV::Release()'],['../class_x_b_o_x_u_s_b.html#a9a296b98b40f5a36d46297d98ef0f9b5',1,'XBOXUSB::Release()']]], + ['release',['Release',['../class_a_d_k.html#a7f64af34d7890f87ceab5d144f6c26ef',1,'ADK::Release()'],['../class_b_t_d.html#aa87c23bce56a20f2db47c6a40c8eda87',1,'BTD::Release()'],['../class_a_c_m.html#a768c0fd4ef7f5c52de9e5e7431685279',1,'ACM::Release()'],['../class_f_t_d_i.html#aadee262e2eda31deda790d5d10090b6f',1,'FTDI::Release()'],['../class_h_i_d_boot.html#aa21946ce7a4531c036180b5de2941502',1,'HIDBoot::Release()'],['../class_h_i_d_universal.html#af999fc50ef4b5dec0391bda79ec83bda',1,'HIDUniversal::Release()'],['../class_bulk_only.html#a8a9b213d1800db2d8e661d242b57b195',1,'BulkOnly::Release()'],['../class_p_s3_u_s_b.html#a5750c5448bf1ec73a7669ca2e4799c98',1,'PS3USB::Release()'],['../class_u_s_b_device_config.html#a61e301efedae55c6ac12c6cce154e432',1,'USBDeviceConfig::Release()'],['../class_u_s_b_hub.html#a3f0631a3bb6018319107af2fa2373fab',1,'USBHub::Release()'],['../class_x_b_o_x_r_e_c_v.html#ad0e6b53a818516b7d6af0beaa8cebc7a',1,'XBOXRECV::Release()'],['../class_x_b_o_x_u_s_b.html#a9a296b98b40f5a36d46297d98ef0f9b5',1,'XBOXUSB::Release()']]], ['releasedevice',['ReleaseDevice',['../class_u_s_b.html#ac681c6c98e1641f705bc14d670a2663a',1,'USB']]], ['reportdescparser2',['ReportDescParser2',['../class_report_desc_parser2.html#a6ee7a47ffbc5c2905506c10039fcfaff',1,'ReportDescParser2']]], ['reportdescparserbase',['ReportDescParserBase',['../class_report_desc_parser_base.html#a607a81ff9d8f282298533a1dbf10f8e1',1,'ReportDescParserBase']]], - ['reset',['reset',['../class_m_a_x3421e.html#ad2b85831a551d8e30496882ce7e57fd2',1,'MAX3421e::reset()'],['../class_bluetooth_service.html#a1dff7caf251f1d8a5f358b368445cb48',1,'BluetoothService::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()']]], + ['reset',['Reset',['../class_bluetooth_service.html#a1dff7caf251f1d8a5f358b368445cb48',1,'BluetoothService::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()'],['../class_m_a_x3421e.html#ad2b85831a551d8e30496882ce7e57fd2',1,'MAX3421e::reset()']]], + ['resethubport',['ResetHubPort',['../class_u_s_b_device_config.html#a12bb63558ded5bb6661bb173b07ff391',1,'USBDeviceConfig::ResetHubPort()'],['../class_u_s_b_hub.html#ae7e4c1e231ce7cb56bae1688c0e95e58',1,'USBHub::ResetHubPort()']]], ['resethubpremask',['ResetHubPreMask',['../class_u_s_b.html#a5b4de045ea7fefe0fab967ddf44c39b1',1,'USB']]], ['righttoleft',['rightToLeft',['../class_max___l_c_d.html#ae650324be4a0e07fd63b90c686e14f03',1,'Max_LCD']]], ['run',['Run',['../class_bluetooth_service.html#a680692ff13cb37eb81ddbb74bc9e0383',1,'BluetoothService::Run()'],['../class_p_s3_b_t.html#ab41f25f45573239990f68611dc825086',1,'PS3BT::Run()'],['../class_s_p_p.html#a2de67ee7ad1be9d2f3daf7dc08dc5f90',1,'SPP::Run()'],['../class_w_i_i.html#ac5cd06f3e9aa2a0d9b9691f00c047e72',1,'WII::Run()']]] diff --git a/search/functions_76.html b/search/functions_76.html new file mode 100644 index 00000000..624bc1db --- /dev/null +++ b/search/functions_76.html @@ -0,0 +1,26 @@ + + + + + + + + + +
    +
    Loading...
    +
    + +
    Searching...
    +
    No Matches
    + +
    + + diff --git a/search/functions_76.js b/search/functions_76.js new file mode 100644 index 00000000..c8e59548 --- /dev/null +++ b/search/functions_76.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['vidpidok',['VIDPIDOK',['../class_u_s_b_device_config.html#a1cf695242e2e22893eea9c892282221b',1,'USBDeviceConfig']]] +]; diff --git a/search/search.js b/search/search.js index b0cc7ca1..86d1d3a7 100644 --- a/search/search.js +++ b/search/search.js @@ -10,7 +10,7 @@ var indexSectionsWithContent = 0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 1: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111011011011100101111011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111000010000100101101011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111111111011111101111011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111111111011111101111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111110111011111111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000100100011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 6: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111000010001000101110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", diff --git a/struct_s_e_t_u_p___p_k_t.html b/struct_s_e_t_u_p___p_k_t.html index f13f5594..17700ad0 100644 --- a/struct_s_e_t_u_p___p_k_t.html +++ b/struct_s_e_t_u_p___p_k_t.html @@ -130,7 +130,7 @@ Public Attributes

    Detailed Description

    -

    Definition at line 152 of file Usb.h.

    +

    Definition at line 155 of file Usb.h.

    Member Data Documentation

    @@ -142,7 +142,7 @@ Public Attributes
    -

    Definition at line 155 of file Usb.h.

    +

    Definition at line 158 of file Usb.h.

    @@ -156,7 +156,7 @@ Public Attributes
    -

    Definition at line 158 of file Usb.h.

    +

    Definition at line 161 of file Usb.h.

    @@ -170,7 +170,7 @@ Public Attributes
    -

    Definition at line 159 of file Usb.h.

    +

    Definition at line 162 of file Usb.h.

    @@ -184,7 +184,7 @@ Public Attributes
    -

    Definition at line 160 of file Usb.h.

    +

    Definition at line 163 of file Usb.h.

    @@ -210,7 +210,7 @@ Public Attributes
    -

    Definition at line 163 of file Usb.h.

    +

    Definition at line 166 of file Usb.h.

    @@ -224,7 +224,7 @@ Public Attributes
    -

    Definition at line 166 of file Usb.h.

    +

    Definition at line 169 of file Usb.h.

    @@ -238,7 +238,7 @@ Public Attributes
    -

    Definition at line 169 of file Usb.h.

    +

    Definition at line 172 of file Usb.h.

    @@ -252,7 +252,7 @@ Public Attributes
    -

    Definition at line 170 of file Usb.h.

    +

    Definition at line 173 of file Usb.h.

    @@ -278,7 +278,7 @@ Public Attributes
    -

    Definition at line 173 of file Usb.h.

    +

    Definition at line 176 of file Usb.h.

    @@ -292,7 +292,7 @@ Public Attributes
    -

    Definition at line 174 of file Usb.h.

    +

    Definition at line 177 of file Usb.h.

    diff --git a/usbhub_8cpp.html b/usbhub_8cpp.html index e6b25f47..2b032069 100644 --- a/usbhub_8cpp.html +++ b/usbhub_8cpp.html @@ -144,7 +144,7 @@ Functions
    -

    Definition at line 346 of file usbhub.cpp.

    +

    Definition at line 372 of file usbhub.cpp.

    diff --git a/usbhub_8cpp_source.html b/usbhub_8cpp_source.html index 49caf618..e170d397 100644 --- a/usbhub_8cpp_source.html +++ b/usbhub_8cpp_source.html @@ -113,7 +113,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    22 pUsb(p),
    23 bAddress(0),
    24 bNbrPorts(0),
    -
    25 bInitState(0),
    +
    25 //bInitState(0),
    26 qNextPollTime(0),
    27 bPollEnable(false) {
    28  epInfo[0].epAddr = 0;
    @@ -138,352 +138,378 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    47  uint8_t len = 0;
    48  uint16_t cd_len = 0;
    49 
    -
    50  //USBTRACE("\r\nHub Init Start");
    -
    51 
    -
    52  AddressPool &addrPool = pUsb->GetAddressPool();
    -
    53 
    -
    54  switch (bInitState) {
    -
    55  case 0:
    -
    56  if (bAddress)
    -
    57  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
    -
    58 
    -
    59  // Get pointer to pseudo device with address 0 assigned
    -
    60  p = addrPool.GetUsbDevicePtr(0);
    -
    61 
    -
    62  if (!p)
    -
    63  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
    -
    64 
    -
    65  if (!p->epinfo)
    -
    66  return USB_ERROR_EPINFO_IS_NULL;
    -
    67 
    -
    68  // Save old pointer to EP_RECORD of address 0
    -
    69  oldep_ptr = p->epinfo;
    -
    70 
    -
    71  // Temporary assign new pointer to epInfo to p->epinfo in order to avoid toggle inconsistence
    -
    72  p->epinfo = epInfo;
    -
    73 
    -
    74  p->lowspeed = lowspeed;
    -
    75 
    -
    76  // Get device descriptor
    -
    77  rcode = pUsb->getDevDescr(0, 0, 8, (uint8_t*)buf);
    -
    78 
    -
    79  p->lowspeed = false;
    -
    80 
    -
    81  if (!rcode)
    -
    82  len = (buf[0] > 32) ? 32 : buf[0];
    -
    83 
    -
    84  if (rcode) {
    -
    85  // Restore p->epinfo
    -
    86  p->epinfo = oldep_ptr;
    -
    87  return rcode;
    -
    88  }
    -
    89 
    -
    90  // Extract device class from device descriptor
    -
    91  // If device class is not a hub return
    -
    92  if (((USB_DEVICE_DESCRIPTOR*)buf)->bDeviceClass != 0x09)
    -
    93  return USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
    -
    94 
    -
    95  // Allocate new address according to device class
    -
    96  bAddress = addrPool.AllocAddress(parent, (((USB_DEVICE_DESCRIPTOR*)buf)->bDeviceClass == 0x09) ? true : false, port);
    -
    97 
    -
    98  if (!bAddress)
    -
    99  return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
    -
    100 
    -
    101  // Extract Max Packet Size from the device descriptor
    -
    102  epInfo[0].maxPktSize = ((USB_DEVICE_DESCRIPTOR*)buf)->bMaxPacketSize0;
    -
    103 
    -
    104  // Assign new address to the device
    -
    105  rcode = pUsb->setAddr(0, 0, bAddress);
    -
    106 
    -
    107  if (rcode) {
    -
    108  // Restore p->epinfo
    -
    109  p->epinfo = oldep_ptr;
    -
    110  addrPool.FreeAddress(bAddress);
    -
    111  bAddress = 0;
    -
    112  return rcode;
    -
    113  }
    -
    114 
    -
    115  //USBTRACE2("\r\nHub address: ", bAddress );
    -
    116 
    -
    117  // Restore p->epinfo
    -
    118  p->epinfo = oldep_ptr;
    -
    119 
    -
    120  if (len)
    -
    121  rcode = pUsb->getDevDescr(bAddress, 0, len, (uint8_t*)buf);
    -
    122 
    -
    123  if (rcode)
    -
    124  goto FailGetDevDescr;
    -
    125 
    -
    126  // Assign epInfo to epinfo pointer
    -
    127  rcode = pUsb->setEpInfoEntry(bAddress, 2, epInfo);
    -
    128 
    -
    129  if (rcode)
    -
    130  goto FailSetDevTblEntry;
    -
    131 
    -
    132  bInitState = 1;
    -
    133 
    -
    134  case 1:
    -
    135  // Get hub descriptor
    -
    136  rcode = GetHubDescriptor(0, 8, buf);
    -
    137 
    -
    138  if (rcode)
    -
    139  goto FailGetHubDescr;
    -
    140 
    -
    141  // Save number of ports for future use
    -
    142  bNbrPorts = ((HubDescriptor*)buf)->bNbrPorts;
    -
    143 
    -
    144  bInitState = 2;
    -
    145 
    -
    146  case 2:
    -
    147  // Read configuration Descriptor in Order To Obtain Proper Configuration Value
    -
    148  rcode = pUsb->getConfDescr(bAddress, 0, 8, 0, buf);
    -
    149 
    -
    150  if (!rcode) {
    -
    151  cd_len = ((USB_CONFIGURATION_DESCRIPTOR*)buf)->wTotalLength;
    -
    152  rcode = pUsb->getConfDescr(bAddress, 0, cd_len, 0, buf);
    -
    153  }
    -
    154  if (rcode)
    -
    155  goto FailGetConfDescr;
    -
    156 
    -
    157  // The following code is of no practical use in real life applications.
    -
    158  // It only intended for the usb protocol sniffer to properly parse hub-class requests.
    -
    159  {
    -
    160  uint8_t buf2[24];
    -
    161 
    -
    162  rcode = pUsb->getConfDescr(bAddress, 0, buf[0], 0, buf2);
    -
    163 
    -
    164  if (rcode)
    -
    165  goto FailGetConfDescr;
    -
    166  }
    -
    167 
    -
    168  // Set Configuration Value
    -
    169  rcode = pUsb->setConf(bAddress, 0, buf[5]);
    -
    170 
    -
    171  if (rcode)
    -
    172  goto FailSetConfDescr;
    -
    173 
    -
    174  bInitState = 3;
    -
    175 
    -
    176  case 3:
    -
    177  // Power on all ports
    -
    178  for (uint8_t j = 1; j <= bNbrPorts; j++)
    -
    179  SetPortFeature(HUB_FEATURE_PORT_POWER, j, 0); //HubPortPowerOn(j);
    -
    180 
    -
    181  pUsb->SetHubPreMask();
    -
    182  bPollEnable = true;
    -
    183  bInitState = 0;
    -
    184  }
    -
    185  bInitState = 0;
    -
    186  return 0;
    -
    187 
    -
    188 // Oleg, No debugging?? -- xxxajk
    -
    189 FailGetDevDescr:
    -
    190  goto Fail;
    -
    191 
    -
    192 FailSetDevTblEntry:
    -
    193  goto Fail;
    -
    194 
    -
    195 FailGetHubDescr:
    -
    196  goto Fail;
    -
    197 
    -
    198 FailGetConfDescr:
    -
    199  goto Fail;
    -
    200 
    -
    201 FailSetConfDescr:
    -
    202  goto Fail;
    -
    203 
    -
    204 Fail:
    -
    205  return rcode;
    -
    206 }
    -
    207 
    -
    208 uint8_t USBHub::Release() {
    -
    209  pUsb->GetAddressPool().FreeAddress(bAddress);
    +
    50  //USBTRACE("\r\nHub Init Start ");
    +
    51  //D_PrintHex<uint8_t > (bInitState, 0x80);
    +
    52 
    +
    53  AddressPool &addrPool = pUsb->GetAddressPool();
    +
    54 
    +
    55  //switch (bInitState) {
    +
    56  // case 0:
    +
    57  if (bAddress)
    +
    58  return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
    +
    59 
    +
    60  // Get pointer to pseudo device with address 0 assigned
    +
    61  p = addrPool.GetUsbDevicePtr(0);
    +
    62 
    +
    63  if (!p)
    +
    64  return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
    +
    65 
    +
    66  if (!p->epinfo)
    +
    67  return USB_ERROR_EPINFO_IS_NULL;
    +
    68 
    +
    69  // Save old pointer to EP_RECORD of address 0
    +
    70  oldep_ptr = p->epinfo;
    +
    71 
    +
    72  // Temporary assign new pointer to epInfo to p->epinfo in order to avoid toggle inconsistence
    +
    73  p->epinfo = epInfo;
    +
    74 
    +
    75  p->lowspeed = lowspeed;
    +
    76 
    +
    77  // Get device descriptor
    +
    78  rcode = pUsb->getDevDescr(0, 0, 8, (uint8_t*)buf);
    +
    79 
    +
    80  p->lowspeed = false;
    +
    81 
    +
    82  if (!rcode)
    +
    83  len = (buf[0] > 32) ? 32 : buf[0];
    +
    84 
    +
    85  if (rcode) {
    +
    86  // Restore p->epinfo
    +
    87  p->epinfo = oldep_ptr;
    +
    88  return rcode;
    +
    89  }
    +
    90 
    +
    91  // Extract device class from device descriptor
    +
    92  // If device class is not a hub return
    +
    93  if (((USB_DEVICE_DESCRIPTOR*)buf)->bDeviceClass != 0x09)
    +
    94  return USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
    +
    95 
    +
    96  // Allocate new address according to device class
    +
    97  bAddress = addrPool.AllocAddress(parent, (((USB_DEVICE_DESCRIPTOR*)buf)->bDeviceClass == 0x09) ? true : false, port);
    +
    98 
    +
    99  if (!bAddress)
    +
    100  return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
    +
    101 
    +
    102  // Extract Max Packet Size from the device descriptor
    +
    103  epInfo[0].maxPktSize = ((USB_DEVICE_DESCRIPTOR*)buf)->bMaxPacketSize0;
    +
    104 
    +
    105  // Assign new address to the device
    +
    106  rcode = pUsb->setAddr(0, 0, bAddress);
    +
    107 
    +
    108  if (rcode) {
    +
    109  // Restore p->epinfo
    +
    110  p->epinfo = oldep_ptr;
    +
    111  addrPool.FreeAddress(bAddress);
    +
    112  bAddress = 0;
    +
    113  return rcode;
    +
    114  }
    +
    115 
    +
    116  //USBTRACE2("\r\nHub address: ", bAddress );
    +
    117 
    +
    118  // Restore p->epinfo
    +
    119  p->epinfo = oldep_ptr;
    +
    120 
    +
    121  if (len)
    +
    122  rcode = pUsb->getDevDescr(bAddress, 0, len, (uint8_t*)buf);
    +
    123 
    +
    124  if (rcode)
    +
    125  goto FailGetDevDescr;
    +
    126 
    +
    127  // Assign epInfo to epinfo pointer
    +
    128  rcode = pUsb->setEpInfoEntry(bAddress, 2, epInfo);
    +
    129 
    +
    130  if (rcode)
    +
    131  goto FailSetDevTblEntry;
    +
    132 
    +
    133  // bInitState = 1;
    +
    134 
    +
    135  // case 1:
    +
    136  // Get hub descriptor
    +
    137  rcode = GetHubDescriptor(0, 8, buf);
    +
    138 
    +
    139  if (rcode)
    +
    140  goto FailGetHubDescr;
    +
    141 
    +
    142  // Save number of ports for future use
    +
    143  bNbrPorts = ((HubDescriptor*)buf)->bNbrPorts;
    +
    144 
    +
    145  // bInitState = 2;
    +
    146 
    +
    147  // case 2:
    +
    148  // Read configuration Descriptor in Order To Obtain Proper Configuration Value
    +
    149  rcode = pUsb->getConfDescr(bAddress, 0, 8, 0, buf);
    +
    150 
    +
    151  if (!rcode) {
    +
    152  cd_len = ((USB_CONFIGURATION_DESCRIPTOR*)buf)->wTotalLength;
    +
    153  rcode = pUsb->getConfDescr(bAddress, 0, cd_len, 0, buf);
    +
    154  }
    +
    155  if (rcode)
    +
    156  goto FailGetConfDescr;
    +
    157 
    +
    158  // The following code is of no practical use in real life applications.
    +
    159  // It only intended for the usb protocol sniffer to properly parse hub-class requests.
    +
    160  {
    +
    161  uint8_t buf2[24];
    +
    162 
    +
    163  rcode = pUsb->getConfDescr(bAddress, 0, buf[0], 0, buf2);
    +
    164 
    +
    165  if (rcode)
    +
    166  goto FailGetConfDescr;
    +
    167  }
    +
    168 
    +
    169  // Set Configuration Value
    +
    170  rcode = pUsb->setConf(bAddress, 0, buf[5]);
    +
    171 
    +
    172  if (rcode)
    +
    173  goto FailSetConfDescr;
    +
    174 
    +
    175  // bInitState = 3;
    +
    176 
    +
    177  // case 3:
    +
    178  // Power on all ports
    +
    179  for (uint8_t j = 1; j <= bNbrPorts; j++)
    +
    180  SetPortFeature(HUB_FEATURE_PORT_POWER, j, 0); //HubPortPowerOn(j);
    +
    181 
    +
    182  pUsb->SetHubPreMask();
    +
    183  bPollEnable = true;
    +
    184  // bInitState = 0;
    +
    185  //}
    +
    186  //bInitState = 0;
    +
    187  //USBTRACE("...OK\r\n");
    +
    188  return 0;
    +
    189 
    +
    190  // Oleg, No debugging?? -- xxxajk
    +
    191 FailGetDevDescr:
    +
    192  goto Fail;
    +
    193 
    +
    194 FailSetDevTblEntry:
    +
    195  goto Fail;
    +
    196 
    +
    197 FailGetHubDescr:
    +
    198  goto Fail;
    +
    199 
    +
    200 FailGetConfDescr:
    +
    201  goto Fail;
    +
    202 
    +
    203 FailSetConfDescr:
    +
    204  goto Fail;
    +
    205 
    +
    206 Fail:
    +
    207  USBTRACE("...FAIL\r\n");
    +
    208  return rcode;
    +
    209 }
    210 
    -
    211  if (bAddress == 0x41)
    -
    212  pUsb->SetHubPreMask();
    +
    211 uint8_t USBHub::Release() {
    +
    212  pUsb->GetAddressPool().FreeAddress(bAddress);
    213 
    -
    214  bAddress = 0;
    -
    215  bNbrPorts = 0;
    -
    216  qNextPollTime = 0;
    -
    217  bPollEnable = false;
    -
    218  return 0;
    -
    219 }
    -
    220 
    -
    221 uint8_t USBHub::Poll() {
    -
    222  uint8_t rcode = 0;
    +
    214  if (bAddress == 0x41)
    +
    215  pUsb->SetHubPreMask();
    +
    216 
    +
    217  bAddress = 0;
    +
    218  bNbrPorts = 0;
    +
    219  qNextPollTime = 0;
    +
    220  bPollEnable = false;
    +
    221  return 0;
    +
    222 }
    223 
    -
    224  if (!bPollEnable)
    -
    225  return 0;
    +
    224 uint8_t USBHub::Poll() {
    +
    225  uint8_t rcode = 0;
    226 
    -
    227  if (qNextPollTime <= millis()) {
    -
    228  rcode = CheckHubStatus();
    -
    229  qNextPollTime = millis() + 100;
    -
    230  }
    -
    231  return rcode;
    -
    232 }
    -
    233 
    -
    234 uint8_t USBHub::CheckHubStatus() {
    -
    235  uint8_t rcode;
    -
    236  uint8_t buf[8];
    -
    237  uint16_t read = 1;
    -
    238 
    -
    239  rcode = pUsb->inTransfer(bAddress, 1, &read, buf);
    -
    240 
    -
    241  if (rcode)
    -
    242  return rcode;
    +
    227  if (!bPollEnable)
    +
    228  return 0;
    +
    229 
    +
    230  if (qNextPollTime <= millis()) {
    +
    231  rcode = CheckHubStatus();
    +
    232  qNextPollTime = millis() + 100;
    +
    233  }
    +
    234  return rcode;
    +
    235 }
    +
    236 
    +
    237 uint8_t USBHub::CheckHubStatus() {
    +
    238  uint8_t rcode;
    +
    239  uint8_t buf[8];
    +
    240  uint16_t read = 1;
    +
    241 
    +
    242  rcode = pUsb->inTransfer(bAddress, 1, &read, buf);
    243 
    -
    244  if (buf[0] & 0x01) // Hub Status Change
    -
    245  {
    -
    246  //pUsb->PrintHubStatus(addr);
    -
    247  //rcode = GetHubStatus(1, 0, 1, 4, buf);
    -
    248  //if (rcode)
    -
    249  //{
    -
    250  // USB_HOST_SERIAL.print("GetHubStatus Error");
    -
    251  // USB_HOST_SERIAL.println(rcode, HEX);
    -
    252  // return rcode;
    -
    253  //}
    -
    254  }
    -
    255  for (uint8_t port = 1, mask = 0x02; port < 8; mask <<= 1, port++) {
    -
    256  if (buf[0] & mask) {
    -
    257  HubEvent evt;
    -
    258  evt.bmEvent = 0;
    -
    259 
    -
    260  rcode = GetPortStatus(port, 4, evt.evtBuff);
    -
    261 
    -
    262  if (rcode)
    -
    263  continue;
    +
    244  if (rcode)
    +
    245  return rcode;
    +
    246 
    +
    247  //if (buf[0] & 0x01) // Hub Status Change
    +
    248  //{
    +
    249  // pUsb->PrintHubStatus(addr);
    +
    250  // rcode = GetHubStatus(1, 0, 1, 4, buf);
    +
    251  // if (rcode)
    +
    252  // {
    +
    253  // USB_HOST_SERIAL.print("GetHubStatus Error");
    +
    254  // USB_HOST_SERIAL.println(rcode, HEX);
    +
    255  // return rcode;
    +
    256  // }
    +
    257  //}
    +
    258  for (uint8_t port = 1, mask = 0x02; port < 8; mask <<= 1, port++) {
    +
    259  if (buf[0] & mask) {
    +
    260  HubEvent evt;
    +
    261  evt.bmEvent = 0;
    +
    262 
    +
    263  rcode = GetPortStatus(port, 4, evt.evtBuff);
    264 
    -
    265  rcode = PortStatusChange(port, evt);
    -
    266 
    -
    267  if (rcode == HUB_ERROR_PORT_HAS_BEEN_RESET)
    -
    268  return 0;
    +
    265  if (rcode)
    +
    266  continue;
    +
    267 
    +
    268  rcode = PortStatusChange(port, evt);
    269 
    -
    270  if (rcode)
    -
    271  return rcode;
    -
    272  }
    -
    273  } // for
    -
    274 
    -
    275  for (uint8_t port = 1; port <= bNbrPorts; port++) {
    -
    276  HubEvent evt;
    -
    277  evt.bmEvent = 0;
    -
    278 
    -
    279  rcode = GetPortStatus(port, 4, evt.evtBuff);
    -
    280 
    -
    281  if (rcode)
    -
    282  continue;
    +
    270  if (rcode == HUB_ERROR_PORT_HAS_BEEN_RESET)
    +
    271  return 0;
    +
    272 
    +
    273  if (rcode)
    +
    274  return rcode;
    +
    275  }
    +
    276  } // for
    +
    277 
    +
    278  for (uint8_t port = 1; port <= bNbrPorts; port++) {
    +
    279  HubEvent evt;
    +
    280  evt.bmEvent = 0;
    +
    281 
    +
    282  rcode = GetPortStatus(port, 4, evt.evtBuff);
    283 
    -
    284  if ((evt.bmStatus & bmHUB_PORT_STATE_CHECK_DISABLED) != bmHUB_PORT_STATE_DISABLED)
    +
    284  if (rcode)
    285  continue;
    286 
    -
    287  // Emulate connection event for the port
    -
    288  evt.bmChange |= bmHUB_PORT_STATUS_C_PORT_CONNECTION;
    +
    287  if ((evt.bmStatus & bmHUB_PORT_STATE_CHECK_DISABLED) != bmHUB_PORT_STATE_DISABLED)
    +
    288  continue;
    289 
    -
    290  rcode = PortStatusChange(port, evt);
    -
    291 
    -
    292  if (rcode == HUB_ERROR_PORT_HAS_BEEN_RESET)
    -
    293  return 0;
    +
    290  // Emulate connection event for the port
    +
    291  evt.bmChange |= bmHUB_PORT_STATUS_C_PORT_CONNECTION;
    +
    292 
    +
    293  rcode = PortStatusChange(port, evt);
    294 
    -
    295  if (rcode)
    -
    296  return rcode;
    -
    297  } // for
    -
    298  return 0;
    -
    299 }
    -
    300 
    -
    301 uint8_t USBHub::PortStatusChange(uint8_t port, HubEvent &evt) {
    -
    302  switch (evt.bmEvent) {
    -
    303  // Device connected event
    -
    304  case bmHUB_PORT_EVENT_CONNECT:
    -
    305  case bmHUB_PORT_EVENT_LS_CONNECT:
    -
    306  if (bResetInitiated)
    -
    307  return 0;
    +
    295  if (rcode == HUB_ERROR_PORT_HAS_BEEN_RESET)
    +
    296  return 0;
    +
    297 
    +
    298  if (rcode)
    +
    299  return rcode;
    +
    300  } // for
    +
    301  return 0;
    +
    302 }
    +
    303 
    +
    304 void USBHub::ResetHubPort(uint8_t port) {
    +
    305  HubEvent evt;
    +
    306  evt.bmEvent = 0;
    +
    307  uint8_t rcode;
    308 
    -
    309  ClearPortFeature(HUB_FEATURE_C_PORT_ENABLE, port, 0);
    -
    310  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    -
    311  SetPortFeature(HUB_FEATURE_PORT_RESET, port, 0);
    -
    312  bResetInitiated = true;
    -
    313  return HUB_ERROR_PORT_HAS_BEEN_RESET;
    -
    314 
    -
    315  // Device disconnected event
    -
    316  case bmHUB_PORT_EVENT_DISCONNECT:
    -
    317  ClearPortFeature(HUB_FEATURE_C_PORT_ENABLE, port, 0);
    -
    318  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    -
    319  bResetInitiated = false;
    -
    320 
    -
    321  UsbDeviceAddress a;
    -
    322  a.bmHub = 0;
    -
    323  a.bmParent = bAddress;
    -
    324  a.bmAddress = port;
    -
    325  pUsb->ReleaseDevice(a.devAddress);
    -
    326  return 0;
    -
    327 
    -
    328  // Reset complete event
    -
    329  case bmHUB_PORT_EVENT_RESET_COMPLETE:
    -
    330  case bmHUB_PORT_EVENT_LS_RESET_COMPLETE:
    -
    331  ClearPortFeature(HUB_FEATURE_C_PORT_RESET, port, 0);
    -
    332  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    -
    333 
    -
    334  delay(20);
    -
    335 
    -
    336  a.devAddress = bAddress;
    -
    337 
    -
    338  pUsb->Configuring(a.bmAddress, port, (evt.bmStatus & bmHUB_PORT_STATUS_PORT_LOW_SPEED));
    -
    339  bResetInitiated = false;
    -
    340  break;
    -
    341 
    -
    342  } // switch (evt.bmEvent)
    -
    343  return 0;
    -
    344 }
    -
    345 
    -
    346 void PrintHubPortStatus(USBHub *hubptr, uint8_t addr, uint8_t port, bool print_changes) {
    -
    347  uint8_t rcode = 0;
    -
    348  HubEvent evt;
    -
    349 
    -
    350  rcode = hubptr->GetPortStatus(port, 4, evt.evtBuff);
    -
    351 
    -
    352  if (rcode) {
    -
    353  USB_HOST_SERIAL.println("ERROR!");
    -
    354  return;
    -
    355  }
    -
    356  USB_HOST_SERIAL.print("\r\nPort ");
    -
    357  USB_HOST_SERIAL.println(port, DEC);
    -
    358 
    -
    359  USB_HOST_SERIAL.println("Status");
    -
    360  USB_HOST_SERIAL.print("CONNECTION:\t");
    -
    361  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_CONNECTION) > 0, DEC);
    -
    362  USB_HOST_SERIAL.print("ENABLE:\t\t");
    -
    363  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_ENABLE) > 0, DEC);
    -
    364  USB_HOST_SERIAL.print("SUSPEND:\t");
    -
    365  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_SUSPEND) > 0, DEC);
    -
    366  USB_HOST_SERIAL.print("OVER_CURRENT:\t");
    -
    367  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_OVER_CURRENT) > 0, DEC);
    -
    368  USB_HOST_SERIAL.print("RESET:\t\t");
    -
    369  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_RESET) > 0, DEC);
    -
    370  USB_HOST_SERIAL.print("POWER:\t\t");
    -
    371  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_POWER) > 0, DEC);
    -
    372  USB_HOST_SERIAL.print("LOW_SPEED:\t");
    -
    373  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_LOW_SPEED) > 0, DEC);
    -
    374  USB_HOST_SERIAL.print("HIGH_SPEED:\t");
    -
    375  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_HIGH_SPEED) > 0, DEC);
    -
    376  USB_HOST_SERIAL.print("TEST:\t\t");
    -
    377  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_TEST) > 0, DEC);
    -
    378  USB_HOST_SERIAL.print("INDICATOR:\t");
    -
    379  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_INDICATOR) > 0, DEC);
    -
    380 
    -
    381  if (!print_changes)
    -
    382  return;
    -
    383 
    -
    384  USB_HOST_SERIAL.println("\r\nChange");
    -
    385  USB_HOST_SERIAL.print("CONNECTION:\t");
    -
    386  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_CONNECTION) > 0, DEC);
    -
    387  USB_HOST_SERIAL.print("ENABLE:\t\t");
    -
    388  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_ENABLE) > 0, DEC);
    -
    389  USB_HOST_SERIAL.print("SUSPEND:\t");
    -
    390  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_SUSPEND) > 0, DEC);
    -
    391  USB_HOST_SERIAL.print("OVER_CURRENT:\t");
    -
    392  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_OVER_CURRENT) > 0, DEC);
    -
    393  USB_HOST_SERIAL.print("RESET:\t\t");
    -
    394  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_RESET) > 0, DEC);
    -
    395 }
    +
    309  ClearPortFeature(HUB_FEATURE_C_PORT_ENABLE, port, 0);
    +
    310  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    +
    311  SetPortFeature(HUB_FEATURE_PORT_RESET, port, 0);
    +
    312 
    +
    313 
    +
    314  for (int i = 0; i < 3; i++) {
    +
    315  rcode = GetPortStatus(port, 4, evt.evtBuff);
    +
    316  if (rcode) break; // Some kind of error, bail.
    +
    317  if (evt.bmEvent == bmHUB_PORT_EVENT_RESET_COMPLETE || evt.bmEvent == bmHUB_PORT_EVENT_LS_RESET_COMPLETE) {
    +
    318  break;
    +
    319  }
    +
    320  delay(100); // simulate polling.
    +
    321  }
    +
    322  ClearPortFeature(HUB_FEATURE_C_PORT_RESET, port, 0);
    +
    323  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    +
    324  delay(20);
    +
    325 }
    +
    326 
    +
    327 uint8_t USBHub::PortStatusChange(uint8_t port, HubEvent &evt) {
    +
    328  switch (evt.bmEvent) {
    +
    329  // Device connected event
    +
    330  case bmHUB_PORT_EVENT_CONNECT:
    +
    331  case bmHUB_PORT_EVENT_LS_CONNECT:
    +
    332  if (bResetInitiated)
    +
    333  return 0;
    +
    334 
    +
    335  ClearPortFeature(HUB_FEATURE_C_PORT_ENABLE, port, 0);
    +
    336  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    +
    337  SetPortFeature(HUB_FEATURE_PORT_RESET, port, 0);
    +
    338  bResetInitiated = true;
    +
    339  return HUB_ERROR_PORT_HAS_BEEN_RESET;
    +
    340 
    +
    341  // Device disconnected event
    +
    342  case bmHUB_PORT_EVENT_DISCONNECT:
    +
    343  ClearPortFeature(HUB_FEATURE_C_PORT_ENABLE, port, 0);
    +
    344  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    +
    345  bResetInitiated = false;
    +
    346 
    +
    347  UsbDeviceAddress a;
    +
    348  a.bmHub = 0;
    +
    349  a.bmParent = bAddress;
    +
    350  a.bmAddress = port;
    +
    351  pUsb->ReleaseDevice(a.devAddress);
    +
    352  return 0;
    +
    353 
    +
    354  // Reset complete event
    +
    355  case bmHUB_PORT_EVENT_RESET_COMPLETE:
    +
    356  case bmHUB_PORT_EVENT_LS_RESET_COMPLETE:
    +
    357  ClearPortFeature(HUB_FEATURE_C_PORT_RESET, port, 0);
    +
    358  ClearPortFeature(HUB_FEATURE_C_PORT_CONNECTION, port, 0);
    +
    359 
    +
    360  delay(20);
    +
    361 
    +
    362  a.devAddress = bAddress;
    +
    363 
    +
    364  pUsb->Configuring(a.bmAddress, port, (evt.bmStatus & bmHUB_PORT_STATUS_PORT_LOW_SPEED));
    +
    365  bResetInitiated = false;
    +
    366  break;
    +
    367 
    +
    368  } // switch (evt.bmEvent)
    +
    369  return 0;
    +
    370 }
    +
    371 
    +
    372 void PrintHubPortStatus(USBHub *hubptr, uint8_t addr, uint8_t port, bool print_changes) {
    +
    373  uint8_t rcode = 0;
    +
    374  HubEvent evt;
    +
    375 
    +
    376  rcode = hubptr->GetPortStatus(port, 4, evt.evtBuff);
    +
    377 
    +
    378  if (rcode) {
    +
    379  USB_HOST_SERIAL.println("ERROR!");
    +
    380  return;
    +
    381  }
    +
    382  USB_HOST_SERIAL.print("\r\nPort ");
    +
    383  USB_HOST_SERIAL.println(port, DEC);
    +
    384 
    +
    385  USB_HOST_SERIAL.println("Status");
    +
    386  USB_HOST_SERIAL.print("CONNECTION:\t");
    +
    387  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_CONNECTION) > 0, DEC);
    +
    388  USB_HOST_SERIAL.print("ENABLE:\t\t");
    +
    389  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_ENABLE) > 0, DEC);
    +
    390  USB_HOST_SERIAL.print("SUSPEND:\t");
    +
    391  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_SUSPEND) > 0, DEC);
    +
    392  USB_HOST_SERIAL.print("OVER_CURRENT:\t");
    +
    393  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_OVER_CURRENT) > 0, DEC);
    +
    394  USB_HOST_SERIAL.print("RESET:\t\t");
    +
    395  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_RESET) > 0, DEC);
    +
    396  USB_HOST_SERIAL.print("POWER:\t\t");
    +
    397  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_POWER) > 0, DEC);
    +
    398  USB_HOST_SERIAL.print("LOW_SPEED:\t");
    +
    399  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_LOW_SPEED) > 0, DEC);
    +
    400  USB_HOST_SERIAL.print("HIGH_SPEED:\t");
    +
    401  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_HIGH_SPEED) > 0, DEC);
    +
    402  USB_HOST_SERIAL.print("TEST:\t\t");
    +
    403  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_TEST) > 0, DEC);
    +
    404  USB_HOST_SERIAL.print("INDICATOR:\t");
    +
    405  USB_HOST_SERIAL.println((evt.bmStatus & bmHUB_PORT_STATUS_PORT_INDICATOR) > 0, DEC);
    +
    406 
    +
    407  if (!print_changes)
    +
    408  return;
    +
    409 
    +
    410  USB_HOST_SERIAL.println("\r\nChange");
    +
    411  USB_HOST_SERIAL.print("CONNECTION:\t");
    +
    412  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_CONNECTION) > 0, DEC);
    +
    413  USB_HOST_SERIAL.print("ENABLE:\t\t");
    +
    414  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_ENABLE) > 0, DEC);
    +
    415  USB_HOST_SERIAL.print("SUSPEND:\t");
    +
    416  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_SUSPEND) > 0, DEC);
    +
    417  USB_HOST_SERIAL.print("OVER_CURRENT:\t");
    +
    418  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_OVER_CURRENT) > 0, DEC);
    +
    419  USB_HOST_SERIAL.print("RESET:\t\t");
    +
    420  USB_HOST_SERIAL.println((evt.bmChange & bmHUB_PORT_STATUS_C_PORT_RESET) > 0, DEC);
    +
    421 }
    diff --git a/usbhub_8h_source.html b/usbhub_8h_source.html index fb3f4f6a..e6a0e310 100644 --- a/usbhub_8h_source.html +++ b/usbhub_8h_source.html @@ -126,18 +126,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    35 #define USB_DESCRIPTOR_HUB 0x09 // Hub descriptor type
    36 
    37 // Hub Requests
    -
    38 #define bmREQ_CLEAR_HUB_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    -
    39 #define bmREQ_CLEAR_PORT_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    40 #define bmREQ_CLEAR_TT_BUFFER USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    41 #define bmREQ_GET_HUB_DESCRIPTOR USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    -
    42 #define bmREQ_GET_HUB_STATUS USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    -
    43 #define bmREQ_GET_PORT_STATUS USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    44 #define bmREQ_RESET_TT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    45 #define bmREQ_SET_HUB_DESCRIPTOR USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    -
    46 #define bmREQ_SET_HUB_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    -
    47 #define bmREQ_SET_PORT_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    48 #define bmREQ_GET_TT_STATE USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    -
    49 #define bmREQ_STOP_TT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    38 #define bmREQ_CLEAR_HUB_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    +
    39 #define bmREQ_CLEAR_PORT_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    40 #define bmREQ_CLEAR_TT_BUFFER USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    41 #define bmREQ_GET_HUB_DESCRIPTOR USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    +
    42 #define bmREQ_GET_HUB_STATUS USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    +
    43 #define bmREQ_GET_PORT_STATUS USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    44 #define bmREQ_RESET_TT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    45 #define bmREQ_SET_HUB_DESCRIPTOR USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    +
    46 #define bmREQ_SET_HUB_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_DEVICE
    +
    47 #define bmREQ_SET_PORT_FEATURE USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    48 #define bmREQ_GET_TT_STATE USB_SETUP_DEVICE_TO_HOST|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    +
    49 #define bmREQ_STOP_TT USB_SETUP_HOST_TO_DEVICE|USB_SETUP_TYPE_CLASS|USB_SETUP_RECIPIENT_OTHER
    50 
    51 // Hub Class Requests
    52 #define HUB_REQUEST_CLEAR_TT_BUFFER 8
    @@ -177,62 +177,62 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    86 #define HUB_PORT_INDICATOR_OFF 3
    87 
    88 // Hub Port Status Bitmasks
    -
    89 #define bmHUB_PORT_STATUS_PORT_CONNECTION 0x0001
    -
    90 #define bmHUB_PORT_STATUS_PORT_ENABLE 0x0002
    -
    91 #define bmHUB_PORT_STATUS_PORT_SUSPEND 0x0004
    -
    92 #define bmHUB_PORT_STATUS_PORT_OVER_CURRENT 0x0008
    -
    93 #define bmHUB_PORT_STATUS_PORT_RESET 0x0010
    -
    94 #define bmHUB_PORT_STATUS_PORT_POWER 0x0100
    -
    95 #define bmHUB_PORT_STATUS_PORT_LOW_SPEED 0x0200
    -
    96 #define bmHUB_PORT_STATUS_PORT_HIGH_SPEED 0x0400
    -
    97 #define bmHUB_PORT_STATUS_PORT_TEST 0x0800
    -
    98 #define bmHUB_PORT_STATUS_PORT_INDICATOR 0x1000
    +
    89 #define bmHUB_PORT_STATUS_PORT_CONNECTION 0x0001
    +
    90 #define bmHUB_PORT_STATUS_PORT_ENABLE 0x0002
    +
    91 #define bmHUB_PORT_STATUS_PORT_SUSPEND 0x0004
    +
    92 #define bmHUB_PORT_STATUS_PORT_OVER_CURRENT 0x0008
    +
    93 #define bmHUB_PORT_STATUS_PORT_RESET 0x0010
    +
    94 #define bmHUB_PORT_STATUS_PORT_POWER 0x0100
    +
    95 #define bmHUB_PORT_STATUS_PORT_LOW_SPEED 0x0200
    +
    96 #define bmHUB_PORT_STATUS_PORT_HIGH_SPEED 0x0400
    +
    97 #define bmHUB_PORT_STATUS_PORT_TEST 0x0800
    +
    98 #define bmHUB_PORT_STATUS_PORT_INDICATOR 0x1000
    99 
    100 // Hub Port Status Change Bitmasks (used one byte instead of two)
    -
    101 #define bmHUB_PORT_STATUS_C_PORT_CONNECTION 0x0001
    -
    102 #define bmHUB_PORT_STATUS_C_PORT_ENABLE 0x0002
    -
    103 #define bmHUB_PORT_STATUS_C_PORT_SUSPEND 0x0004
    +
    101 #define bmHUB_PORT_STATUS_C_PORT_CONNECTION 0x0001
    +
    102 #define bmHUB_PORT_STATUS_C_PORT_ENABLE 0x0002
    +
    103 #define bmHUB_PORT_STATUS_C_PORT_SUSPEND 0x0004
    104 #define bmHUB_PORT_STATUS_C_PORT_OVER_CURRENT 0x0008
    -
    105 #define bmHUB_PORT_STATUS_C_PORT_RESET 0x0010
    +
    105 #define bmHUB_PORT_STATUS_C_PORT_RESET 0x0010
    106 
    107 // Hub Status Bitmasks (used one byte instead of two)
    -
    108 #define bmHUB_STATUS_LOCAL_POWER_SOURCE 0x01
    -
    109 #define bmHUB_STATUS_OVER_CURRENT 0x12
    +
    108 #define bmHUB_STATUS_LOCAL_POWER_SOURCE 0x01
    +
    109 #define bmHUB_STATUS_OVER_CURRENT 0x12
    110 
    111 // Hub Status Change Bitmasks (used one byte instead of two)
    -
    112 #define bmHUB_STATUS_C_LOCAL_POWER_SOURCE 0x01
    -
    113 #define bmHUB_STATUS_C_OVER_CURRENT 0x12
    +
    112 #define bmHUB_STATUS_C_LOCAL_POWER_SOURCE 0x01
    +
    113 #define bmHUB_STATUS_C_OVER_CURRENT 0x12
    114 
    115 
    116 // Hub Port Configuring Substates
    -
    117 #define USB_STATE_HUB_PORT_CONFIGURING 0xb0
    -
    118 #define USB_STATE_HUB_PORT_POWERED_OFF 0xb1
    +
    117 #define USB_STATE_HUB_PORT_CONFIGURING 0xb0
    +
    118 #define USB_STATE_HUB_PORT_POWERED_OFF 0xb1
    119 #define USB_STATE_HUB_PORT_WAIT_FOR_POWER_GOOD 0xb2
    -
    120 #define USB_STATE_HUB_PORT_DISCONNECTED 0xb3
    -
    121 #define USB_STATE_HUB_PORT_DISABLED 0xb4
    -
    122 #define USB_STATE_HUB_PORT_RESETTING 0xb5
    -
    123 #define USB_STATE_HUB_PORT_ENABLED 0xb6
    +
    120 #define USB_STATE_HUB_PORT_DISCONNECTED 0xb3
    +
    121 #define USB_STATE_HUB_PORT_DISABLED 0xb4
    +
    122 #define USB_STATE_HUB_PORT_RESETTING 0xb5
    +
    123 #define USB_STATE_HUB_PORT_ENABLED 0xb6
    124 
    125 // Additional Error Codes
    -
    126 #define HUB_ERROR_PORT_HAS_BEEN_RESET 0xb1
    +
    126 #define HUB_ERROR_PORT_HAS_BEEN_RESET 0xb1
    127 
    128 // The bit mask to check for all necessary state bits
    -
    129 #define bmHUB_PORT_STATUS_ALL_MAIN ((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION | bmHUB_PORT_STATUS_C_PORT_ENABLE | bmHUB_PORT_STATUS_C_PORT_SUSPEND | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_SUSPEND)
    +
    129 #define bmHUB_PORT_STATUS_ALL_MAIN ((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION | bmHUB_PORT_STATUS_C_PORT_ENABLE | bmHUB_PORT_STATUS_C_PORT_SUSPEND | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_SUSPEND)
    130 
    131 // Bit mask to check for DISABLED state in HubEvent::bmStatus field
    -
    132 #define bmHUB_PORT_STATE_CHECK_DISABLED (0x0000 | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_SUSPEND)
    +
    132 #define bmHUB_PORT_STATE_CHECK_DISABLED (0x0000 | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_SUSPEND)
    133 
    134 // Hub Port States
    -
    135 #define bmHUB_PORT_STATE_DISABLED (0x0000 | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION)
    +
    135 #define bmHUB_PORT_STATE_DISABLED (0x0000 | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION)
    136 
    137 // Hub Port Events
    -
    138 #define bmHUB_PORT_EVENT_CONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION)
    -
    139 #define bmHUB_PORT_EVENT_DISCONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER)
    -
    140 #define bmHUB_PORT_EVENT_RESET_COMPLETE (((0UL | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION)
    +
    138 #define bmHUB_PORT_EVENT_CONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION)
    +
    139 #define bmHUB_PORT_EVENT_DISCONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER)
    +
    140 #define bmHUB_PORT_EVENT_RESET_COMPLETE (((0UL | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION)
    141 
    -
    142 #define bmHUB_PORT_EVENT_LS_CONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    -
    143 #define bmHUB_PORT_EVENT_LS_RESET_COMPLETE (((0UL | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    -
    144 #define bmHUB_PORT_EVENT_LS_PORT_ENABLED (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION | bmHUB_PORT_STATUS_C_PORT_ENABLE) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    +
    142 #define bmHUB_PORT_EVENT_LS_CONNECT (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    +
    143 #define bmHUB_PORT_EVENT_LS_RESET_COMPLETE (((0UL | bmHUB_PORT_STATUS_C_PORT_RESET) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    +
    144 #define bmHUB_PORT_EVENT_LS_PORT_ENABLED (((0UL | bmHUB_PORT_STATUS_C_PORT_CONNECTION | bmHUB_PORT_STATUS_C_PORT_ENABLE) << 16) | bmHUB_PORT_STATUS_PORT_POWER | bmHUB_PORT_STATUS_PORT_ENABLE | bmHUB_PORT_STATUS_PORT_CONNECTION | bmHUB_PORT_STATUS_PORT_LOW_SPEED)
    145 
    146 struct HubDescriptor {
    147  uint8_t bDescLength; // descriptor length
    @@ -274,7 +274,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    183 
    184  uint8_t bAddress; // address
    185  uint8_t bNbrPorts; // number of ports
    -
    186  uint8_t bInitState; // initialization state variable
    +
    186 // uint8_t bInitState; // initialization state variable
    187  uint32_t qNextPollTime; // next poll time
    188  bool bPollEnable; // poll enable flag
    189 
    @@ -298,56 +298,58 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    207  virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed);
    208  virtual uint8_t Release();
    209  virtual uint8_t Poll();
    -
    210 
    +
    210  virtual void ResetHubPort(uint8_t port);
    211  virtual uint8_t GetAddress() {
    212  return bAddress;
    213  };
    -
    214 };
    +
    214  virtual boolean DEVCLASSOK(uint8_t klass) { return (klass == 0x09); }
    215 
    -
    216 // Clear Hub Feature
    +
    216 };
    217 
    -
    218 inline uint8_t USBHub::ClearHubFeature(uint8_t fid) {
    -
    219  return( pUsb->ctrlReq(bAddress, 0, bmREQ_CLEAR_HUB_FEATURE, USB_REQUEST_CLEAR_FEATURE, fid, 0, 0, 0, 0, NULL, NULL));
    -
    220 }
    -
    221 // Clear Port Feature
    -
    222 
    -
    223 inline uint8_t USBHub::ClearPortFeature(uint8_t fid, uint8_t port, uint8_t sel) {
    -
    224  return( pUsb->ctrlReq(bAddress, 0, bmREQ_CLEAR_PORT_FEATURE, USB_REQUEST_CLEAR_FEATURE, fid, 0, ((0x0000 | port) | (sel << 8)), 0, 0, NULL, NULL));
    -
    225 }
    -
    226 // Get Hub Descriptor
    -
    227 
    -
    228 inline uint8_t USBHub::GetHubDescriptor(uint8_t index, uint16_t nbytes, uint8_t *dataptr) {
    -
    229  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_HUB_DESCRIPTOR, USB_REQUEST_GET_DESCRIPTOR, index, 0x29, 0, nbytes, nbytes, dataptr, NULL));
    -
    230 }
    -
    231 // Get Hub Status
    -
    232 
    -
    233 inline uint8_t USBHub::GetHubStatus(uint16_t nbytes, uint8_t* dataptr) {
    -
    234  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_HUB_STATUS, USB_REQUEST_GET_STATUS, 0, 0, 0x0000, nbytes, nbytes, dataptr, NULL));
    -
    235 }
    -
    236 // Get Port Status
    -
    237 
    -
    238 inline uint8_t USBHub::GetPortStatus(uint8_t port, uint16_t nbytes, uint8_t* dataptr) {
    -
    239  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_PORT_STATUS, USB_REQUEST_GET_STATUS, 0, 0, port, nbytes, nbytes, dataptr, NULL));
    -
    240 }
    -
    241 // Set Hub Descriptor
    -
    242 
    -
    243 inline uint8_t USBHub::SetHubDescriptor(uint8_t port, uint16_t nbytes, uint8_t* dataptr) {
    -
    244  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_HUB_DESCRIPTOR, USB_REQUEST_SET_DESCRIPTOR, 0, 0, port, nbytes, nbytes, dataptr, NULL));
    -
    245 }
    -
    246 // Set Hub Feature
    -
    247 
    -
    248 inline uint8_t USBHub::SetHubFeature(uint8_t fid) {
    -
    249  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_HUB_FEATURE, USB_REQUEST_SET_FEATURE, fid, 0, 0, 0, 0, NULL, NULL));
    -
    250 }
    -
    251 // Set Port Feature
    -
    252 
    -
    253 inline uint8_t USBHub::SetPortFeature(uint8_t fid, uint8_t port, uint8_t sel) {
    -
    254  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_PORT_FEATURE, USB_REQUEST_SET_FEATURE, fid, 0, (((0x0000 | sel) << 8) | port), 0, 0, NULL, NULL));
    -
    255 }
    -
    256 
    -
    257 void PrintHubPortStatus(USB *usbptr, uint8_t addr, uint8_t port, bool print_changes = false);
    +
    218 // Clear Hub Feature
    +
    219 
    +
    220 inline uint8_t USBHub::ClearHubFeature(uint8_t fid) {
    +
    221  return( pUsb->ctrlReq(bAddress, 0, bmREQ_CLEAR_HUB_FEATURE, USB_REQUEST_CLEAR_FEATURE, fid, 0, 0, 0, 0, NULL, NULL));
    +
    222 }
    +
    223 // Clear Port Feature
    +
    224 
    +
    225 inline uint8_t USBHub::ClearPortFeature(uint8_t fid, uint8_t port, uint8_t sel) {
    +
    226  return( pUsb->ctrlReq(bAddress, 0, bmREQ_CLEAR_PORT_FEATURE, USB_REQUEST_CLEAR_FEATURE, fid, 0, ((0x0000 | port) | (sel << 8)), 0, 0, NULL, NULL));
    +
    227 }
    +
    228 // Get Hub Descriptor
    +
    229 
    +
    230 inline uint8_t USBHub::GetHubDescriptor(uint8_t index, uint16_t nbytes, uint8_t *dataptr) {
    +
    231  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_HUB_DESCRIPTOR, USB_REQUEST_GET_DESCRIPTOR, index, 0x29, 0, nbytes, nbytes, dataptr, NULL));
    +
    232 }
    +
    233 // Get Hub Status
    +
    234 
    +
    235 inline uint8_t USBHub::GetHubStatus(uint16_t nbytes, uint8_t* dataptr) {
    +
    236  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_HUB_STATUS, USB_REQUEST_GET_STATUS, 0, 0, 0x0000, nbytes, nbytes, dataptr, NULL));
    +
    237 }
    +
    238 // Get Port Status
    +
    239 
    +
    240 inline uint8_t USBHub::GetPortStatus(uint8_t port, uint16_t nbytes, uint8_t* dataptr) {
    +
    241  return( pUsb->ctrlReq(bAddress, 0, bmREQ_GET_PORT_STATUS, USB_REQUEST_GET_STATUS, 0, 0, port, nbytes, nbytes, dataptr, NULL));
    +
    242 }
    +
    243 // Set Hub Descriptor
    +
    244 
    +
    245 inline uint8_t USBHub::SetHubDescriptor(uint8_t port, uint16_t nbytes, uint8_t* dataptr) {
    +
    246  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_HUB_DESCRIPTOR, USB_REQUEST_SET_DESCRIPTOR, 0, 0, port, nbytes, nbytes, dataptr, NULL));
    +
    247 }
    +
    248 // Set Hub Feature
    +
    249 
    +
    250 inline uint8_t USBHub::SetHubFeature(uint8_t fid) {
    +
    251  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_HUB_FEATURE, USB_REQUEST_SET_FEATURE, fid, 0, 0, 0, 0, NULL, NULL));
    +
    252 }
    +
    253 // Set Port Feature
    +
    254 
    +
    255 inline uint8_t USBHub::SetPortFeature(uint8_t fid, uint8_t port, uint8_t sel) {
    +
    256  return( pUsb->ctrlReq(bAddress, 0, bmREQ_SET_PORT_FEATURE, USB_REQUEST_SET_FEATURE, fid, 0, (((0x0000 | sel) << 8) | port), 0, 0, NULL, NULL));
    +
    257 }
    258 
    -
    259 #endif // __USBHUB_H__
    +
    259 void PrintHubPortStatus(USB *usbptr, uint8_t addr, uint8_t port, bool print_changes = false);
    +
    260 
    +
    261 #endif // __USBHUB_H__