Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (7 diffs)

uspace/drv/bus/usb/ehci/hc.c

@@ -89 +89 @@
 };
 
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -99 +99 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -151 +151 @@
  * @return Error code
  */
-int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         hc_t *instance = hcd_to_hc(hcd);
@@ -160 +160 @@
             return EINVAL;
 
-        int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
             (void **)&instance->caps);
         if (ret != EOK) {
@@ -265 +265 @@
 }
 
-int ehci_hc_status(bus_t *bus_base, uint32_t *status)
+errno_t ehci_hc_status(bus_t *bus_base, uint32_t *status)
 {
         assert(bus_base);
@@ -289 +289 @@
  * @return Error code.
  */
-int ehci_hc_schedule(usb_transfer_batch_t *batch)
+errno_t ehci_hc_schedule(usb_transfer_batch_t *batch)
 {
         assert(batch);
@@ -477 +477 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
         usb_log_debug2("HC(%p): Initializing Async list(%p).", instance,
             &instance->async_list);
-        int ret = endpoint_list_init(&instance->async_list, "ASYNC");
+        errno_t ret = endpoint_list_init(&instance->async_list, "ASYNC");
         if (ret != EOK) {
                 usb_log_error("HC(%p): Failed to setup ASYNC list: %s",