Diff: USBHost/USBEndpoint.h

Revision:

8:93da8ea2708b

Parent:

4:b320d68e98e7

Child:

9:7671b6a8c363

diff -r e7e63ac7ae5f -r 93da8ea2708b USBHost/USBEndpoint.h
--- a/USBHost/USBEndpoint.h	Wed Mar 13 17:30:42 2013 +0000
+++ b/USBHost/USBEndpoint.h	Thu Mar 14 11:49:53 2013 +0000
@@ -1,20 +1,18 @@
-/* Copyright (c) 2010-2012 mbed.org, MIT License
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-* and associated documentation files (the "Software"), to deal in the Software without
-* restriction, including without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or
-* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+/* 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.
+ */
 
 #ifndef USBENDPOINT_H
 #define USBENDPOINT_H
@@ -24,6 +22,9 @@
 
 class USBDeviceConnected;
 
+/** 
+* USBEndpoint class
+*/
 class USBEndpoint
 {
 public:
@@ -48,7 +49,7 @@
     void init(HCED * hced, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir, uint32_t size, uint8_t ep_number, HCTD* td_list[2]);
 
     /**
-    * Set next token. Warining: only useful for the control endpoint
+    * Set next token. Warning: only useful for the control endpoint
     *
     * @param token IN, OUT or SETUP token
     */
@@ -57,7 +58,7 @@
     /**
     * Queue an endpoint
     *
-    * endpoint endpoint which will be queued in the linked list
+    * @param endpoint endpoint which will be queued in the linked list
     */
     void queueEndpoint(USBEndpoint * endpoint);
 
@@ -92,9 +93,9 @@
      *
      * @param fptr function pointer
      */
-    inline void attach(void (*fn)(void)) {
-        if(fn != NULL) {
-            rx.attach(fn);
+    inline void attach(void (*fptr)(void)) {
+        if(fptr != NULL) {
+            rx.attach(fptr);
         }
     }