Changeset 7ce0fe3 in mainline

Timestamp:

2011-02-01T22:02:23Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

afcd86e

Parents:

993a1e1

Message:

Root ub driver uses unified debug logging and some other polishing.

Location:

uspace/drv/uhci-rhd

Files:

• debug.h (deleted)
• main.c (modified) (3 diffs)
• name.h (deleted)
• port.c (modified) (12 diffs)
• port_status.c (modified) (2 diffs)
• port_status.h (modified) (2 diffs)
• root_hub.c (modified) (4 diffs)
• root_hub.h (modified) (1 diff)

uspace/drv/uhci-rhd/main.c

@@ -28 +28 @@
 #include <driver.h>
 #include <errno.h>
-#include <str_error.h>
+
 #include <usb_iface.h>
+#include <usb/debug.h>
 
-#include "debug.h"
-//#include "iface.h"
 #include "root_hub.h"
+
+#define NAME "uhci-rhd"
 
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
 {
-        /* This shall be called only for the UHCI itself. */
         assert(dev);
         assert(dev->driver_data);
+        assert(handle);
+
         *handle = ((uhci_root_hub_t*)dev->driver_data)->hc_handle;
+        usb_log_debug("Answering HC handle: %d.\n", *handle);
 
         return EOK;
@@ -58 +61 @@
                 return ENOTSUP;
 
-        uhci_print_info("%s called device %d\n", __FUNCTION__, device->handle);
+        usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
         device->ops = &uhci_rh_ops;
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
         if (!rh) {
+                usb_log_error("Failed to allocate memory for driver instance.\n");
                 return ENOMEM;
         }
+
+        /* TODO: get register values from hc */
         int ret = uhci_root_hub_init(rh, (void*)0xc030, 4, device);
         if (ret != EOK) {
+                usb_log_error("Failed(%d) to initialize driver instance.\n", ret);
                 free(rh);
                 return ret;
         }
+
         device->driver_data = rh;
+        usb_log_info("Sucessfully initialized driver isntance for device:%d.\n",
+            device->handle);
         return EOK;
 }
@@ -85 +95 @@
 int main(int argc, char *argv[])
 {
-        /*
-         * Do some global initializations.
-         */
-        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
-
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         return driver_main(&uhci_rh_driver);
 }

uspace/drv/uhci-rhd/port.c

@@ -1 +1 @@
 
 #include <errno.h>
+
 #include <usb/usb.h>    /* usb_address_t */
 #include <usb/usbdrv.h> /* usb_drv_*     */
+#include <usb/debug.h>
 
-#include "debug.h"
 #include "port.h"
 #include "port_status.h"
@@ -27 +28 @@
         port->checker = fibril_create(uhci_port_check, port);
         if (port->checker == 0) {
-                uhci_print_error(": failed to launch root hub fibril.");
+                usb_log_error(": failed to launch root hub fibril.");
                 return ENOMEM;
         }
         fibril_add_ready(port->checker);
-        uhci_print_verbose(
+        usb_log_debug(
           "Added fibril for port %d: %p.\n", number, port->checker);
         return EOK;
@@ -49 +50 @@
 
         while (1) {
-                uhci_print_verbose("Port(%d) status address %p:\n",
+                usb_log_debug("Port(%d) status address %p:\n",
                   port_instance->number, port_instance->address);
 
@@ -57 +58 @@
 
                 /* debug print */
-                uhci_print_info("Port(%d) status %#.4x\n",
+                usb_log_info("Port(%d) status %#.4x\n",
                   port_instance->number, port_status);
                 print_port_status(port_status);
@@ -79 +80 @@
         assert(port->hc_phone);
 
-        uhci_print_info("Adding new device on port %d.\n", port->number);
+        usb_log_info("Adding new device on port %d.\n", port->number);
 
 
@@ -85 +86 @@
         int ret = usb_drv_reserve_default_address(port->hc_phone);
         if (ret != EOK) {
-                uhci_print_error("Failed to reserve default address.\n");
+                usb_log_error("Failed to reserve default address.\n");
                 return ret;
         }
@@ -92 +93 @@
 
         if (usb_address <= 0) {
-                uhci_print_error("Recieved invalid address(%d).\n", usb_address);
+                usb_log_error("Recieved invalid address(%d).\n", usb_address);
                 return usb_address;
         }
@@ -122 +123 @@
 
         if (ret != EOK) { /* address assigning went wrong */
-                uhci_print_error("Failed(%d) to assign address to the device.\n", ret);
+                usb_log_error("Failed(%d) to assign address to the device.\n", ret);
                 uhci_port_set_enabled(port, false);
                 int release = usb_drv_release_default_address(port->hc_phone);
                 if (release != EOK) {
-                        uhci_print_fatal("Failed to release default address.\n");
+                        usb_log_error("Failed to release default address.\n");
                         return release;
                 }
@@ -135 +136 @@
         ret = usb_drv_release_default_address(port->hc_phone);
         if (ret != EOK) {
-                uhci_print_fatal("Failed to release default address.\n");
+                usb_log_error("Failed to release default address.\n");
                 return ret;
         }
@@ -146 +147 @@
 
         if (ret != EOK) { /* something went wrong */
-                uhci_print_error("Failed(%d) in usb_drv_register_child.\n", ret);
+                usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);
                 uhci_port_set_enabled(port, false);
                 return ENOMEM;
         }
-        uhci_print_info("Sucessfully added device on port(%d) address(%d).\n",
+        usb_log_info("Sucessfully added device on port(%d) address(%d).\n",
                 port->number, usb_address);
 
@@ -160 +161 @@
 static int uhci_port_remove_device(uhci_port_t *port)
 {
-        uhci_print_error("Don't know how to remove device %#x.\n",
+        usb_log_error("Don't know how to remove device %#x.\n",
                 (unsigned int)port->attached_device);
         uhci_port_set_enabled(port, false);
@@ -182 +183 @@
         port_status_write(port->address, port_status);
 
-        uhci_print_info("%s port %d.\n",
+        usb_log_info("%s port %d.\n",
           enabled ? "Enabled" : "Disabled", port->number);
         return EOK;

uspace/drv/uhci-rhd/port_status.c

@@ -2 +2 @@
 #include <stdio.h>
 
-#include "debug.h"
+#include <usb/debug.h>
+
 #include "port_status.h"
 
@@ -30 +31 @@
         unsigned i = 0;
         for (;i < sizeof(flags)/sizeof(struct flag_name); ++i) {
-                uhci_print_verbose("\t%s status: %s.\n", flags[i].name,
+                usb_log_debug("\t%s status: %s.\n", flags[i].name,
                   value & flags[i].flag ? "YES" : "NO");
         }

uspace/drv/uhci-rhd/port_status.h

@@ -35 +35 @@
 #define DRV_UHCI_TD_PORT_STATUS_H
 
-#include <libarch/ddi.h>
+#include <libarch/ddi.h> /* pio_read and pio_write */
+
 #include <stdint.h>
 
@@ -59 +60 @@
 
 static inline void port_status_write(
-  port_status_t * address, port_status_t value)
+  port_status_t *address, port_status_t value)
         { pio_write_16(address, value); }
 

uspace/drv/uhci-rhd/root_hub.c

@@ -6 +6 @@
 
 #include <usb/usbdrv.h>
+#include <usb/debug.h>
 
-#include "debug.h"
 #include "root_hub.h"
 
@@ -18 +18 @@
         int ret;
         ret = usb_drv_find_hc(rh, &instance->hc_handle);
-        uhci_print_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
+        usb_log_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
         if (ret != EOK) {
                 return ret;
@@ -27 +27 @@
         //usb_drv_hc_connect(rh, instance->hc_handle, 0);
         if (rh->parent_phone < 0) {
-                uhci_print_error("Failed to connect to the HC device.\n");
+                usb_log_error("Failed to connect to the HC device.\n");
                 return rh->parent_phone;
         }
@@ -38 +38 @@
 
         if (ret < 0) {
-                uhci_print_error(": Failed to gain access to port registers at %p\n", regs);
+                usb_log_error("Failed to gain access to port registers at %p\n", regs);
                 return ret;
         }

uspace/drv/uhci-rhd/root_hub.h

@@ -52 +52 @@
   uhci_root_hub_t *instance, void *addr, size_t size, device_t *rh);
 
-int uhci_root_hub_fini(uhci_root_hub_t* instance);
+int uhci_root_hub_fini(uhci_root_hub_t *instance);
 #endif
 /**