Rename USB variables

Author: multiplemonomials

.github/workflows/greentea_cmake.yml

@@ -143,14 +143,15 @@ jobs:
 
       - name: Build ${{ matrix.target }} with baremetal profile
         if: ${{ matrix.profile == 'baremetal' }}
+        # Note: We have to set a wifi network name and password so that the test will compile on devices that use wifi
         run: |
             rm -rf __build
-            cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_TEST_BAREMETAL=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }} -DMBED_APP_JSON_PATH=TESTS/configs/baremetal.json
+            cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DMBED_GREENTEA_WIFI_SECURE_SSID=SomeNetwork MBED_GREENTEA_WIFI_SECURE_PASSWORD=SomePassword -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_TEST_BAREMETAL=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }} -DMBED_APP_JSON_PATH=TESTS/configs/baremetal.json
             cmake --build __build
 
       - name: Build ${{ matrix.target }} with full profile
         if: ${{ matrix.profile == 'full' }}
         run: |
             rm -rf __build
-            cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }}
+            cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DMBED_GREENTEA_WIFI_SECURE_SSID=SomeNetwork MBED_GREENTEA_WIFI_SECURE_PASSWORD=SomePassword -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }}
             cmake --build __build

drivers/usb/include/usb/internal/Task.h

@@ -29,7 +29,7 @@ namespace events {
  */
 
 
-template<typename F, typename A1 = void, typename A2 = void, typename A3 = void, typename A4 = void, typename A5 = void>
+template<typename F, typename ARG1 = void, typename ARG2 = void, typename ARG3 = void, typename ARG4 = void, typename ARG5 = void>
 struct AllArgs;
 
 template<typename B0>
@@ -543,24 +543,24 @@ class Task<R()>: public TaskBase {
     All _args;
 };
 
-template <typename R, typename A0>
-class Task<R(A0)>: public TaskBase {
+template <typename R, typename ARG0>
+class Task<R(ARG0)>: public TaskBase {
 public:
 
-    Task(TaskQueue *q = NULL, mbed::Callback<R(A0)> cb = mbed::Callback<R(A0)>())
+    Task(TaskQueue *q = NULL, mbed::Callback<R(ARG0)> cb = mbed::Callback<R(ARG0)>())
         : TaskBase(q), _args(cb)
     {
     }
 
-    Task &operator=(mbed::Callback<R(A0)> cb)
+    Task &operator=(mbed::Callback<R(ARG0)> cb)
     {
         _args.b0 = cb;
         return *this;
     }
 
-    void call(A0 a0)
+    void call(ARG0 arg0)
     {
-        _args.b1 = a0;
+        _args.b1 = arg0;
         post();
     }
 
@@ -578,16 +578,16 @@ class Task<R(A0)>: public TaskBase {
     }
 
 private:
-    typedef AllArgs<mbed::Callback<R(A0)>, A0> All;
+    typedef AllArgs<mbed::Callback<R(ARG0)>, ARG0> All;
     All _args;
 };
 
 /** Task
  *
  *  Representation of a postable task
  */
-template <typename R, typename A0, typename A1>
-class Task<R(A0, A1)>: public TaskBase {
+template <typename R, typename ARG0, typename ARG1>
+class Task<R(ARG0, ARG1)>: public TaskBase {
 public:
 
     /**
@@ -596,7 +596,7 @@ class Task<R(A0, A1)>: public TaskBase {
      * @param q TaskQueue to post to
      * @param cb Callback to run
      */
-    Task(TaskQueue *q = NULL, mbed::Callback<R(A0, A1)> cb = mbed::Callback<R(A0, A1)>())
+    Task(TaskQueue *q = NULL, mbed::Callback<R(ARG0, ARG1)> cb = mbed::Callback<R(ARG0, ARG1)>())
         : TaskBase(q), _args(cb)
     {
     }
@@ -606,7 +606,7 @@ class Task<R(A0, A1)>: public TaskBase {
      *
      * @param cb Callback to run
      */
-    Task &operator=(mbed::Callback<R(A0, A1)> cb)
+    Task &operator=(mbed::Callback<R(ARG0, ARG1)> cb)
     {
         _args.b0 = cb;
         return *this;
@@ -620,13 +620,13 @@ class Task<R(A0, A1)>: public TaskBase {
      * expects two integers as arguments to call, while Task<void()>
      * expects no arguments.
      *
-     * @param a0 First callback parameter
-     * @param a1 Second callback parameter
+     * @param arg0 First callback parameter
+     * @param arg1 Second callback parameter
      */
-    void call(A0 a0, A1 a1)
+    void call(ARG0 arg0, ARG1 arg1)
     {
-        _args.b1 = a0;
-        _args.b2 = a1;
+        _args.b1 = arg0;
+        _args.b2 = arg1;
         post();
     }
 
@@ -644,7 +644,7 @@ class Task<R(A0, A1)>: public TaskBase {
     }
 
 private:
-    typedef AllArgs<mbed::Callback<R(A0, A1)>, A0, A1> All;
+    typedef AllArgs<mbed::Callback<R(ARG0, ARG1)>, ARG0, ARG1> All;
     All _args;
 };
 

drivers/usb/tests/TESTS/usb_device/msd/main.cpp

@@ -243,14 +243,14 @@ void msd_process(USBMSD *msd)
 
 #define TEST_ASSERT_EQUAL_STRING_LOOP(expected, actual, loop_index)                             \
         if (strcmp(expected, actual) != 0) {                                                    \
-            char str[128];                                                                      \
+            char str[255];                                                                      \
             sprintf(str, "expected %s was %s (loop index: %lu)", expected, actual, loop_index); \
             TEST_ASSERT_MESSAGE(false, str);                                                    \
         }
 
 #define TEST_ASSERT_EQUAL_LOOP(expected, actual, loop_index)                                    \
         if (expected != actual) {                                                               \
-            char str[128];                                                                      \
+            char str[255];                                                                      \
             sprintf(str, "expected %d was %d (loop index: %lu)", expected, actual, loop_index); \
             TEST_ASSERT_MESSAGE(false, str);                                                    \
         }