Merge remote-tracking branch 'github/master'

Author: Sebastian Paarz

common/core/inc/ux_api.h

@@ -348,7 +348,9 @@ typedef signed char               SCHAR;
 #define AZURE_RTOS_USBX
 #define USBX_MAJOR_VERSION            6
 #define USBX_MINOR_VERSION            4
-#define USBX_PATCH_VERSION            2
+#define USBX_PATCH_VERSION            3
+#define USBX_BUILD_VERSION            202503
+#define USBX_HOTFIX_VERSION           ''
 
 /* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens.  */
 
@@ -2747,9 +2749,9 @@ typedef struct UX_HOST_CLASS_DPUMP_STRUCT
 /* Define USBX Services.  */
 
 #if defined(UX_SYSTEM_ENABLE_ERROR_CHECKING)
-#define ux_system_initialize                                    _ux_system_initialize
-#else
 #define ux_system_initialize                                    _uxe_system_initialize
+#else
+#define ux_system_initialize                                    _ux_system_initialize
 #endif
 
 #define ux_system_uninitialize                                  _ux_system_uninitialize

common/core/inc/ux_utility.h

@@ -172,7 +172,7 @@ extern  ULONG       _ux_utility_time_get(VOID);
 #endif
 
 #ifndef             _ux_utility_time_elapsed
-#define             _ux_utility_time_elapsed(a,b)          (((b)>=(a)) ? ((b)-(a)) : (0xFFFFFFFFul-(b)+(a)+1))
+#define             _ux_utility_time_elapsed(a,b)          (((b)>=(a)) ? ((b)-(a)) : (0xFFFFFFFFul-(a)+(b)+1))
 #else
 extern  ALIGN_TYPE  _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
 #endif

common/usbx_device_classes/src/ux_device_class_hid_deactivate.c

@@ -86,6 +86,10 @@ UX_SLAVE_CLASS             *class_ptr;
     /* Terminate the transactions pending on the endpoints.  */
     _ux_device_stack_transfer_all_request_abort(hid -> ux_device_class_hid_interrupt_endpoint, UX_TRANSFER_BUS_RESET);
 
+#if defined(UX_DEVICE_CLASS_HID_INTERRUPT_OUT_SUPPORT)
+    _ux_device_stack_transfer_all_request_abort(hid -> ux_device_class_hid_read_endpoint, UX_TRANSFER_BUS_RESET);
+#endif
+
     /* If there is a deactivate function call it.  */
     if (hid -> ux_slave_class_hid_instance_deactivate != UX_NULL)
     {

common/usbx_device_classes/src/ux_device_class_pima_interrupt_thread.c

@@ -169,10 +169,10 @@ UCHAR                       *buffer;
                 _ux_utility_long_put(buffer + UX_DEVICE_CLASS_PIMA_AEI_PARAMETER_1, pima_event.ux_device_class_pima_event_parameter_1);
 
                 /* Put the value of parameter 2.   */
-                _ux_utility_long_put(buffer + UX_DEVICE_CLASS_PIMA_AEI_PARAMETER_2, pima_event.ux_device_class_pima_event_parameter_3);
+                _ux_utility_long_put(buffer + UX_DEVICE_CLASS_PIMA_AEI_PARAMETER_2, pima_event.ux_device_class_pima_event_parameter_2);
 
                 /* Put the value of parameter 3.   */
-                _ux_utility_long_put(buffer + UX_DEVICE_CLASS_PIMA_AEI_PARAMETER_2, pima_event.ux_device_class_pima_event_parameter_3);
+                _ux_utility_long_put(buffer + UX_DEVICE_CLASS_PIMA_AEI_PARAMETER_3, pima_event.ux_device_class_pima_event_parameter_3);
 
                 /* Send the request to the device controller.  */
                 status =  _ux_device_stack_transfer_request(transfer_request_in, UX_DEVICE_CLASS_PIMA_AEI_MAX_LENGTH, UX_DEVICE_CLASS_PIMA_AEI_MAX_LENGTH);

common/usbx_device_classes/src/ux_device_class_pima_object_info_send.c

@@ -223,10 +223,18 @@ ULONG                       object_handle;
         /* Send the object to the application.  */
         status = pima -> ux_device_class_pima_object_info_send(pima, object, storage_id, parent_object_handle, &object_handle);
 
-        /* Now we return a response with success.  */
-        status = (status == UX_SUCCESS) ? UX_DEVICE_CLASS_PIMA_RC_OK : status;
-        _ux_device_class_pima_response_send(pima, status, 3, pima -> ux_device_class_pima_storage_id, 
+        if (status != UX_SUCCESS)
+        {
+            /* Now we return a response with error.  */
+            _ux_device_class_pima_response_send(pima, status, 3, pima -> ux_device_class_pima_storage_id, 
                                             object -> ux_device_class_pima_object_parent_object, object_handle);
+        }
+        else
+        {
+            /* Now we return a response with success.  */
+            _ux_device_class_pima_response_send(pima, UX_DEVICE_CLASS_PIMA_RC_OK, 3, pima -> ux_device_class_pima_storage_id, 
+                                            object -> ux_device_class_pima_object_parent_object, object_handle);
+        }
 
         /* Store the object handle. It will be used for the OBJECT_SEND command.  */
         pima -> ux_device_class_pima_current_object_handle =  object_handle;

common/usbx_device_classes/src/ux_device_class_pima_object_references_set.c

@@ -128,10 +128,16 @@ ULONG                   object_references_length;
 
         /* Send the object references to the application.  */
         status = pima -> ux_device_class_pima_object_references_set(pima, object_handle, object_references, object_references_length);
-    
-        /* Now we return a response with success.  */
-        status = (status == UX_SUCCESS) ? UX_DEVICE_CLASS_PIMA_RC_OK : status;
-        _ux_device_class_pima_response_send(pima, status, 0, 0, 0, 0);
+
+        /* Check error code from application.  */
+        if (status == UX_SUCCESS)
+
+            /* Now we return a response with success.  */
+            _ux_device_class_pima_response_send(pima, UX_DEVICE_CLASS_PIMA_RC_OK, 0, 0, 0, 0);
+        else
+
+            /* We return an error.  The code is passed by the application.  */
+            _ux_device_class_pima_response_send(pima, status, 0, 0, 0, 0);
 
     }
     else

common/usbx_device_classes/src/ux_device_class_storage_initialize.c

@@ -1,10 +1,10 @@
 /***************************************************************************
- * Copyright (c) 2024 Microsoft Corporation 
- * 
+ * Copyright (c) 2024 Microsoft Corporation
+ *
  * This program and the accompanying materials are made available under the
  * terms of the MIT License which is available at
  * https://opensource.org/licenses/MIT.
- * 
+ *
  * SPDX-License-Identifier: MIT
  **************************************************************************/
 
@@ -30,7 +30,7 @@
 
 /* Define the Slave Storage Class Inquiry data : DO NOT CHANGE THE LENGTH OF THESE ITEMS */
 
-UCHAR _ux_system_slave_class_storage_vendor_id[] =                          "AzureRTO";
+UCHAR _ux_system_slave_class_storage_vendor_id[] =                          "Eclipse ";
 UCHAR _ux_system_slave_class_storage_product_id[] =                         "USBX storage dev";
 UCHAR _ux_system_slave_class_storage_product_rev[] =                        "2000";
 UCHAR _ux_system_slave_class_storage_product_serial[] =                     "12345678901234567890";
@@ -290,8 +290,17 @@ UINT                                    i;
     storage_parameter =  command -> ux_slave_class_command_parameter;
 
     /* Sanity checks.  */
-    if (storage_parameter -> ux_slave_class_storage_parameter_number_lun > UX_MAX_SLAVE_LUN)
+    if ((storage_parameter -> ux_slave_class_storage_parameter_number_lun > UX_MAX_SLAVE_LUN) ||
+        ((storage_parameter -> ux_slave_class_storage_parameter_vendor_id != UX_NULL) &&
+        ( _ux_utility_string_length_get(storage_parameter -> ux_slave_class_storage_parameter_vendor_id) != 8)) ||
+        ((storage_parameter -> ux_slave_class_storage_parameter_product_id != UX_NULL) &&
+        ( _ux_utility_string_length_get(storage_parameter -> ux_slave_class_storage_parameter_product_id) != 16)) ||
+        ((storage_parameter -> ux_slave_class_storage_parameter_product_rev != UX_NULL) &&
+        ( _ux_utility_string_length_get(storage_parameter -> ux_slave_class_storage_parameter_product_rev) != 4)) ||
+        ((storage_parameter -> ux_slave_class_storage_parameter_product_serial != UX_NULL) &&
+        ( _ux_utility_string_length_get(storage_parameter -> ux_slave_class_storage_parameter_product_serial) != 20)))
         return(UX_INVALID_PARAMETER);
+
     for (i = 0; i < storage_parameter -> ux_slave_class_storage_parameter_number_lun; i ++)
     {
         if ((storage_parameter -> ux_slave_class_storage_parameter_lun[i].