Changeset 46577995 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2018-01-04T20:50:52Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_endpoint.c (modified) (1 diff)
• ehci_endpoint.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) (8 diffs)
• hc.h (modified) (2 diffs)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• main.c (modified) (4 diffs)
• res.c (modified) (4 diffs)
• res.h (modified) (1 diff)

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

@@ -77 +77 @@
  * @return Error code.
  */
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
+errno_t ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
         assert(ep);

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

@@ -51 +51 @@
 } ehci_endpoint_t;
 
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
+errno_t ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
 void ehci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
 

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,
     const char *name)
 {
@@ -140 +140 @@
  * 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);
@@ -175 +175 @@
  * processing of a postponed request.
  */
-int ehci_rh_interrupt(ehci_rh_t *instance)
+errno_t ehci_rh_interrupt(ehci_rh_t *instance)
 {
         //TODO atomic swap needed
@@ -217 +217 @@
  * @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)
@@ -240 +240 @@
  * @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)
@@ -268 +268 @@
  * @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)
@@ -311 +311 @@
 } ehci_rh_job_t;
 
-static int stop_reset(void *arg)
+static errno_t stop_reset(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -340 +340 @@
 }
 
-static int stop_resume(void *arg)
+static errno_t stop_resume(void *arg)
 {
         ehci_rh_job_t *job = arg;
@@ -353 +353 @@
 }
 
-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));
@@ -379 +379 @@
  * @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)
@@ -458 +458 @@
  * @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)
@@ -507 +507 @@
  * 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

@@ -67 +67 @@
 } 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,
     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

@@ -90 +90 @@
 
 static void hc_start(hc_t *instance);
-static int hc_init_memory(hc_t *instance);
+static errno_t hc_init_memory(hc_t *instance);
 
 /** Generate IRQ code.
@@ -100 +100 @@
  * @return Error code.
  */
-int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -132 +132 @@
         ehci_caps_regs_t *caps = NULL;
 
-        int ret = pio_enable_range(&regs, (void**)&caps);
+        errno_t ret = pio_enable_range(&regs, (void**)&caps);
         if (ret != EOK) {
                 free(code->ranges);
@@ -159 +159 @@
  * @return Error code
  */
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+errno_t hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
 {
         assert(instance);
@@ -168 +168 @@
             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) {
@@ -273 +273 @@
 }
 
-int ehci_hc_status(hcd_t *hcd, uint32_t *status)
+errno_t ehci_hc_status(hcd_t *hcd, uint32_t *status)
 {
         assert(hcd);
@@ -294 +294 @@
  * @return Error code.
  */
-int ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+errno_t ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
         assert(hcd);
@@ -445 +445 @@
  * @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

@@ -82 +82 @@
 } hc_t;
 
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts);
+errno_t hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts);
 void hc_fini(hc_t *instance);
 
@@ -88 +88 @@
 void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep);
 
-int ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
+errno_t ehci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
 
 void ehci_hc_interrupt(hcd_t *hcd, uint32_t status);
-int ehci_hc_status(hcd_t *hcd, uint32_t *status);
-int ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+errno_t ehci_hc_status(hcd_t *hcd, uint32_t *status);
+errno_t ehci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 #endif
 /**

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

@@ -45 +45 @@
 
 
-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

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

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

@@ -52 +52 @@
 #define NAME "ehci"
 
-static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static errno_t ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void ehci_driver_fini(hcd_t *);
 
@@ -72 +72 @@
 
 
-static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
+static errno_t ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
     bool irq)
 {
@@ -82 +82 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res, irq);
+        const errno_t ret = hc_init(instance, res, irq);
         if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
@@ -107 +107 @@
  * @return Error code.
  */
-static int ehci_dev_add(ddf_dev_t *device)
+static errno_t ehci_dev_add(ddf_dev_t *device)
 {
         usb_log_debug("ehci_dev_add() called\n");

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

@@ -62 +62 @@
  * @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 */
@@ -70 +70 @@
         /* 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) {
@@ -172 +172 @@
 }
 
-int disable_legacy(ddf_dev_t *device)
+errno_t disable_legacy(ddf_dev_t *device)
 {
         assert(device);
@@ -184 +184 @@
         hw_res_list_parsed_t res;
         hw_res_list_parsed_init(&res);
-        int ret = hw_res_get_list_parsed(parent_sess, &res, 0);
+        errno_t ret = hw_res_get_list_parsed(parent_sess, &res, 0);
         if (ret != EOK) {
                 usb_log_error("Failed to get resource list: %s\n",

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

@@ -39 +39 @@
 #include <device/hw_res_parsed.h>
 
-extern int disable_legacy(ddf_dev_t *);
+extern errno_t disable_legacy(ddf_dev_t *);
 
 #endif