Changeset 45457265 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-02-03T02:14:26Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

eb862fd

Parents:

961a5ee

Message:

errno_t all the things!

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (29 diffs)

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

@@ -80 +80 @@
  * ports to protocol versions and speeds.
  */
-static int hc_parse_ec(xhci_hc_t *hc)
+static errno_t hc_parse_ec(xhci_hc_t *hc)
 {
         unsigned psic, major, minor;
@@ -186 +186 @@
  * Initialize MMIO spaces of xHC.
  */
-int hc_init_mmio(xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res)
-{
-        int err;
+errno_t hc_init_mmio(xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res)
+{
+        errno_t err;
 
         if (hw_res->mem_ranges.count != 1) {
@@ -257 +257 @@
  * Initialize structures kept in allocated memory.
  */
-int hc_init_memory(xhci_hc_t *hc, ddf_dev_t *device)
-{
-        int err = ENOMEM;
+errno_t hc_init_memory(xhci_hc_t *hc, ddf_dev_t *device)
+{
+        errno_t err = ENOMEM;
 
         if (dma_buffer_alloc(&hc->dcbaa_dma, (1 + hc->max_slots) * sizeof(uint64_t)))
@@ -362 +362 @@
  * (except 0) are disabled.
  */
-int hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res, int *irq)
+errno_t hc_irq_code_gen(irq_code_t *code, xhci_hc_t *hc, const hw_res_list_parsed_t *hw_res, int *irq)
 {
         assert(code);
@@ -412 +412 @@
  * Claim xHC from BIOS. Implements handoff as per Section 4.22.1 of xHCI spec.
  */
-int hc_claim(xhci_hc_t *hc, ddf_dev_t *dev)
+errno_t hc_claim(xhci_hc_t *hc, ddf_dev_t *dev)
 {
         /* No legacy support capability, the controller is solely for us */
@@ -440 +440 @@
  * Ask the xHC to reset its state. Implements sequence
  */
-static int hc_reset(xhci_hc_t *hc)
+static errno_t hc_reset(xhci_hc_t *hc)
 {
         if (xhci_reg_wait(&hc->op_regs->usbsts, XHCI_REG_MASK(XHCI_OP_CNR), 0))
@@ -466 +466 @@
  * Initialize the HC: section 4.2
  */
-int hc_start(xhci_hc_t *hc)
-{
-        int err;
+errno_t hc_start(xhci_hc_t *hc)
+{
+        errno_t err;
 
         if ((err = hc_reset(hc)))
@@ -565 +565 @@
  * Used only when polling. Shall supplement the irq_commands.
  */
-int hc_status(bus_t *bus, uint32_t *status)
+errno_t hc_status(bus_t *bus, uint32_t *status)
 {
         xhci_hc_t *hc = bus_to_hc(bus);
@@ -583 +583 @@
 }
 
-static int xhci_handle_mfindex_wrap_event(xhci_hc_t *hc, xhci_trb_t *trb)
+static errno_t xhci_handle_mfindex_wrap_event(xhci_hc_t *hc, xhci_trb_t *trb)
 {
         struct timeval tv;
@@ -594 +594 @@
 }
 
-typedef int (*event_handler) (xhci_hc_t *, xhci_trb_t *trb);
+typedef errno_t (*event_handler) (xhci_hc_t *, xhci_trb_t *trb);
 
 /**
@@ -612 +612 @@
 };
 
-static int hc_handle_event(xhci_hc_t *hc, xhci_trb_t *trb)
+static errno_t hc_handle_event(xhci_hc_t *hc, xhci_trb_t *trb)
 {
         const unsigned type = TRB_TYPE(*trb);
@@ -630 +630 @@
 static int event_worker(void *arg)
 {
-        int err;
+        errno_t err;
         xhci_trb_t trb;
         xhci_hc_t * const hc = arg;
@@ -654 +654 @@
     xhci_interrupter_regs_t *intr)
 {
-        int err;
+        errno_t err;
 
         xhci_trb_t trb;
@@ -781 +781 @@
  * DCBAA with the newly created slot.
  */
-int hc_enable_slot(xhci_device_t *dev)
-{
-        int err;
+errno_t hc_enable_slot(xhci_device_t *dev)
+{
+        errno_t err;
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
 
@@ -815 +815 @@
  * Frees the device context.
  */
-int hc_disable_slot(xhci_device_t *dev)
-{
-        int err;
+errno_t hc_disable_slot(xhci_device_t *dev)
+{
+        errno_t err;
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
 
@@ -837 +837 @@
  * Prepare an empty Endpoint Input Context inside a dma buffer.
  */
-static int create_configure_ep_input_ctx(xhci_device_t *dev, dma_buffer_t *dma_buf)
+static errno_t create_configure_ep_input_ctx(xhci_device_t *dev, dma_buffer_t *dma_buf)
 {
         const xhci_hc_t * hc = bus_to_hc(dev->base.bus);
-        const int err = dma_buffer_alloc(dma_buf, XHCI_INPUT_CTX_SIZE(hc));
+        const errno_t err = dma_buffer_alloc(dma_buf, XHCI_INPUT_CTX_SIZE(hc));
         if (err)
                 return err;
@@ -860 +860 @@
  * @param dev Device to assing an address (unconfigured yet)
  */
-int hc_address_device(xhci_device_t *dev)
-{
-        int err = ENOMEM;
+errno_t hc_address_device(xhci_device_t *dev)
+{
+        errno_t err = ENOMEM;
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
         xhci_endpoint_t *ep0 = xhci_endpoint_get(dev->base.endpoints[0]);
@@ -908 +908 @@
  * @param slot_id Slot ID assigned to the device.
  */
-int hc_configure_device(xhci_device_t *dev)
+errno_t hc_configure_device(xhci_device_t *dev)
 {
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
@@ -914 +914 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
+        const errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
         if (err)
                 return err;
@@ -929 +929 @@
  * @param dev The owner of the device
  */
-int hc_deconfigure_device(xhci_device_t *dev)
+errno_t hc_deconfigure_device(xhci_device_t *dev)
 {
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
@@ -950 +950 @@
  * @param ep_ctx Endpoint context of the endpoint
  */
-int hc_add_endpoint(xhci_endpoint_t *ep)
+errno_t hc_add_endpoint(xhci_endpoint_t *ep)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);
@@ -957 +957 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
+        const errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
         if (err)
                 return err;
@@ -981 +981 @@
  * @param ep_idx Endpoint DCI in question
  */
-int hc_drop_endpoint(xhci_endpoint_t *ep)
+errno_t hc_drop_endpoint(xhci_endpoint_t *ep)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);
@@ -992 +992 @@
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        const int err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
+        const errno_t err = create_configure_ep_input_ctx(dev, &ictx_dma_buf);
         if (err)
                 return err;
@@ -1013 +1013 @@
  * @param ep_ctx Endpoint context of the endpoint
  */
-int hc_update_endpoint(xhci_endpoint_t *ep)
+errno_t hc_update_endpoint(xhci_endpoint_t *ep)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);
@@ -1021 +1021 @@
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
 
-        const int err = dma_buffer_alloc(&ictx_dma_buf, XHCI_INPUT_CTX_SIZE(hc));
+        const errno_t err = dma_buffer_alloc(&ictx_dma_buf, XHCI_INPUT_CTX_SIZE(hc));
         if (err)
                 return err;
@@ -1044 +1044 @@
  * @param ep_idx Endpoint DCI in question
  */
-int hc_stop_endpoint(xhci_endpoint_t *ep)
+errno_t hc_stop_endpoint(xhci_endpoint_t *ep)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);
@@ -1065 +1065 @@
  * @param ep_idx Endpoint DCI in question
  */
-int hc_reset_endpoint(xhci_endpoint_t *ep)
+errno_t hc_reset_endpoint(xhci_endpoint_t *ep)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);
@@ -1081 +1081 @@
  * @param dev The owner of the endpoint
  */
-int hc_reset_ring(xhci_endpoint_t *ep, uint32_t stream_id)
+errno_t hc_reset_ring(xhci_endpoint_t *ep, uint32_t stream_id)
 {
         xhci_device_t * const dev = xhci_ep_to_dev(ep);