Changeset afcd86e in mainline

Timestamp:

2011-02-01T22:19:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56dbe0

Parents:

7ce0fe3

Message:

Driver uhci-hcd uses unified debug log

Location:

uspace/drv/uhci-hcd

Files:

• callback.c (modified) (4 diffs)
• callback.h (modified) (1 diff)
• debug.h (deleted)
• main.c (modified) (7 diffs)
• name.h (deleted)
• root_hub.c (modified) (6 diffs)
• transfer_list.c (modified) (3 diffs)
• transfer_list.h (modified) (1 diff)
• uhci.c (modified) (14 diffs)
• uhci_struct/transfer_descriptor.c (modified) (2 diffs)

uspace/drv/uhci-hcd/callback.c

@@ -1 +1 @@
 #include <errno.h>
 #include <mem.h>
+
+#include <usb/debug.h>
 
 #include "callback.h"
@@ -12 +14 @@
                 instance->new_buffer = malloc32(size);
                 if (!instance->new_buffer) {
-                        uhci_print_error("Failed to allocate device acessible buffer.\n");
+                        usb_log_error("Failed to allocate device acessible buffer.\n");
                         return ENOMEM;
                 }
@@ -46 +48 @@
         if (instance->callback_in) {
                 assert(instance->callback_out == NULL);
-                uhci_print_verbose("Callback in: %p %x %d.\n",
+                usb_log_debug("Callback in: %p %x %d.\n",
                   instance->callback_in, outcome, act_size);
                 instance->callback_in(
@@ -53 +55 @@
                 assert(instance->callback_out);
                 assert(instance->callback_in == NULL);
-                uhci_print_verbose("Callback out: %p %p %x %p .\n",
+                usb_log_debug("Callback out: %p %p %x %p .\n",
                  instance->callback_out, instance->dev, outcome, instance->arg);
                 instance->callback_out(

uspace/drv/uhci-hcd/callback.h

@@ -38 +38 @@
 #include <usb/usb.h>
 
-#include "debug.h"
 #include "utils/malloc32.h"
 

uspace/drv/uhci-hcd/main.c

@@ -28 +28 @@
 #include <driver.h>
 #include <errno.h>
-#include <str_error.h>
 #include <usb_iface.h>
 
-#include "debug.h"
+#include <usb/debug.h>
+
 #include "iface.h"
-#include "name.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)
@@ -58 +59 @@
 static int uhci_add_device(device_t *device)
 {
-        uhci_print_info( "uhci_add_device() called\n" );
+        assert(device);
+
+        usb_log_info("uhci_add_device() called\n");
         device->ops = &uhci_ops;
 
@@ -69 +72 @@
 
         if (rc != EOK) {
-                uhci_print_fatal("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;
         }
 
-        uhci_print_info("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);
 
@@ -80 +83 @@
 
         if (ret != EOK) {
-                uhci_print_error("Failed to init uhci-hcd.\n");
+                usb_log_error("Failed to init uhci-hcd.\n");
                 return ret;
         }
@@ -87 +90 @@
 
         if (ret != EOK) {
-                uhci_print_error("Failed to setup uhci root hub.\n");
+                usb_log_error("Failed to setup uhci root hub.\n");
                 /* TODO: destroy uhci here */
                 return ret;
@@ -94 +97 @@
         ret = child_device_register(rh, device);
         if (ret != EOK) {
-                uhci_print_error("Failed to register root hub.\n");
+                usb_log_error("Failed to register root hub.\n");
                 /* TODO: destroy uhci here */
                 return ret;
@@ -117 +120 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);

uspace/drv/uhci-hcd/root_hub.c

@@ -2 +2 @@
 #include <errno.h>
 #include <stdio.h>
+
 #include <usb_iface.h>
 
-#include "debug.h"
+#include <usb/debug.h>
+
 #include "root_hub.h"
 /*----------------------------------------------------------------------------*/
@@ -27 +29 @@
 }
 /*----------------------------------------------------------------------------*/
-
 static usb_iface_t usb_iface = {
   .get_hc_handle = usb_iface_get_hc_handle
@@ -41 +42 @@
         device_t *hub = create_device();
         if (!hub) {
-                uhci_print_error("Failed to create root hub device structure.\n");
+                usb_log_error("Failed to create root hub device structure.\n");
                 return ENOMEM;
         }
@@ -47 +48 @@
         int ret = asprintf(&name, "UHCI Root Hub");
         if (ret < 0) {
-                uhci_print_error("Failed to create root hub name.\n");
+                usb_log_error("Failed to create root hub name.\n");
                 free(hub);
                 return ENOMEM;
@@ -55 +56 @@
         ret = asprintf(&match_str, "usb&uhci&root-hub");
         if (ret < 0) {
-                uhci_print_error("Failed to create root hub match string.\n");
+                usb_log_error("Failed to create root hub match string.\n");
                 free(hub);
                 free(name);
@@ -63 +64 @@
         match_id_t *match_id = create_match_id();
         if (!match_id) {
-                uhci_print_error("Failed to create root hub match id.\n");
+                usb_log_error("Failed to create root hub match id.\n");
                 free(hub);
                 free(match_str);

uspace/drv/uhci-hcd/transfer_list.c

@@ -1 +1 @@
 #include <errno.h>
+
+#include <usb/debug.h>
 
 #include "transfer_list.h"
@@ -10 +12 @@
         instance->queue_head = malloc32(sizeof(queue_head_t));
         if (!instance->queue_head) {
-                uhci_print_error("Failed to allocate queue head.\n");
+                usb_log_error("Failed to allocate queue head.\n");
                 return ENOMEM;
         }
@@ -46 +48 @@
                 instance->queue_head->element = (pa & LINK_POINTER_ADDRESS_MASK);
         }
-        uhci_print_verbose("Successfully added transfer to the hc queue %p.\n",
+        usb_log_debug("Successfully added transfer to the hc queue %p.\n",
           instance);
         return EOK;

uspace/drv/uhci-hcd/transfer_list.h

@@ -35 +35 @@
 #define DRV_UHCI_TRANSFER_LIST_H
 
-#include "debug.h"
 #include "uhci_struct/queue_head.h"
 #include "uhci_struct/transfer_descriptor.h"

uspace/drv/uhci-hcd/uhci.c

@@ -1 +1 @@
 #include <errno.h>
+
 #include <usb/debug.h>
 #include <usb/usb.h>
 
 #include "utils/malloc32.h"
-
-#include "debug.h"
-#include "name.h"
 #include "uhci.h"
 
@@ -16 +14 @@
 {
         assert(device);
-        uhci_print_info("Initializing device at address %p.\n", device);
+        usb_log_info("Initializing device at address %p.\n", device);
 
 #define CHECK_RET_FREE_INSTANCE(message...) \
         if (ret != EOK) { \
-                uhci_print_error(message); \
+                usb_log_error(message); \
                 if (instance) { \
                         free(instance); \
@@ -36 +34 @@
         /* init address keeper(libusb) */
         usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
-        uhci_print_verbose("Initialized address manager.\n");
+        usb_log_debug("Initialized address manager.\n");
 
         /* allow access to hc control registers */
@@ -44 +42 @@
         CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
         instance->registers = io;
-        uhci_print_verbose("Device registers accessible.\n");
+        usb_log_debug("Device registers accessible.\n");
 
         /* init transfer lists */
         ret = uhci_init_transfer_lists(instance->transfers);
         CHECK_RET_FREE_INSTANCE("Failed to initialize transfer lists.\n");
-        uhci_print_verbose("Transfer lists initialized.\n");
-
-
-        uhci_print_verbose("Initializing frame list.\n");
+        usb_log_debug("Transfer lists initialized.\n");
+
+
+        usb_log_debug("Initializing frame list.\n");
         instance->frame_list = get_page();
         ret = instance ? EOK : ENOMEM;
@@ -76 +74 @@
         fibril_add_ready(instance->debug_checker);
 
-        uhci_print_verbose("Starting UHCI HC.\n");
+        usb_log_debug("Starting UHCI HC.\n");
         pio_write_16(&instance->registers->usbcmd, UHCI_CMD_RUN_STOP);
 /*
@@ -96 +94 @@
         ret = transfer_list_init(&transfers[USB_TRANSFER_BULK], NULL);
         if (ret != EOK) {
-                uhci_print_error("Failed to initialize bulk queue.\n");
+                usb_log_error("Failed to initialize bulk queue.\n");
                 return ret;
         }
@@ -103 +101 @@
           &transfers[USB_TRANSFER_CONTROL], &transfers[USB_TRANSFER_BULK]);
         if (ret != EOK) {
-                uhci_print_error("Failed to initialize control queue.\n");
+                usb_log_error("Failed to initialize control queue.\n");
                 transfer_list_fini(&transfers[USB_TRANSFER_BULK]);
                 return ret;
@@ -111 +109 @@
           &transfers[USB_TRANSFER_INTERRUPT], &transfers[USB_TRANSFER_CONTROL]);
         if (ret != EOK) {
-                uhci_print_error("Failed to initialize interrupt queue.\n");
+                usb_log_error("Failed to initialize interrupt queue.\n");
                 transfer_list_fini(&transfers[USB_TRANSFER_CONTROL]);
                 transfer_list_fini(&transfers[USB_TRANSFER_BULK]);
@@ -144 +142 @@
 #define CHECK_RET_TRANS_FREE_JOB_TD(message) \
         if (ret != EOK) { \
-                uhci_print_error(message); \
+                usb_log_error(message); \
                 if (job) { \
                         callback_dispose(job); \
@@ -167 +165 @@
         assert(instance);
 
-        uhci_print_verbose("Appending a new transfer to queue.\n");
+        usb_log_debug("Appending a new transfer to queue.\n");
         ret = transfer_list_append(&instance->transfers[transfer_type], td);
         CHECK_RET_TRANS_FREE_JOB_TD("Failed to append transfer descriptor.\n");
@@ -176 +174 @@
 int uhci_clean_finished(void* arg)
 {
-        uhci_print_verbose("Started cleaning fibril.\n");
+        usb_log_debug("Started cleaning fibril.\n");
         uhci_t *instance = (uhci_t*)arg;
         assert(instance);
 
         while(1) {
-                uhci_print_verbose("Running cleaning fibril on: %p.\n", instance);
+                usb_log_debug("Running cleaning fibril on: %p.\n", instance);
                 /* iterate all transfer queues */
                 int i = 0;
@@ -189 +187 @@
                         volatile transfer_descriptor_t * it =
                                 instance->transfers[i].first;
-                        uhci_print_verbose("Running cleaning fibril on queue: %p (%s).\n",
+                        usb_log_debug("Running cleaning fibril on queue: %p (%s).\n",
                                 &instance->transfers[i], it ? "SOMETHING" : "EMPTY");
 
                 if (it)
-                        uhci_print_verbose("First in queue: %p (%x).\n",
+                        usb_log_debug("First in queue: %p (%x).\n",
                                 it, it->status);
 
@@ -199 +197 @@
                          !(instance->transfers[i].first->status & TD_STATUS_ERROR_ACTIVE)) {
                                 transfer_descriptor_t *transfer = instance->transfers[i].first;
-                                uhci_print_info("Inactive transfer calling callback with status %x.\n",
+                                usb_log_info("Inactive transfer calling callback with status %x.\n",
                                   transfer->status);
                                 instance->transfers[i].first = transfer->next_va;
@@ -219 +217 @@
                 uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
                 uint16_t sts = pio_read_16(&instance->registers->usbsts);
-                uhci_print_verbose("Command register: %X Status register: %X\n", cmd, sts);
+                usb_log_debug("Command register: %X Status register: %X\n", cmd, sts);
 /*
                 uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
-                uhci_print_verbose("Framelist address: %p vs. %p.\n",
+                usb_log_debug("Framelist address: %p vs. %p.\n",
                         frame_list, addr_to_phys(instance->frame_list));
                 int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
-                uhci_print_verbose("Framelist item: %d \n", frnum );
+                usb_log_debug("Framelist item: %d \n", frnum );
 
                 queue_head_t* qh = instance->transfers[USB_TRANSFER_INTERRUPT].queue_head;
-                uhci_print_verbose("Interrupt QH: %p vs. %p.\n",
+                usb_log_debug("Interrupt QH: %p vs. %p.\n",
                         instance->frame_list[frnum], addr_to_phys(qh));
 
-                uhci_print_verbose("Control QH: %p vs. %p.\n", qh->next_queue,
+                usb_log_debug("Control QH: %p vs. %p.\n", qh->next_queue,
                         addr_to_phys(instance->transfers[USB_TRANSFER_CONTROL].queue_head));
                 qh = instance->transfers[USB_TRANSFER_CONTROL].queue_head;
 
-                uhci_print_verbose("Bulk QH: %p vs. %p.\n", qh->next_queue,
+                usb_log_debug("Bulk QH: %p vs. %p.\n", qh->next_queue,
                         addr_to_phys(instance->transfers[USB_TRANSFER_BULK].queue_head));
         uint16_t cmd = pio_read_16(&instance->registers->usbcmd);

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ +1 @@
+#include <usb/debug.h>
+
 #include "transfer_descriptor.h"
 
@@ -31 +33 @@
         }
 
-        uhci_print_info("Created TD: %X:%X:%X:%X(%p).\n",
+        usb_log_info("Created TD: %X:%X:%X:%X(%p).\n",
                 instance->next, instance->status, instance->device,
           instance->buffer_ptr, buffer);