Changes in uspace/lib/usbhost/src/ddf_helpers.c [b7fd2a0:4547f11] in mainline

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (31 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -91 +91 @@
 
 
-static errno_t hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
-static errno_t hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
 
 
@@ -107 +107 @@
  * @return Error code.
  */
-static errno_t register_endpoint(
+static int register_endpoint(
     ddf_fun_t *fun, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
@@ -136 +136 @@
  * @return Error code.
  */
-static errno_t unregister_endpoint(
+static int unregister_endpoint(
     ddf_fun_t *fun, usb_endpoint_t endpoint, usb_direction_t direction)
 {
@@ -151 +151 @@
 }
 
-static errno_t reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
+static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
 {
         assert(fun);
@@ -164 +164 @@
 }
 
-static errno_t release_default_address(ddf_fun_t *fun)
+static int release_default_address(ddf_fun_t *fun)
 {
         assert(fun);
@@ -176 +176 @@
 }
 
-static errno_t device_enumerate(ddf_fun_t *fun, unsigned port)
+static int device_enumerate(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
@@ -188 +188 @@
 }
 
-static errno_t device_remove(ddf_fun_t *fun, unsigned port)
+static int device_remove(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
@@ -206 +206 @@
  * @return Error code.
  */
-static errno_t get_my_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static int get_my_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -224 +224 @@
  * @return Error code.
  */
-static errno_t dev_read(ddf_fun_t *fun, usb_endpoint_t endpoint,
+static int dev_read(ddf_fun_t *fun, usb_endpoint_t endpoint,
     uint64_t setup_data, uint8_t *data, size_t size,
     usbhc_iface_transfer_in_callback_t callback, void *arg)
@@ -250 +250 @@
  * @return Error code.
  */
-static errno_t dev_write(ddf_fun_t *fun, usb_endpoint_t endpoint,
+static int dev_write(ddf_fun_t *fun, usb_endpoint_t endpoint,
     uint64_t setup_data, const uint8_t *data, size_t size,
     usbhc_iface_transfer_out_callback_t callback, void *arg)
@@ -313 +313 @@
 };
 
-static errno_t hcd_ddf_add_device(ddf_dev_t *parent, usb_dev_t *hub_dev,
+static int hcd_ddf_add_device(ddf_dev_t *parent, usb_dev_t *hub_dev,
     unsigned port, usb_address_t address, usb_speed_t speed, const char *name,
     const match_id_list_t *mids)
@@ -351 +351 @@
         }
 
-        errno_t ret = ddf_fun_bind(fun);
+        int ret = ddf_fun_bind(fun);
         if (ret != EOK) {
                 ddf_fun_destroy(fun);
@@ -389 +389 @@
 
 /* This is a copy of lib/usbdev/src/recognise.c */
-static errno_t create_match_ids(match_id_list_t *l,
+static int create_match_ids(match_id_list_t *l,
     usb_standard_device_descriptor_t *d)
 {
@@ -418 +418 @@
 }
 
-static errno_t hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
     unsigned port)
 {
@@ -443 +443 @@
                 list_remove(&victim->link);
                 fibril_mutex_unlock(&hub->guard);
-                const errno_t ret = ddf_fun_unbind(victim->fun);
+                const int ret = ddf_fun_unbind(victim->fun);
                 if (ret == EOK) {
                         usb_address_t address = victim->address;
@@ -458 +458 @@
 }
 
-static errno_t hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port)
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port)
 {
         assert(device);
@@ -468 +468 @@
 
         /* This checks whether the default address is reserved and gets speed */
-        errno_t ret = usb_bus_get_speed(&hcd->bus, USB_ADDRESS_DEFAULT, &speed);
+        int ret = usb_bus_get_speed(&hcd->bus, USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {
                 usb_log_error("Failed to verify speed: %s.", str_error(ret));
@@ -621 +621 @@
  * @return Error code
  */
-errno_t hcd_ddf_setup_root_hub(ddf_dev_t *device)
+int hcd_ddf_setup_root_hub(ddf_dev_t *device)
 {
         assert(device);
@@ -628 +628 @@
 
         hcd_reserve_default_address(hcd, hcd->bus.max_speed);
-        const errno_t ret = hcd_ddf_new_device(device, NULL, 0);
+        const int ret = hcd_ddf_new_device(device, NULL, 0);
         hcd_release_default_address(hcd);
         return ret;
@@ -643 +643 @@
  * This function does all the ddf work for hc driver.
  */
-errno_t hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
+int hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
     size_t bw, bw_count_func_t bw_count)
 {
@@ -656 +656 @@
         hcd_init(&instance->hcd, max_speed, bw, bw_count);
 
-        errno_t ret = ENOMEM;
+        int ret = ENOMEM;
         instance->ctl_fun = ddf_fun_create(device, fun_exposed, "ctl");
         if (!instance->ctl_fun) {
@@ -691 +691 @@
         hc_dev_t *hc = dev_to_hc_dev(device);
         assert(hc);
-        const errno_t ret = ddf_fun_unbind(hc->ctl_fun);
+        const int ret = ddf_fun_unbind(hc->ctl_fun);
         if (ret == EOK)
                 ddf_fun_destroy(hc->ctl_fun);
@@ -703 +703 @@
  * @return Error code.
  */
-errno_t hcd_ddf_enable_interrupt(ddf_dev_t *device, int inum)
+int hcd_ddf_enable_interrupt(ddf_dev_t *device, int inum)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
@@ -713 +713 @@
 
 //TODO: Cache parent session in HCD
-errno_t hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res)
+int hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
@@ -720 +720 @@
 
         hw_res_list_parsed_init(hw_res);
-        const errno_t ret = hw_res_get_list_parsed(parent_sess, hw_res, 0);
+        const int ret = hw_res_get_list_parsed(parent_sess, hw_res, 0);
         if (ret != EOK)
                 hw_res_list_parsed_clean(hw_res);
@@ -751 +751 @@
  * @return Error code.
  */
-errno_t hcd_ddf_setup_interrupts(ddf_dev_t *device,
+int hcd_ddf_setup_interrupts(ddf_dev_t *device,
     const hw_res_list_parsed_t *hw_res,
     interrupt_handler_t handler,
-    errno_t (*gen_irq_code)(irq_code_t *, const hw_res_list_parsed_t *, int *),
+    int (*gen_irq_code)(irq_code_t *, const hw_res_list_parsed_t *, int *),
     cap_handle_t *handle)
 {
@@ -765 +765 @@
 
         int irq;
-        errno_t ret = gen_irq_code(&irq_code, hw_res, &irq);
+        int ret = gen_irq_code(&irq_code, hw_res, &irq);
         if (ret != EOK) {
                 usb_log_error("Failed to generate IRQ code: %s.\n",
@@ -809 +809 @@
 }
 
-static errno_t interrupt_polling(void *arg)
+static int interrupt_polling(void *arg)
 {
         hcd_t *hcd = arg;
@@ -847 +847 @@
  *  - registers root hub
  */
-errno_t hcd_ddf_add_hc(ddf_dev_t *device, const ddf_hc_driver_t *driver)
+int hcd_ddf_add_hc(ddf_dev_t *device, const ddf_hc_driver_t *driver)
 {
         assert(driver);
@@ -857 +857 @@
         };
 
-        errno_t ret = EOK;
+        int ret = EOK;
         const usb_speed_t speed = driver->hc_speed;
         if (speed >= ARRAY_SIZE(bw) || bw[speed].bw == 0) {
@@ -884 +884 @@
             driver->irq_handler ? driver->irq_handler : ddf_hcd_gen_irq_handler;
         int irq_cap;
-        errno_t irq_ret = hcd_ddf_setup_interrupts(device, &hw_res,
+        int irq_ret = hcd_ddf_setup_interrupts(device, &hw_res,
             irq_handler, driver->irq_code_gen, &irq_cap);
         bool irqs_enabled = (irq_ret == EOK);