Changes in uspace/drv/usbhub/usbhub.c [7d521e24:152ec79] in mainline

File:

• uspace/drv/usbhub/usbhub.c (modified) (5 diffs)

uspace/drv/usbhub/usbhub.c

@@ -42 +42 @@
 #include <usb/ddfiface.h>
 #include <usb/descriptor.h>
-#include <usb/dev/recognise.h>
-#include <usb/dev/request.h>
+#include <usb/recognise.h>
+#include <usb/request.h>
 #include <usb/classes/hub.h>
-#include <usb/dev/poll.h>
+#include <usb/devpoll.h>
 #include <stdio.h>
 
@@ -51 +51 @@
 #include "usbhub_private.h"
 #include "port_status.h"
-#include <usb/usb.h>
-#include <usb/dev/pipes.h>
-#include <usb/classes/classes.h>
+#include "usb/usb.h"
+#include "usb/pipes.h"
+#include "usb/classes/classes.h"
 
 
@@ -71 +71 @@
 
 static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info);
-
-static void usb_hub_polling_terminted_callback(usb_device_t * device,
-    bool was_error, void * data);
 
 
@@ -354 +351 @@
         rc = usb_device_auto_poll(hub_info->usb_device, 0,
             hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1,
-            usb_hub_polling_terminted_callback, hub_info);
+            NULL, hub_info);
         if (rc != EOK) {
                 usb_log_error("Failed to create polling fibril: %s.\n",
@@ -492 +489 @@
 
 /**
- * callback called from hub polling fibril when the fibril terminates
- *
- * Should perform a cleanup - deletes hub_info.
- * @param device usb device afected
- * @param was_error indicates that the fibril is stoped due to an error
- * @param data pointer to usb_hub_info_t structure
- */
-static void usb_hub_polling_terminted_callback(usb_device_t * device,
-    bool was_error, void * data){
-        usb_hub_info_t * hub_info = data;
-        if(!hub_info) return;
-        free(hub_info->ports);
-        free(hub_info);
-}
-
-
-
-
-/**
  * @}
  */