Changeset 110d795 in mainline for uspace/drv/bus/usb/xhci/commands.h

Timestamp:

2017-07-22T23:07:40Z (8 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

aee352c

Parents:

9af3281

Message:

Overhauled command system, not a special structure is passed that can be kept and polled for completion.

File:

• uspace/drv/bus/usb/xhci/commands.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/commands.h

@@ -37 +37 @@
 #define XHCI_COMMANDS_H
 
+#include <adt/list.h>
+#include <stdbool.h>
+
 typedef struct xhci_hc xhci_hc_t;
 typedef struct xhci_trb xhci_trb_t;
 typedef struct xhci_input_ctx xhci_input_ctx_t;
 
-int xhci_send_no_op_command(xhci_hc_t *);
-int xhci_send_enable_slot_command(xhci_hc_t *);
-int xhci_send_disable_slot_command(xhci_hc_t *, uint32_t);
-int xhci_send_address_device_command(xhci_hc_t *, uint32_t, xhci_input_ctx_t *);
-int xhci_send_configure_endpoint_command(xhci_hc_t *, uint32_t, xhci_input_ctx_t *);
-int xhci_send_evaluate_context_command(xhci_hc_t *, uint32_t, xhci_input_ctx_t *);
-int xhci_send_reset_endpoint_command(xhci_hc_t *, uint32_t, uint32_t, uint8_t);
-int xhci_send_stop_endpoint_command(xhci_hc_t *, uint32_t, uint32_t, uint8_t);
+typedef struct xhci_command {
+        link_t link;
+
+        xhci_trb_t *trb;
+        xhci_input_ctx_t *ictx;
+        uint32_t slot_id;
+        uint32_t status;
+
+        bool completed;
+        bool has_owner;
+} xhci_cmd_t;
+
+int xhci_init_commands(xhci_hc_t *);
+int xhci_wait_for_command(xhci_hc_t *, xhci_cmd_t *, uint32_t);
+xhci_cmd_t *xhci_alloc_command(void);
+void xhci_free_command(xhci_cmd_t *);
+
+int xhci_send_no_op_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_enable_slot_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_disable_slot_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_address_device_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_configure_endpoint_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_evaluate_context_command(xhci_hc_t *, xhci_cmd_t *);
+int xhci_send_reset_endpoint_command(xhci_hc_t *, xhci_cmd_t *, uint32_t, uint8_t);
+int xhci_send_stop_endpoint_command(xhci_hc_t *, xhci_cmd_t *, uint32_t, uint8_t);
 // TODO: Set dequeue ptr (section 4.6.10).
-int xhci_send_reset_device_command(xhci_hc_t *, uint32_t);
+int xhci_send_reset_device_command(xhci_hc_t *, xhci_cmd_t *);
 // TODO: Force event (optional normative, for VMM, section 4.6.12).
 // TODO: Negotiate bandwidth (optional normative, section 4.6.13).