Changeset cd50486 in mainline for uspace/drv

Timestamp:

2011-02-06T22:03:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

Location:

uspace/drv

Files:

• ns8250/ns8250.c (modified) (3 diffs)
• pciintel/pci.c (modified) (2 diffs)
• rootvirt/devices.def (modified) (2 diffs)
• test2/test2.c (modified) (1 diff)
• uhci-hcd/Makefile (added)
• uhci-hcd/callback.c (added)
• uhci-hcd/callback.h (added)
• uhci-hcd/iface.c (added)
• uhci-hcd/iface.h (added)
• uhci-hcd/main.c (moved) (moved from uspace/drv/uhci/main.c ) (5 diffs)
• uhci-hcd/pci.c (moved) (moved from uspace/drv/uhci/pci.c ) (3 diffs)
• uhci-hcd/pci.h (moved) (moved from uspace/drv/uhci/uhci.h ) (2 diffs)
• uhci-hcd/root_hub.c (added)
• uhci-hcd/root_hub.h (added)
• uhci-hcd/transfer_list.c (added)
• uhci-hcd/transfer_list.h (added)
• uhci-hcd/transfers.c (moved) (moved from uspace/drv/uhci/transfers.c )
• uhci-hcd/uhci-hcd.ma (moved) (moved from uspace/drv/uhci/uhci.ma )
• uhci-hcd/uhci.c (added)
• uhci-hcd/uhci.h (added)
• uhci-hcd/uhci_struct/link_pointer.h (added)
• uhci-hcd/uhci_struct/queue_head.h (added)
• uhci-hcd/uhci_struct/transfer_descriptor.c (added)
• uhci-hcd/uhci_struct/transfer_descriptor.h (added)
• uhci-hcd/utils/malloc32.h (added)
• uhci-rhd/Makefile (moved) (moved from uspace/drv/uhci/Makefile ) (2 diffs)
• uhci-rhd/main.c (added)
• uhci-rhd/port.c (added)
• uhci-rhd/port.h (added)
• uhci-rhd/port_status.c (added)
• uhci-rhd/port_status.h (added)
• uhci-rhd/root_hub.c (added)
• uhci-rhd/root_hub.h (added)
• uhci-rhd/uhci-rhd.ma (added)
• usbhid/hid.h (modified) (1 diff)
• usbhid/main.c (modified) (13 diffs)
• usbhub/main.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (29 diffs)
• usbhub/usbhub_private.h (modified) (1 diff)
• usbhub/utils.c (modified) (3 diffs)
• vhc/conndev.c (modified) (2 diffs)
• vhc/devices.c (modified) (1 diff)
• vhc/hc.c (modified) (1 diff)
• vhc/hcd.c (modified) (1 diff)

uspace/drv/ns8250/ns8250.c

@@ -256 +256 @@
         
         if (dev->parent_phone > 0) {
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 dev->parent_phone = 0;
         }
@@ -888 +888 @@
                 ns8250_get_props(dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
-                ipc_answer_4(callid, EOK, baud_rate, parity, word_length,
+                async_answer_4(callid, EOK, baud_rate, parity, word_length,
                     stop_bits);
                 break;
@@ -899 +899 @@
                 ret = ns8250_set_props(dev, baud_rate, parity, word_length,
                     stop_bits);
-                ipc_answer_0(callid, ret);
+                async_answer_0(callid, ret);
                 break;
                 
         default:
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
         }
 }

uspace/drv/pciintel/pci.c

@@ -478 +478 @@
                     "the device.\n");
                 delete_pci_bus_data(bus_data);
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 return rc;
         }       
@@ -496 +496 @@
                 printf(NAME ": failed to enable configuration ports.\n");
                 delete_pci_bus_data(bus_data);
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 hw_res_clean_resource_list(&hw_resources);
                 return EADDRNOTAVAIL;

uspace/drv/rootvirt/devices.def

@@ -22 +22 @@
 },
 #endif
+#ifdef CONFIG_RUN_VIRTUAL_USB_HC
 /* Virtual USB host controller. */
 {
@@ -27 +28 @@
         .match_id = "usb&hc=vhc"
 },
+#endif

uspace/drv/test2/test2.c

@@ -103 +103 @@
         if (dev->parent == NULL) {
                 fid_t postpone = fibril_create(postponed_birth, dev);
+                if (postpone == 0) {
+                        printf(NAME ": fibril_create() error\n");
+                        return ENOMEM;
+                }
                 fibril_add_ready(postpone);
         } else {

uspace/drv/uhci-hcd/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky, Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
+/** @addtogroup usb
+ * @{
+ */
+/** @file
+ * @brief UHCI driver
+ */
+#include <driver.h>
 #include <usb_iface.h>
+
+#include <errno.h>
+
 #include <usb/debug.h>
-#include <errno.h>
-#include <str_error.h>
-#include <driver.h>
+
+#include "iface.h"
+#include "pci.h"
+#include "root_hub.h"
 #include "uhci.h"
+
+#define NAME "uhci-hcd"
 
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
@@ -54 +66 @@
 static int uhci_add_device(device_t *device)
 {
-        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
+        assert(device);
+
+        usb_log_info("uhci_add_device() called\n");
         device->ops = &uhci_ops;
 
@@ -65 +79 @@
 
         if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to get I/O registers addresses: %s.\n",
-                    str_error(rc));
+                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                    rc, device->handle);
                 return rc;
         }
 
-        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+        usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
 
-        /*
-         * We need to announce the presence of our root hub.
-         */
-        usb_dprintf(NAME, 2, "adding root hub\n");
-        usb_hcd_add_root_hub(device);
+        uhci_t *uhci_hc = malloc(sizeof(uhci_t));
+        if (!uhci_hc) {
+                usb_log_error("Failed to allocaete memory for uhci hcd driver.\n");
+                return ENOMEM;
+        }
+
+        int ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
+        if (ret != EOK) {
+                usb_log_error("Failed to init uhci-hcd.\n");
+                return ret;
+        }
+        device_t *rh;
+        ret = setup_root_hub(&rh, device);
+
+        if (ret != EOK) {
+                usb_log_error("Failed to setup uhci root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        ret = child_device_register(rh, device);
+        if (ret != EOK) {
+                usb_log_error("Failed to register root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        device->driver_data = uhci_hc;
 
         return EOK;
@@ -98 +134 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, 5);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);
 }
+/**
+ * @}
+ */

uspace/drv/uhci-hcd/pci.c

@@ -34 +34 @@
  * PCI related functions needed by the UHCI driver.
  */
-#include "uhci.h"
 #include <errno.h>
 #include <assert.h>
 #include <devman.h>
 #include <device/hw_res.h>
+
+#include "pci.h"
 
 /** Get address of registers and IRQ for given device.
@@ -116 +117 @@
         rc = EOK;
 leave:
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         return rc;
@@ -125 +126 @@
  */
 
+/**
+ * @}
+ */

uspace/drv/uhci-hcd/pci.h

@@ -33 +33 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_UHCI_H
-#define DRV_UHCI_UHCI_H
+#ifndef DRV_UHCI_PCI_H
+#define DRV_UHCI_PCI_H
 
-#include <usbhc_iface.h>
-
-#define NAME "uhci"
-
-usbhc_iface_t uhci_iface;
+#include <driver.h>
 
 int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
@@ -48 +44 @@
  * @}
  */
+

uspace/drv/uhci-rhd/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2010 Jan Vesely
 # All rights reserved.
 #
@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
-BINARY = uhci
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
+BINARY = uhci-rhd
 
 SOURCES = \
         main.c \
-        pci.c \
-        transfers.c
+        port.c \
+        port_status.c \
+        root_hub.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/usbhid/hid.h

@@ -69 +69 @@
         device_t *device;
         usb_hid_configuration_t *conf;
+        usb_address_t address;
         usb_hid_report_parser_t *parser;
 
         usb_device_connection_t wire;
-        usb_endpoint_pipe_t ctrl_pipe;
         usb_endpoint_pipe_t poll_pipe;
 } usb_hid_dev_kbd_t;

uspace/drv/usbhid/main.c

@@ -47 +47 @@
 #include <usb/classes/hid.h>
 #include <usb/classes/hidparser.h>
-#include <usb/request.h>
+#include <usb/devreq.h>
 #include <usb/descriptor.h>
 #include <io/console.h>
@@ -56 +56 @@
 #include "layout.h"
 
-#define BUFFER_SIZE 32
+#define BUFFER_SIZE 8
 #define NAME "usbhid"
 
@@ -83 +83 @@
 
                 if (console_callback_phone != -1) {
-                        ipc_answer_0(icallid, ELIMIT);
+                        async_answer_0(icallid, ELIMIT);
                         return;
                 }
 
                 console_callback_phone = callback;
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
                 return;
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 
@@ -262 +262 @@
 }
 
+# if 0
 /*
  * Kbd functions
@@ -280 +281 @@
                 
                 // get the descriptor from the device
-                int rc = usb_request_get_descriptor(&kbd_dev->ctrl_pipe,
-                    USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT,
-                    i, 0,
-                    kbd_dev->conf->interfaces[i].report_desc, length,
+                int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
+                    kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 
+                    0, i, kbd_dev->conf->interfaces[i].report_desc, length, 
                     &actual_size);
 
@@ -298 +298 @@
         return EOK;
 }
-
 static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
 {
@@ -304 +303 @@
         usb_standard_configuration_descriptor_t config_desc;
         
-        int rc;
-        rc = usb_request_get_bare_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, &config_desc);
+        int rc = usb_drv_req_get_bare_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, &config_desc);
         
         if (rc != EOK) {
@@ -320 +318 @@
         size_t transferred = 0;
         // get full configuration descriptor
-        rc = usb_request_get_full_configuration_descriptor(&kbd_dev->ctrl_pipe,
-            0, descriptors,
+        rc = usb_drv_req_get_full_configuration_descriptor(
+            kbd_dev->device->parent_phone, kbd_dev->address, 0, descriptors,
             config_desc.total_length, &transferred);
         
@@ -365 +363 @@
         return EOK;
 }
-
+#endif
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        int rc;
-
         usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
             sizeof(usb_hid_dev_kbd_t));
@@ -380 +376 @@
         kbd_dev->device = dev;
 
+        // get phone to my HC and save it as my parent's phone
+        // TODO: maybe not a good idea if DDF will use parent_phone
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                goto error_leave;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                goto error_leave;
+        }
+
+        // doesn't matter now that we have no address
+//      if (kbd_dev->address < 0) {
+//              fprintf(stderr, NAME ": No device address!\n");
+//              free(kbd_dev);
+//              return NULL;
+//      }
+
+        /*
+         * will need all descriptors:
+         * 1) choose one configuration from configuration descriptors 
+         *    (set it to the device)
+         * 2) set endpoints from endpoint descriptors
+         */
+
+
+        // TODO: get descriptors, parse descriptors and save endpoints
+        //usbkbd_process_descriptors(kbd_dev);
+        usb_drv_req_set_configuration(
+          kbd_dev->device->parent_phone, kbd_dev->address, 1);
+
+
+
         /*
          * Initialize the backing connection to the host controller.
@@ -393 +425 @@
          * Initialize device pipes.
          */
-        rc = usb_endpoint_pipe_initialize_default_control(&kbd_dev->ctrl_pipe,
-            &kbd_dev->wire);
-        if (rc != EOK) {
-                printf("Failed to initialize default control pipe: %s.\n",
-                    str_error(rc));
-                goto error_leave;
-        }
-
         rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
             GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN);
@@ -409 +433 @@
         }
 
-        /*
-         * will need all descriptors:
-         * 1) choose one configuration from configuration descriptors
-         *    (set it to the device)
-         * 2) set endpoints from endpoint descriptors
-         */
-
-        // TODO: get descriptors, parse descriptors and save endpoints
-        usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
-        usbkbd_process_descriptors(kbd_dev);
-        usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
 
         return kbd_dev;
@@ -457 +470 @@
 
         while (true) {
-                async_usleep(1000 * 1000 * 2);
+                async_usleep(1000 * 10);
 
                 sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->poll_pipe);

uspace/drv/usbhub/main.c

@@ -37 +37 @@
 #include <usb/usbdrv.h>
 
+
 #include "usbhub.h"
 #include "usbhub_private.h"
@@ -64 +65 @@
 int main(int argc, char *argv[])
 {
-        usb_dprintf_enable(NAME, 0);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         
         fibril_mutex_initialize(&usb_hub_list_lock);

uspace/drv/usbhub/usbhub.c

@@ -70 +70 @@
 
 
-        //printf("[usb_hub] phone to hc = %d\n", hc);
+        dprintf(USB_LOG_LEVEL_DEBUG, "phone to hc = %d", hc);
         if (hc < 0) {
                 return result;
@@ -76 +76 @@
         //get some hub info
         usb_address_t addr = usb_drv_get_my_address(hc, device);
-        dprintf(1, "address of newly created hub = %d", addr);
+        dprintf(USB_LOG_LEVEL_DEBUG, "address of newly created hub = %d", addr);
         /*if(addr<0){
                 //return result;
@@ -87 +87 @@
         // get hub descriptor
 
-        //printf("[usb_hub] creating serialized descriptor\n");
+        dprintf(USB_LOG_LEVEL_DEBUG, "creating serialized descripton");
         void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         usb_hub_descriptor_t * descriptor;
         size_t received_size;
         int opResult;
-        //printf("[usb_hub] starting control transaction\n");
+        dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
         
         opResult = usb_drv_req_get_descriptor(hc, addr,
@@ -100 +100 @@
 
         if (opResult != EOK) {
-                dprintf(1, "failed when receiving hub descriptor, badcode = %d",opResult);
+                dprintf(USB_LOG_LEVEL_ERROR, "failed when receiving hub descriptor, badcode = %d",opResult);
                 free(serialized_descriptor);
                 return result;
         }
-        //printf("[usb_hub] deserializing descriptor\n");
+        dprintf(USB_LOG_LEVEL_DEBUG2, "deserializing descriptor");
         descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
         if(descriptor==NULL){
-                dprintf(1, "could not deserialize descriptor ");
+                dprintf(USB_LOG_LEVEL_WARNING, "could not deserialize descriptor ");
                 result->port_count = 1;///\TODO this code is only for debug!!!
                 return result;
         }
-        //printf("[usb_hub] setting port count to %d\n",descriptor->ports_count);
+        dprintf(USB_LOG_LEVEL_INFO, "setting port count to %d",descriptor->ports_count);
         result->port_count = descriptor->ports_count;
         result->attached_devs = (usb_hub_attached_device_t*)
@@ -120 +120 @@
                 result->attached_devs[i].address=0;
         }
-        //printf("[usb_hub] freeing data\n");
+        dprintf(USB_LOG_LEVEL_DEBUG2, "freeing data");
         free(serialized_descriptor);
         free(descriptor->devices_removable);
@@ -127 +127 @@
         //finish
 
-        dprintf(1, "hub info created");
+        dprintf(USB_LOG_LEVEL_INFO, "hub info created");
 
         return result;
@@ -133 +133 @@
 
 int usb_add_hub_device(device_t *dev) {
-        dprintf(1, "add_hub_device(handle=%d)", (int) dev->handle);
-        dprintf(1, "hub device");
+        dprintf(USB_LOG_LEVEL_INFO, "add_hub_device(handle=%d)", (int) dev->handle);
 
         /*
@@ -164 +163 @@
             &std_descriptor);
         if(opResult!=EOK){
-                dprintf(1, "could not get device descriptor, %d",opResult);
+                dprintf(USB_LOG_LEVEL_ERROR, "could not get device descriptor, %d",opResult);
                 return opResult;
         }
-        dprintf(1, "hub has %d configurations",std_descriptor.configuration_count);
+        dprintf(USB_LOG_LEVEL_INFO, "hub has %d configurations",std_descriptor.configuration_count);
         if(std_descriptor.configuration_count<1){
-                dprintf(1, "THERE ARE NO CONFIGURATIONS AVAILABLE");
+                dprintf(USB_LOG_LEVEL_ERROR, "THERE ARE NO CONFIGURATIONS AVAILABLE");
                 //shouldn`t I return?
         }
@@ -178 +177 @@
         &config_descriptor);
         if(opResult!=EOK){
-                dprintf(1, "could not get configuration descriptor, %d",opResult);
+                dprintf(USB_LOG_LEVEL_ERROR, "could not get configuration descriptor, %d",opResult);
                 return opResult;
         }
@@ -186 +185 @@
 
         if (opResult != EOK) {
-                dprintf(1, "something went wrong when setting hub`s configuration, %d", opResult);
+                dprintf(USB_LOG_LEVEL_ERROR, "something went wrong when setting hub`s configuration, %d", opResult);
         }
 
@@ -193 +192 @@
                 usb_hub_set_power_port_request(&request, port);
                 opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
-                dprintf(1, "powering port %d",port);
+                dprintf(USB_LOG_LEVEL_INFO, "powering port %d",port);
                 if (opResult != EOK) {
-                        dprintf(1, "something went wrong when setting hub`s %dth port", port);
+                        dprintf(USB_LOG_LEVEL_WARNING, "something went wrong when setting hub`s %dth port", port);
                 }
         }
         //ports powered, hub seems to be enabled
 
-        ipc_hangup(hc);
+        async_hangup(hc);
 
         //add the hub to list
@@ -207 +206 @@
         fibril_mutex_unlock(&usb_hub_list_lock);
 
-        dprintf(1, "hub info added to list");
+        dprintf(USB_LOG_LEVEL_DEBUG, "hub info added to list");
         //(void)hub_info;
         usb_hub_check_hub_changes();
@@ -213 +212 @@
         
 
-        dprintf(1, "hub dev added");
-        dprintf(1, "\taddress %d, has %d ports ",
+        dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
+        dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
                         hub_info->usb_device->address,
                         hub_info->port_count);
-        dprintf(1, "\tused configuration %d",config_descriptor.configuration_number);
+        dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
 
         return EOK;
@@ -238 +237 @@
 inline static int usb_hub_release_default_address(int hc){
         int opResult;
-        dprintf(1, "releasing default address");
+        dprintf(USB_LOG_LEVEL_INFO, "releasing default address");
         opResult = usb_drv_release_default_address(hc);
         if (opResult != EOK) {
-                dprintf(1, "failed to release default address");
+                dprintf(USB_LOG_LEVEL_WARNING, "failed to release default address");
         }
         return opResult;
@@ -255 +254 @@
         usb_device_request_setup_packet_t request;
         int opResult;
-        dprintf(1, "some connection changed");
+        dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
         //get default address
         opResult = usb_drv_reserve_default_address(hc);
         if (opResult != EOK) {
-                dprintf(1, "cannot assign default address, it is probably used");
+                dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
                 return;
         }
@@ -270 +269 @@
                         );
         if (opResult != EOK) {
-                dprintf(1, "something went wrong when reseting a port");
+                dprintf(USB_LOG_LEVEL_ERROR, "something went wrong when reseting a port");
                 usb_hub_release_default_address(hc);
         }
@@ -285 +284 @@
 
         int opResult;
-        dprintf(1, "finalizing add device");
+        dprintf(USB_LOG_LEVEL_INFO, "finalizing add device");
         opResult = usb_hub_clear_port_feature(hc, target.address,
             port, USB_HUB_FEATURE_C_PORT_RESET);
         if (opResult != EOK) {
-                dprintf(1, "failed to clear port reset feature");
+                dprintf(USB_LOG_LEVEL_ERROR, "failed to clear port reset feature");
                 usb_hub_release_default_address(hc);
                 return;
@@ -297 +296 @@
         usb_address_t new_device_address = usb_drv_request_address(hc);
         if (new_device_address < 0) {
-                dprintf(1, "failed to get free USB address");
+                dprintf(USB_LOG_LEVEL_ERROR, "failed to get free USB address");
                 opResult = new_device_address;
                 usb_hub_release_default_address(hc);
                 return;
         }
-        dprintf(1, "setting new address");
+        dprintf(USB_LOG_LEVEL_INFO, "setting new address %d",new_device_address);
         opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
             new_device_address);
 
         if (opResult != EOK) {
-                dprintf(1, "could not set address for new device");
+                dprintf(USB_LOG_LEVEL_ERROR, "could not set address for new device");
                 usb_hub_release_default_address(hc);
                 return;
@@ -322 +321 @@
             new_device_address, &child_handle);
         if (opResult != EOK) {
-                dprintf(1, "could not start driver for new device");
+                dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");
                 return;
         }
@@ -330 +329 @@
         opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
         if (opResult != EOK) {
-                dprintf(1, "could not assign address of device in hcd");
-                return;
-        }
-        dprintf(1, "new device address %d, handle %zu",
+                dprintf(USB_LOG_LEVEL_ERROR, "could not assign address of device in hcd");
+                return;
+        }
+        dprintf(USB_LOG_LEVEL_INFO, "new device address %d, handle %zu",
             new_device_address, child_handle);
 
@@ -358 +357 @@
                 opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
                 if(opResult != EOK) {
-                        dprintf(1, "could not release address of " \
+                        dprintf(USB_LOG_LEVEL_WARNING, "could not release address of " \
                             "removed device: %d", opResult);
                 }
                 hub->attached_devs[port].address = 0;
         }else{
-                dprintf(1, "this is strange, disconnected device had no address");
+                dprintf(USB_LOG_LEVEL_WARNING, "this is strange, disconnected device had no address");
                 //device was disconnected before it`s port was reset - return default address
                 usb_drv_release_default_address(hc);
@@ -377 +376 @@
 static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc,
         uint16_t port, usb_address_t address) {
-        dprintf(1, "interrupt at port %d", port);
+        dprintf(USB_LOG_LEVEL_DEBUG, "interrupt at port %d", port);
         //determine type of change
         usb_target_t target;
@@ -395 +394 @@
                         );
         if (opResult != EOK) {
-                dprintf(1, "ERROR: could not get port status");
+                dprintf(USB_LOG_LEVEL_ERROR, "ERROR: could not get port status");
                 return;
         }
         if (rcvd_size != sizeof (usb_port_status_t)) {
-                dprintf(1, "ERROR: received status has incorrect size");
+                dprintf(USB_LOG_LEVEL_ERROR, "ERROR: received status has incorrect size");
                 return;
         }
@@ -408 +407 @@
                 // TODO: check opResult
                 if (usb_port_dev_connected(&status)) {
-                        dprintf(1, "some connection changed");
+                        dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
                         usb_hub_init_add_device(hc, port, target);
                 } else {
@@ -416 +415 @@
         //port reset
         if (usb_port_reset_completed(&status)) {
-                dprintf(1, "port reset complete");
+                dprintf(USB_LOG_LEVEL_INFO, "port reset complete");
                 if (usb_port_enabled(&status)) {
                         usb_hub_finalize_add_device(hub, hc, port, target);
                 } else {
-                        dprintf(1, "ERROR: port reset, but port still not enabled");
+                        dprintf(USB_LOG_LEVEL_WARNING, "ERROR: port reset, but port still not enabled");
                 }
         }
@@ -429 +428 @@
         usb_port_set_dev_connected(&status, false);
         if (status>>16) {
-                dprintf(1, "there was some unsupported change on port %d: %X",port,status);
+                dprintf(USB_LOG_LEVEL_INFO, "there was some unsupported change on port %d: %X",port,status);
 
         }
@@ -458 +457 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
-                dprintf(1, "checking changes for hub at addr %d",
+                dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d",
                     target.address);
 
@@ -489 +488 @@
                 if (opResult != EOK) {
                         free(change_bitmap);
-                        dprintf(1, "something went wrong while getting status of hub");
+                        dprintf(USB_LOG_LEVEL_WARNING, "something went wrong while getting status of hub");
                         continue;
                 }
@@ -503 +502 @@
                 free(change_bitmap);
 
-                ipc_hangup(hc);
+                async_hangup(hc);
                 fibril_mutex_lock(&usb_hub_list_lock);
         }

uspace/drv/usbhub/usbhub_private.h

@@ -61 +61 @@
 //************
 //
-// convenience debug printf
+// convenience debug printf for usb hub
 //
 //************
 #define dprintf(level, format, ...) \
-        usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__)
+        usb_log_printf((level), format "\n", ##__VA_ARGS__)
+
 
 /**

uspace/drv/usbhub/utils.c

@@ -116 +116 @@
 
 int usb_drv_sync_control_read(
-                int phone, usb_target_t target,
-                usb_device_request_setup_packet_t * request,
-                void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
-                ) {
+    int phone, usb_target_t target,
+    usb_device_request_setup_packet_t * request,
+    void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
+) {
         usb_handle_t handle;
         int opResult;
         //setup
         opResult = usb_drv_async_control_read_setup(phone, target,
-                        request, sizeof (usb_device_request_setup_packet_t),
-                        &handle);
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
         if (opResult != EOK) {
                 return opResult;
@@ -158 +158 @@
 
 int usb_drv_sync_control_write(
-                int phone, usb_target_t target,
-                usb_device_request_setup_packet_t * request,
-                void * sent_buffer, size_t sent_size
-                ) {
+    int phone, usb_target_t target,
+    usb_device_request_setup_packet_t * request,
+    void * sent_buffer, size_t sent_size
+) {
         usb_handle_t handle;
         int opResult;
         //setup
         opResult = usb_drv_async_control_write_setup(phone, target,
-                        request, sizeof (usb_device_request_setup_packet_t),
-                        &handle);
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
         if (opResult != EOK) {
                 return opResult;
@@ -188 +188 @@
         //finalize
         opResult = usb_drv_async_control_write_status(phone, target,
-                        &handle);
+            &handle);
         if (opResult != EOK) {
                 return opResult;

uspace/drv/vhc/conndev.c

@@ -90 +90 @@
                     = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
                 if (!dev) {
-                        ipc_answer_0(icallid, EEXISTS);
-                        ipc_hangup(callback);
+                        async_answer_0(icallid, EEXISTS);
+                        async_hangup(callback);
                         return;
                 }
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
 
                 char devname[DEVICE_NAME_MAXLENGTH + 1];
@@ -105 +105 @@
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 

uspace/drv/vhc/devices.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hc.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hcd.c

@@ -35 +35 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>