Diff: USBHost/USBHost.h

Revision:

10:40c7f6788902

Parent:

9:7f9f64cf5ded

diff -r 7f9f64cf5ded -r 40c7f6788902 USBHost/USBHost.h
--- a/USBHost/USBHost.h	Mon Feb 03 13:00:16 2014 +0000
+++ b/USBHost/USBHost.h	Wed Feb 05 13:34:37 2014 +0000
@@ -1,4 +1,19 @@
-// Simple USBHost for FRDM-KL46Z
+/* mbed USBHost Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #pragma once
 #include "mbed.h"
 #include "USBHALHost.h"
@@ -6,8 +21,12 @@
 #include "IUSBEnumerator.h"
 #include "USBHostConf.h"
 #include "dbg.h"
-#include "myqueue.h"
+#include "myvector.h"
 
+/**
+* USBHost class
+*   This class is a singleton. All drivers have a reference on the static USBHost instance
+*/
 class USBHost : public USBHALHost {
 public:
     /**
@@ -127,7 +146,7 @@
     * @returns pointer on the "index" device
     */
     USBDeviceConnected * getDevice(uint8_t index) {
-        return DeviceLists.empty() ? NULL : DeviceLists.at(index);
+        return index < DeviceLists.size() ? DeviceLists[index] : NULL;
     }
 
     /**
@@ -153,16 +172,16 @@
 private:
     USBHost();
     static USBHost* inst;
-    virtual bool addDevice(int hub, int port, bool lowSpeed);
+    virtual bool addDevice(USBDeviceConnected* parent, int port, bool lowSpeed);
     void root_enumeration(USBDeviceConnected* dev);
     void parseConfDescr(USBDeviceConnected* dev, uint8_t* conf_descr, uint32_t len, IUSBEnumerator* pEnumerator);
-    myqueue<USBDeviceConnected*>DeviceLists;
+    myvector<USBDeviceConnected*>DeviceLists;
 
     int ControlRead(USBDeviceConnected* dev, SETUP_PACKET* setup, uint8_t* data, int size);
     int ControlWrite(USBDeviceConnected* dev, SETUP_PACKET* setup, uint8_t* data = NULL, int size = 0);
     int bulkReadBLOCK(USBEndpoint*ep, uint8_t* data, int size, int timeout_ms);
     void task();
-    myqueue<USBEndpoint*>ep_queue;
+    EndpointQueue ep_queue;
 
     // USB HUB
     bool Hub(USBDeviceConnected* dev);