Changeset e247d83 in mainline

Timestamp:

2011-05-23T14:04:51Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

563ead9

Parents:

8953514

Message:

Const, type-casting and other minor fixes

Location:

uspace/drv

Files:

• uhci-hcd/hc.c (modified) (5 diffs)
• uhci-hcd/hc.h (modified) (1 diff)
• uhci-hcd/pci.c (modified) (8 diffs)
• uhci-hcd/pci.h (modified) (1 diff)
• uhci-hcd/root_hub.c (modified) (1 diff)
• uhci-hcd/transfer_list.c (modified) (5 diffs)
• uhci-hcd/uhci.c (modified) (2 diffs)
• uhci-hcd/uhci.h (modified) (1 diff)
• uhci-rhd/port.c (modified) (1 diff)

uspace/drv/uhci-hcd/hc.c

@@ -85 +85 @@
         /* allow access to hc control registers */
         regs_t *io;
-        ret = pio_enable(regs, reg_size, (void**)&io);
+        ret = pio_enable(regs, reg_size, (void **)&io);
         CHECK_RET_RETURN(ret,
             "Failed(%d) to gain access to registers at %p: %s.\n",
@@ -143 +143 @@
         }
 
-        uint16_t status = pio_read_16(&registers->usbcmd);
+        const uint16_t status = pio_read_16(&registers->usbcmd);
         if (status != 0)
                 usb_log_warning("Previous command value: %x.\n", status);
@@ -212 +212 @@
         /* Init USB frame list page*/
         instance->frame_list = get_page();
-        ret = instance ? EOK : ENOMEM;
+        ret = instance->frame_list ? EOK : ENOMEM;
         CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
         usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
@@ -277 +277 @@
                 &instance->transfers_control_slow);
 
-        /*FSBR*/
+        /*FSBR, This feature is not needed (adds no benefit) and is supposedly
+         * buggy on certain hw, enable at your own risk. */
 #ifdef FSBR
         transfer_list_set_next(&instance->transfers_bulk_full,
@@ -428 +429 @@
                 }
 
-                uintptr_t frame_list =
+                const uintptr_t frame_list =
                     pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
                 if (frame_list != addr_to_phys(instance->frame_list)) {

uspace/drv/uhci-hcd/hc.h

@@ -154 +154 @@
  */
 static inline hc_t * fun_to_hc(ddf_fun_t *fun)
-        { return (hc_t*)fun->driver_data; }
+{
+        assert(fun);
+        return fun->driver_data;
+}
 #endif
 /**

uspace/drv/uhci-hcd/pci.c

@@ -52 +52 @@
  * @return Error code.
  */
-int pci_get_my_registers(ddf_dev_t *dev,
+int pci_get_my_registers(const ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
 {
-        assert(dev != NULL);
+        assert(dev);
+        assert(io_reg_address);
+        assert(io_reg_size);
+        assert(irq_no);
 
         int parent_phone =
@@ -66 +69 @@
         int rc = hw_res_get_resource_list(parent_phone, &hw_resources);
         if (rc != EOK) {
-                goto leave;
+                async_hangup(parent_phone);
+                return rc;
         }
 
@@ -78 +82 @@
         size_t i;
         for (i = 0; i < hw_resources.count; i++) {
-                hw_resource_t *res = &hw_resources.resources[i];
+                const hw_resource_t *res = &hw_resources.resources[i];
                 switch (res->type)
                 {
@@ -99 +103 @@
                 }
         }
+        async_hangup(parent_phone);
 
-        if (!io_found || !irq_found) {
-                rc = ENOENT;
-                goto leave;
-        }
+        if (!io_found || !irq_found)
+                return ENOENT;
 
         *io_reg_address = io_address;
@@ -109 +112 @@
         *irq_no = irq;
 
-        rc = EOK;
-leave:
-        async_hangup(parent_phone);
-        return rc;
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -120 +120 @@
  * @return Error code.
  */
-int pci_enable_interrupts(ddf_dev_t *device)
+int pci_enable_interrupts(const ddf_dev_t *device)
 {
-        int parent_phone = devman_parent_device_connect(device->handle,
-            IPC_FLAG_BLOCKING);
-        bool enabled = hw_res_enable_interrupt(parent_phone);
+        const int parent_phone =
+            devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+        const bool enabled = hw_res_enable_interrupt(parent_phone);
         async_hangup(parent_phone);
         return enabled ? EOK : EIO;
@@ -134 +137 @@
  * @return Error code.
  */
-int pci_disable_legacy(ddf_dev_t *device)
+int pci_disable_legacy(const ddf_dev_t *device)
 {
         assert(device);
-        int parent_phone =
+        const int parent_phone =
             devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -145 +148 @@
         /* See UHCI design guide for these values p.45,
          * write all WC bits in USB legacy register */
-        sysarg_t address = 0xc0;
-        sysarg_t value = 0xaf00;
+        const sysarg_t address = 0xc0;
+        const sysarg_t value = 0xaf00;
 
-        int rc = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
+        const int rc = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
             IPC_M_CONFIG_SPACE_WRITE_16, address, value);
         async_hangup(parent_phone);

uspace/drv/uhci-hcd/pci.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
-int pci_enable_interrupts(ddf_dev_t *);
-int pci_disable_legacy(ddf_dev_t *);
+int pci_get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
+int pci_enable_interrupts(const ddf_dev_t *);
+int pci_disable_legacy(const ddf_dev_t *);
 
 #endif

uspace/drv/uhci-hcd/root_hub.c

@@ -60 +60 @@
                 return ret;
         }
+        assert(match_str);
 
         ret = ddf_fun_add_match_id(fun, match_str, 100);

uspace/drv/uhci-hcd/transfer_list.c

@@ -58 +58 @@
                 return ENOMEM;
         }
-        uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
+        const uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
         usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).\n",
             name, instance->queue_head, queue_head_pa);
@@ -90 +90 @@
 {
         assert(instance);
+        assert(instance->queue_head);
         assert(next);
-        if (!instance->queue_head)
-                return;
         /* Set queue_head.next to point to the follower */
         qh_set_next_qh(instance->queue_head, next->queue_head);
@@ -137 +136 @@
         write_barrier();
 
-        /* Add to the driver list */
+        /* Add to the driver's list */
         list_append(&batch->link, &instance->batch_list);
 
@@ -160 +159 @@
         link_t *current = instance->batch_list.next;
         while (current != &instance->batch_list) {
-                link_t *next = current->next;
+                link_t * const next = current->next;
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);
@@ -182 +181 @@
         fibril_mutex_lock(&instance->guard);
         while (!list_empty(&instance->batch_list)) {
-                link_t *current = instance->batch_list.next;
+                link_t * const current = instance->batch_list.next;
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);

uspace/drv/uhci-hcd/uhci.c

@@ -77 +77 @@
 {
         assert(dev);
-        hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
+        uhci_t *uhci = dev->driver_data;
+        assert(uhci);
+        hc_t *hc = &uhci->hc;
         uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
@@ -144 +146 @@
 {
         assert(fun);
-        return &((rh_t*)fun->driver_data)->resource_list;
+        rh_t *rh = fun->driver_data;
+        assert(rh);
+        return &rh->resource_list;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/uhci.h

@@ -35 +35 @@
 #ifndef DRV_UHCI_UHCI_H
 #define DRV_UHCI_UHCI_H
-#include <ddi.h>
 #include <ddf/driver.h>
 

uspace/drv/uhci-rhd/port.c

@@ -209 +209 @@
 int uhci_port_reset_enable(int portno, void *arg)
 {
-        uhci_port_t *port = (uhci_port_t *) arg;
+        uhci_port_t *port = arg;
 
         usb_log_debug2("%s: new_device_enable_port.\n", port->id_string);