Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/uhci

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

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (12 diffs)
• hc.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• transfer_list.c (modified) (1 diff)
• transfer_list.h (modified) (1 diff)
• uhci_rh.c (modified) (7 diffs)
• uhci_rh.h (modified) (1 diff)

uspace/drv/bus/usb/uhci/hc.c

@@ -97 +97 @@
 
 static void hc_init_hw(const hc_t *instance);
-static int hc_init_mem_structures(hc_t *instance);
-static int hc_init_transfer_lists(hc_t *instance);
-
-static int hc_debug_checker(void *arg);
+static errno_t hc_init_mem_structures(hc_t *instance);
+static errno_t hc_init_transfer_lists(hc_t *instance);
+
+static errno_t hc_debug_checker(void *arg);
 
 
@@ -110 +110 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -207 +207 @@
  * interrupt fibrils.
  */
-int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         hc_t *instance = hcd_to_hc(hcd);
@@ -218 +218 @@
 
         /* allow access to hc control registers */
-        int ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->io_ranges.ranges[0],
             (void **) &instance->registers);
         if (ret != EOK) {
@@ -327 +327 @@
 }
 
-static int endpoint_register(endpoint_t *ep)
+static errno_t endpoint_register(endpoint_t *ep)
 {
         hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
 
-        const int err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
+        const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep);
         if (err)
                 return err;
@@ -449 +449 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int hc_init_mem_structures(hc_t *instance)
+errno_t hc_init_mem_structures(hc_t *instance)
 {
         assert(instance);
@@ -468 +468 @@
 
         /* Init transfer lists */
-        int ret = hc_init_transfer_lists(instance);
+        errno_t ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize transfer lists.");
@@ -498 +498 @@
  * USB scheduling. Sets pointer table for quick access.
  */
-int hc_init_transfer_lists(hc_t *instance)
+errno_t hc_init_transfer_lists(hc_t *instance)
 {
         assert(instance);
 #define SETUP_TRANSFER_LIST(type, name) \
 do { \
-        int ret = transfer_list_init(&instance->transfers_##type, name); \
+        errno_t ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s transfer list: %s.", \
@@ -550 +550 @@
 }
 
-static int hc_status(bus_t *bus, uint32_t *status)
+static errno_t hc_status(bus_t *bus, uint32_t *status)
 {
         hc_t *instance = bus_to_hc(bus);
@@ -571 +571 @@
  * @return Error code
  */
-static int hc_schedule(usb_transfer_batch_t *batch)
+static errno_t hc_schedule(usb_transfer_batch_t *batch)
 {
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
@@ -586 +586 @@
                 return ENOTSUP;
 
-        int err;
+        errno_t err;
         if ((err = uhci_transfer_batch_prepare(uhci_batch)))
                 return err;
@@ -598 +598 @@
  * @return EOK (should never return)
  */
-int hc_debug_checker(void *arg)
+errno_t hc_debug_checker(void *arg)
 {
         hc_t *instance = arg;

uspace/drv/bus/usb/uhci/hc.h

@@ -157 +157 @@
 int hc_unschedule_batch(usb_transfer_batch_t *);
 
-extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-extern int hc_start(hc_device_t *);
-extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gone(hc_device_t *);
+extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
+extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t hc_start(hc_device_t *);
+extern errno_t hc_setup_roothub(hc_device_t *);
+extern errno_t hc_gone(hc_device_t *);
 
 #endif

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c

@@ -119 +119 @@
  * @return Error code.
  */
-int td_status(const td_t *instance)
+errno_t td_status(const td_t *instance)
 {
         assert(instance);

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h

@@ -102 +102 @@
     const void *buffer, const td_t *next);
 
-int td_status(const td_t *instance);
+errno_t td_status(const td_t *instance);
 
 void td_print_status(const td_t *instance);

uspace/drv/bus/usb/uhci/main.c

@@ -49 +49 @@
 #define NAME "uhci"
 
-static int disable_legacy(hc_device_t *);
+static errno_t disable_legacy(hc_device_t *);
 
 static const hc_driver_t uhci_driver = {
@@ -67 +67 @@
  * @return Error code.
  */
-static int disable_legacy(hc_device_t *hcd)
+static errno_t disable_legacy(hc_device_t *hcd)
 {
         assert(hcd);

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -55 +55 @@
  * Allocates memory for internal qh_t structure.
  */
-int transfer_list_init(transfer_list_t *instance, const char *name)
+errno_t transfer_list_init(transfer_list_t *instance, const char *name)
 {
         assert(instance);

uspace/drv/bus/usb/uhci/transfer_list.h

@@ -57 +57 @@
 
 void transfer_list_fini(transfer_list_t *);
-int transfer_list_init(transfer_list_t *, const char *);
+errno_t transfer_list_init(transfer_list_t *, const char *);
 void transfer_list_set_next(transfer_list_t *, transfer_list_t *);
-int transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *);
+errno_t transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *);
 void transfer_list_remove_batch(transfer_list_t *, uhci_transfer_batch_t *);
 void transfer_list_check_finished(transfer_list_t *);

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -79 +79 @@
  * @return Error code, EOK on success.
  */
-int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name)
+errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name)
 {
         assert(instance);
@@ -99 +99 @@
  * not have to be.
  */
-int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch)
+errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -189 +189 @@
  * it is usefull for debuging purposes only.
  */
-static int req_get_port_state(usbvirt_device_t *device,
+static errno_t req_get_port_state(usbvirt_device_t *device,
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size)
@@ -224 +224 @@
  * @note: reset change status needs to be handled in sw.
  */
-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)
@@ -263 +263 @@
  * @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)
@@ -336 +336 @@
  * @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)
@@ -398 +398 @@
  * 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)

uspace/drv/bus/usb/uhci/uhci_rh.h

@@ -56 +56 @@
 } uhci_rh_t;
 
-int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name);
-int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch);
+errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name);
+errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch);
 
 /** Get UHCI rh address.