Changes in uspace/drv/usbhub/usbhub_private.h [5097bed4:f9a0cef] in mainline

File:

• uspace/drv/usbhub/usbhub_private.h (modified) (5 diffs)

uspace/drv/usbhub/usbhub_private.h

@@ -38 +38 @@
 
 #include "usbhub.h"
-#include "usblist.h"
-
 #include <adt/list.h>
 #include <bool.h>
 #include <driver.h>
-#include <futex.h>
-
 #include <usb/usb.h>
-#include <usb/usbdrv.h>
 #include <usb/classes/hub.h>
 #include <usb/devreq.h>
-#include <usb/debug.h>
 
 //************
@@ -61 +55 @@
 //************
 //
-// convenience debug printf
-//
-//************
-#define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
-
-/**
- * create hub structure instance
+// My private list implementation; I did not like the original helenos list
+//
+// This one does not depend on the structure of stored data
+//
+//************
+
+/** general list structure */
+
+
+typedef struct usb_general_list{
+        void * data;
+        struct usb_general_list * prev, * next;
+} usb_general_list_t;
+
+/** create head of usb general list */
+usb_general_list_t * usb_lst_create(void);
+
+/** initialize head of usb general list */
+void usb_lst_init(usb_general_list_t * lst);
+
+
+/** is the list empty? */
+static inline bool usb_lst_empty(usb_general_list_t * lst){
+        return lst?(lst->next==lst):true;
+}
+
+/** append data behind item */
+void usb_lst_append(usb_general_list_t * lst, void * data);
+
+/** prepend data beore item */
+void usb_lst_prepend(usb_general_list_t * lst, void * data);
+
+/** remove list item from list */
+void usb_lst_remove(usb_general_list_t * item);
+
+/** get data o specified type from list item */
+#define usb_lst_get_data(item, type)  (type *) (item->data)
+
+/** get usb_hub_info_t data from list item */
+static inline usb_hub_info_t * usb_hub_lst_get_data(usb_general_list_t * item) {
+        return usb_lst_get_data(item,usb_hub_info_t);
+}
+
+/**
+ * @brief create hub structure instance
  *
  * Set the address and port count information most importantly.
@@ -81 +112 @@
 extern usb_general_list_t usb_hub_list;
 
-/** lock for hub list*/
-extern futex_t usb_hub_list_lock;
-
-
-/**
- * perform complete control read transaction
+
+/**
+ * @brief perform complete control read transaction
  *
  * manages all three steps of transaction: setup, read and finalize
@@ -104 +132 @@
 
 /**
- * perform complete control write transaction
- *
- * manages all three steps of transaction: setup, write and finalize
+ * @brief perform complete control write transaction
+ *
+ * maanges all three steps of transaction: setup, write and finalize
  * @param phone
  * @param target
@@ -119 +147 @@
     void * sent_buffer, size_t sent_size
 );
+
+
+/**
+ * set the device request to be a set address request
+ * @param request
+ * @param addr
+ * \TODO this will be obsolete see usb/dev_req.h
+ */
+static inline void usb_hub_set_set_address_request(
+usb_device_request_setup_packet_t * request, uint16_t addr
+){
+        request->index = 0;
+        request->request_type = 0;/// \TODO this is not very nice sollution, we ned constant
+        request->request = USB_DEVREQ_SET_ADDRESS;
+        request->value = addr;
+        request->length = 0;
+}
 
 /**