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

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

@@ -63 +63 @@
  * @return Error code.
  */
-static int disable_extended_caps(async_sess_t *parent_sess, unsigned eecp)
+static errno_t disable_extended_caps(async_sess_t *parent_sess, unsigned eecp)
 {
         /* nothing to do */
@@ -71 +71 @@
         /* Read the first EEC. i.e. Legacy Support register */
         uint32_t usblegsup;
-        int ret = pci_config_space_read_32(parent_sess,
+        errno_t ret = pci_config_space_read_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
@@ -173 +173 @@
 }
 
-int disable_legacy(hc_device_t *hcd)
+errno_t disable_legacy(hc_device_t *hcd)
 {
         hc_t *hc = hcd_to_hc(hcd);
@@ -182 +182 @@
 
         usb_log_debug("Disabling EHCI legacy support.");
-
 
         const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);