Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/uhci/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/uhci/hc.c (modified) (12 diffs)

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

@@ -97 +97 @@
 
 static void hc_init_hw(const hc_t *instance);
-static int hc_init_mem_structures(hc_t *instance);
-static int hc_init_transfer_lists(hc_t *instance);
-
-static int hc_debug_checker(void *arg);
+static errno_t hc_init_mem_structures(hc_t *instance);
+static errno_t hc_init_transfer_lists(hc_t *instance);
+
+static errno_t hc_debug_checker(void *arg);
 
 
@@ -110 +110 @@
  * @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);
@@ -207 +207 @@
  * interrupt fibrils.
  */
-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);
@@ -218 +218 @@
 
         /* allow access to hc control registers */
-        int ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
             (void **) &instance->registers);
         if (ret != EOK) {
@@ -327 +327 @@
 }
 
-static int endpoint_register(endpoint_t *ep)
+static errno_t endpoint_register(endpoint_t *ep)
 {
         hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
 
-        const int err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
+        const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
         if (err)
                 return err;
@@ -449 +449 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int hc_init_mem_structures(hc_t *instance)
+errno_t hc_init_mem_structures(hc_t *instance)
 {
         assert(instance);
@@ -468 +468 @@
 
         /* Init transfer lists */
-        int ret = hc_init_transfer_lists(instance);
+        errno_t ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize transfer lists.");
@@ -498 +498 @@
  * USB scheduling. Sets pointer table for quick access.
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
 #define SETUP_TRANSFER_LIST(type, name) \
 do { \
-        int ret = transfer_list_init(&instance->transfers_##type, name); \
+        errno_t ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s transfer list: %s.", \
@@ -550 +550 @@
 }
 
-static int hc_status(bus_t *bus, uint32_t *status)
+static errno_t hc_status(bus_t *bus, uint32_t *status)
 {
         hc_t *instance = bus_to_hc(bus);
@@ -571 +571 @@
  * @return Error code
  */
-static int hc_schedule(usb_transfer_batch_t *batch)
+static errno_t hc_schedule(usb_transfer_batch_t *batch)
 {
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
@@ -586 +586 @@
                 return ENOTSUP;
 
-        int err;
+        errno_t err;
         if ((err = uhci_transfer_batch_prepare(uhci_batch)))
                 return err;
@@ -598 +598 @@
  * @return EOK (should never return)
  */
-int hc_debug_checker(void *arg)
+errno_t hc_debug_checker(void *arg)
 {
         hc_t *instance = arg;