Changeset 5a6cc679 in mainline for uspace/lib/usbhost/src/ddf_helpers.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/lib/usbhost/src/ddf_helpers.c (modified) (16 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -63 +63 @@
  * @return Error code.
  */
-static int register_endpoint(ddf_fun_t *fun, usb_pipe_desc_t *pipe_desc,
+static errno_t register_endpoint(ddf_fun_t *fun, usb_pipe_desc_t *pipe_desc,
      const usb_endpoint_descriptors_t *ep_desc)
 {
@@ -97 +97 @@
   * @return Error code.
   */
-static int unregister_endpoint(ddf_fun_t *fun, const usb_pipe_desc_t *pipe_desc)
+static errno_t unregister_endpoint(ddf_fun_t *fun, const usb_pipe_desc_t *pipe_desc)
 {
         assert(fun);
@@ -118 +118 @@
  * @param fun DDF function of the device (hub) requesting the address.
  */
-static int default_address_reservation(ddf_fun_t *fun, bool reserve)
+static errno_t default_address_reservation(ddf_fun_t *fun, bool reserve)
 {
         assert(fun);
@@ -142 +142 @@
  * @param speed USB speed of the new device
  */
-static int device_enumerate(ddf_fun_t *fun, unsigned port, usb_speed_t speed)
+static errno_t device_enumerate(ddf_fun_t *fun, unsigned port, usb_speed_t speed)
 {
         assert(fun);
@@ -152 +152 @@
         assert(hub);
 
-        int err;
+        errno_t err;
 
         if (!usb_speed_is_valid(speed))
@@ -195 +195 @@
 }
 
-static int device_remove(ddf_fun_t *fun, unsigned port)
+static errno_t device_remove(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
@@ -235 +235 @@
  * @return Error code.
  */
-static int get_device_description(ddf_fun_t *fun, usb_device_desc_t *desc)
+static errno_t get_device_description(ddf_fun_t *fun, usb_device_desc_t *desc)
 {
         assert(fun);
@@ -264 +264 @@
  * @return Error code.
  */
-static int dev_read(ddf_fun_t *fun, usb_target_t target,
+static errno_t dev_read(ddf_fun_t *fun, usb_target_t target,
     uint64_t setup_data, char *data, size_t size,
     usbhc_iface_transfer_callback_t callback, void *arg)
@@ -298 +298 @@
  * @return Error code.
  */
-static int dev_write(ddf_fun_t *fun, usb_target_t target,
+static errno_t dev_write(ddf_fun_t *fun, usb_target_t target,
     uint64_t setup_data, const char *data, size_t size,
     usbhc_iface_transfer_callback_t callback, void *arg)
@@ -370 +370 @@
 
 /* This is a copy of lib/usbdev/src/recognise.c */
-static int create_match_ids(match_id_list_t *l,
+static errno_t create_match_ids(match_id_list_t *l,
     usb_standard_device_descriptor_t *d)
 {
@@ -427 +427 @@
 }
 
-int hcd_ddf_setup_match_ids(device_t *device, usb_standard_device_descriptor_t *desc)
-{
-        int err;
+errno_t hcd_ddf_setup_match_ids(device_t *device, usb_standard_device_descriptor_t *desc)
+{
+        errno_t err;
         match_id_list_t mids;
 
@@ -457 +457 @@
  * This function does all the ddf work for hc driver.
  */
-int hcd_ddf_setup_hc(ddf_dev_t *device, size_t size)
+errno_t hcd_ddf_setup_hc(ddf_dev_t *device, size_t size)
 {
         assert(device);
@@ -468 +468 @@
         instance->ddf_dev = device;
 
-        int ret = ENOMEM;
+        errno_t ret = ENOMEM;
         instance->ctl_fun = ddf_fun_create(device, fun_exposed, "ctl");
         if (!instance->ctl_fun) {
@@ -510 +510 @@
  * @return Error code.
  */
-int hcd_ddf_enable_interrupt(hc_device_t *hcd, int inum)
+errno_t hcd_ddf_enable_interrupt(hc_device_t *hcd, int inum)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(hcd->ddf_dev);
@@ -519 +519 @@
 }
 
-int hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res)
+errno_t hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res)
 {
         async_sess_t *parent_sess = ddf_dev_parent_sess_get(hcd->ddf_dev);
@@ -526 +526 @@
 
         hw_res_list_parsed_init(hw_res);
-        const int ret = hw_res_get_list_parsed(parent_sess, hw_res, 0);
+        const errno_t ret = hw_res_get_list_parsed(parent_sess, hw_res, 0);
         if (ret != EOK)
                 hw_res_list_parsed_clean(hw_res);