Changeset a0be5d0 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2017-10-09T14:11:22Z (7 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

42bc933

Parents:

ae03552e

Message:

Moved ring_doorbell, added address check

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include "trb_ring.h"
 
-static inline int ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
-{
-        assert(hc);
-        uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
-        pio_write_32(&hc->db_arry[doorbell], v);
-        return EOK;
-}
-
 static inline uint8_t get_transfer_type(xhci_trb_t* trb, uint8_t bmRequestType, uint16_t wLength)
 {
@@ -143 +135 @@
 {
         if (!batch->setup_size) {
+                usb_log_error("Missing setup packet for the control transfer.");
                 return EINVAL;
         }
         if (batch->ep->endpoint != 0 || batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
                 /* This method only works for control transfers. */
+                usb_log_error("Attempted to schedule control transfer to non 0 endpoint.");
                 return EINVAL;
         }
@@ -223 +217 @@
 
         /* For control transfers, the target is always 1. */
-        ring_doorbell(hc, slot_id, 1);
+        hc_ring_doorbell(hc, slot_id, 1);
         return EOK;
 }