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

Timestamp:

2018-01-31T02:21:24Z (8 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/ehci_rh.c (modified) (12 diffs)

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

@@ -99 +99 @@
  * initializes internal virtual hub.
  */
-int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
+errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
     fibril_mutex_t *guard, const char *name)
 {
@@ -141 +141 @@
  * status change requests might be postponed until there is something to report.
  */
-int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -184 +184 @@
  * processing of a postponed request.
  */
-int ehci_rh_interrupt(ehci_rh_t *instance)
+errno_t ehci_rh_interrupt(ehci_rh_t *instance)
 {
         fibril_mutex_lock(instance->guard);
@@ -231 +231 @@
  * @return Error code.
  */
-static int req_get_status(usbvirt_device_t *device,
+static errno_t req_get_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -254 +254 @@
  * @return Error code.
  */
-static int req_clear_hub_feature(usbvirt_device_t *device,
+static errno_t req_clear_hub_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -282 +282 @@
  * @return Error code.
  */
-static int req_get_port_status(usbvirt_device_t *device,
+static errno_t req_get_port_status(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -325 +325 @@
 } ehci_rh_job_t;
 
-static int stop_reset(void *arg)
+static errno_t stop_reset(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -354 +354 @@
 }
 
-static int stop_resume(void *arg)
+static errno_t stop_resume(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -367 +367 @@
 }
 
-static int delayed_job(int (*func)(void*), ehci_rh_t *rh, unsigned port)
+static errno_t delayed_job(errno_t (*func)(void*), ehci_rh_t *rh, unsigned port)
 {
         ehci_rh_job_t *job = malloc(sizeof(*job));
@@ -393 +393 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *device,
+static errno_t req_clear_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -472 +472 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *device,
+static errno_t req_set_port_feature(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -521 +521 @@
  * only need 1 byte.
  */
-static int req_status_change_handler(usbvirt_device_t *device,
+static errno_t req_status_change_handler(usbvirt_device_t *device,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)