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

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/ehci

Files:

• ehci_bus.h (modified) (1 diff)
• ehci_rh.c (modified) (12 diffs)
• ehci_rh.h (modified) (1 diff)
• endpoint_list.c (modified) (1 diff)
• endpoint_list.h (modified) (1 diff)
• hc.c (modified) (7 diffs)
• hc.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• res.c (modified) (4 diffs)
• res.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_bus.h

@@ -72 +72 @@
 void ehci_bus_prepare_ops(void);
 
-int ehci_bus_init(ehci_bus_t *, hc_t *);
+errno_t ehci_bus_init(ehci_bus_t *, hc_t *);
 
 /** Get and convert assigned ehci_endpoint_t structure

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)

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

@@ -79 +79 @@
 } ehci_rh_t;
 
-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);
-int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
-int ehci_rh_interrupt(ehci_rh_t *instance);
+errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
+errno_t ehci_rh_interrupt(ehci_rh_t *instance);
 
 /** Get EHCI rh address.

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

@@ -50 +50 @@
  * Allocates memory for internal ed_t structure.
  */
-int endpoint_list_init(endpoint_list_t *instance, const char *name)
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name)
 {
         assert(instance);

uspace/drv/bus/usb/ehci/endpoint_list.h

@@ -68 +68 @@
 }
 
-int endpoint_list_init(endpoint_list_t *instance, const char *name);
+errno_t endpoint_list_init(endpoint_list_t *instance, const char *name);
 void endpoint_list_chain(endpoint_list_t *instance, const endpoint_list_t *next);
 void endpoint_list_append_ep(endpoint_list_t *instance, ehci_endpoint_t *ep);

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

@@ -89 +89 @@
 };
 
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -99 +99 @@
  * @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);
@@ -151 +151 @@
  * @return Error code
  */
-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);
@@ -160 +160 @@
             return EINVAL;
 
-        int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
+        errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0],
             (void **)&instance->caps);
         if (ret != EOK) {
@@ -265 +265 @@
 }
 
-int ehci_hc_status(bus_t *bus_base, uint32_t *status)
+errno_t ehci_hc_status(bus_t *bus_base, uint32_t *status)
 {
         assert(bus_base);
@@ -289 +289 @@
  * @return Error code.
  */
-int ehci_hc_schedule(usb_transfer_batch_t *batch)
+errno_t ehci_hc_schedule(usb_transfer_batch_t *batch)
 {
         assert(batch);
@@ -477 +477 @@
  * @return Error code.
  */
-int hc_init_memory(hc_t *instance)
+errno_t hc_init_memory(hc_t *instance)
 {
         assert(instance);
         usb_log_debug2("HC(%p): Initializing Async list(%p).", instance,
             &instance->async_list);
-        int ret = endpoint_list_init(&instance->async_list, "ASYNC");
+        errno_t ret = endpoint_list_init(&instance->async_list, "ASYNC");
         if (ret != EOK) {
                 usb_log_error("HC(%p): Failed to setup ASYNC list: %s",

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

@@ -100 +100 @@
 
 /* Boottime operations */
-extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern int hc_start(hc_device_t *);
-extern int hc_setup_roothub(hc_device_t *);
-extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-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_start(hc_device_t *);
+extern errno_t hc_setup_roothub(hc_device_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_gone(hc_device_t *);
 
 /** Runtime operations */
 extern void ehci_hc_interrupt(bus_t *, uint32_t);
-extern int ehci_hc_status(bus_t *, uint32_t *);
-extern int ehci_hc_schedule(usb_transfer_batch_t *);
+extern errno_t ehci_hc_status(bus_t *, uint32_t *);
+extern errno_t ehci_hc_schedule(usb_transfer_batch_t *);
 
 #endif

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

@@ -44 +44 @@
 
 
-int td_error(const td_t *td)
+errno_t td_error(const td_t *td)
 {
         assert(td);

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

@@ -97 +97 @@
 }
 
-int td_error(const td_t *td);
+errno_t td_error(const td_t *td);
 
 void td_init(td_t *td, uintptr_t next_phys, uintptr_t buf, usb_direction_t dir,

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);

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

@@ -38 +38 @@
 typedef struct hc_device hc_device_t;
 
-extern int disable_legacy(hc_device_t *);
+extern errno_t disable_legacy(hc_device_t *);
 
 #endif