Always call xfer done if there is a data stage

Call callback_request_xfer_done regardless of if the current transfer
is aborted if complete_request is called with a buffer to send or fill.
This makes memory management much easier.

This patch also adds an aborted parameter to callback_request_xfer_done
so the code can check if the transfer was aborted.

Author: c1728p9

TESTS/usb_device/basic/USBTester.cpp

@@ -108,8 +108,13 @@ void USBTester::callback_request(const setup_packet_t *setup)
 
 }
 
-void USBTester::callback_request_xfer_done(const setup_packet_t *setup)
+void USBTester::callback_request_xfer_done(const setup_packet_t *setup, bool aborted)
 {
+    if (aborted) {
+        complete_request_xfer_done(false);
+        return;
+    }
+
     bool result = false;
     if (setup->bmRequestType.Type == VENDOR_TYPE) {
         switch (setup->bRequest) {

TESTS/usb_device/basic/USBTester.h

@@ -79,7 +79,7 @@ class USBTester: public USBDevice {
 
     virtual void callback_state_change(DeviceState new_state);
     virtual void callback_request(const setup_packet_t *setup);
-    virtual void callback_request_xfer_done(const setup_packet_t *setup);
+    virtual void callback_request_xfer_done(const setup_packet_t *setup, bool aborted);
     virtual void callback_set_configuration(uint8_t configuration);
     virtual void callback_set_interface(uint16_t interface, uint8_t alternate);
     virtual void epbulk_out_callback(usb_ep_t endpoint);

usb/device/USBDevice/USBDevice.cpp

@@ -218,7 +218,8 @@ bool USBDevice::_control_out()
         if (_transfer.notify) {
             /* Notify class layer. */
             _transfer.notify = false;
-            callback_request_xfer_done(&_transfer.setup);
+            _transfer.user_callback = true;
+            callback_request_xfer_done(&_transfer.setup, false);
         } else {
             complete_request_xfer_done(true);
         }
@@ -279,7 +280,7 @@ bool USBDevice::_control_in()
             /* Notify class layer. */
             _transfer.notify = false;
             _transfer.user_callback = true;
-            callback_request_xfer_done(&_transfer.setup);
+            callback_request_xfer_done(&_transfer.setup, false);
         } else {
             complete_request_xfer_done(true);
         }
@@ -639,7 +640,12 @@ void USBDevice::complete_request(RequestResult direction, uint8_t *data, uint32_
 
     _transfer.user_callback = false;
     if (_abort_control) {
-        _control_abort();
+        if ((direction == Receive) || (direction == Send)) {
+            _transfer.user_callback = true;
+            callback_request_xfer_done(&_transfer.setup, true);
+        } else {
+            _control_abort();
+        }
         unlock();
         return;
     }

usb/device/USBDevice/USBDevice.h

@@ -394,9 +394,12 @@ class USBDevice: public  USBPhyEvents {
     * The function complete_request_xfer_done must be always be called
     * in response to this callback.
     *
+    * @param setup Setup packet of the current request
+    * @param aborted false if the operation was aborted, true otherwise
+    *
     * Warning: Called in ISR context
     */
-    virtual void callback_request_xfer_done(const setup_packet_t *setup) = 0;
+    virtual void callback_request_xfer_done(const setup_packet_t *setup, bool aborted) = 0;
 
     /**
      * Called to complete the data stage of a callback request