Diff: USBHost/USBDeviceConnected.h

Revision:

4:b320d68e98e7

Parent:

2:5e8fdc541b98

Child:

8:93da8ea2708b

diff -r 0f5c32575eb8 -r b320d68e98e7 USBHost/USBDeviceConnected.h
--- a/USBHost/USBDeviceConnected.h	Wed Mar 06 17:50:07 2013 +0000
+++ b/USBHost/USBDeviceConnected.h	Tue Mar 12 17:23:37 2013 +0000
@@ -22,6 +22,7 @@
 #include "stdint.h"
 #include "USBEndpoint.h"
 #include "USBHostConf.h"
+#include "rtos.h"
 
 class USBHostHub;
 
@@ -33,6 +34,7 @@
     uint8_t intf_protocol;
     USBEndpoint * ep[MAX_ENDPOINT_PER_INTERFACE];
     FunctionPointer detach;
+    char name[10];
 } INTERFACE; 
 
 class USBDeviceConnected
@@ -141,8 +143,9 @@
     inline void setSizeControlEndpoint(uint32_t size) { sizeControlEndpoint = size; };
     inline void activeAddress(bool active) { activeAddr = active; };
     inline void setEnumerated() { enumerated = true; };
+    inline void setNbIntf(uint8_t nb_intf) {nb_interf = nb_intf; };
     inline void setHubParent(USBHostHub * hub) { hub_parent = hub; };
-    inline void setName(const char * name_) { strcpy(name, name_); };
+    inline void setName(const char * name_, uint8_t intf_nb) { strcpy(intf[intf_nb].name, name_); };
 
     //getters
     inline uint8_t     getPort() { return port; };
@@ -158,7 +161,8 @@
     inline bool        isActiveAddress() { return activeAddr; };
     inline bool        isEnumerated() { return enumerated; };
     inline USBHostHub * getHubParent() { return hub_parent; };
-    inline const char * getName() { return name; };
+    inline uint8_t      getNbIntf() { return nb_interf; };
+    inline const char * getName(uint8_t intf_nb) { return intf[intf_nb].name; };
     
     // in case this device is a hub
     USBHostHub * hub;
@@ -181,10 +185,7 @@
     volatile bool enumerated;
     uint8_t nb_interf;
 
-    char name[10];
-
     void init();
 };
 
 #endif
-