Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/ohci/ohci_rh.c

Timestamp:

2018-01-31T02:21:24Z (6 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/ohci/ohci_rh.c (modified) (9 diffs)

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -109 +109 @@
  * initializes internal virtual hub.
  */
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
+errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
     fibril_mutex_t *guard, const char *name)
 {
@@ -176 +176 @@
  * status change requests might be postponed until there is something to report.
  */
-int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -214 +214 @@
  * processing of a postponed request.
  */
-int ohci_rh_interrupt(ohci_rh_t *instance)
+errno_t ohci_rh_interrupt(ohci_rh_t *instance)
 {
         fibril_mutex_lock(instance->guard);
@@ -259 +259 @@
  * @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)
@@ -282 +282 @@
  * @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)
@@ -312 +312 @@
  * @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)
@@ -336 +336 @@
  * @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)
@@ -400 +400 @@
  * @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)
@@ -451 +451 @@
  * 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)