Merge pull request #300 from adafruit/fix-warnings

Fix warnings
adafruit · May 24, 2021 · cca8448 · cca8448
2 parents fa24f50 + 33a1e15
commit cca8448
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/libraries/Adafruit_TinyUSB_Arduino b/libraries/Adafruit_TinyUSB_Arduino
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
@@ -333,24 +333,16 @@ void SPIClass::dmaAllocate(void) {
           use_dma = true; // Everything allocated successfully
           extraWriteDescriptors = &extraReadDescriptors[numReadDescriptors];
 
-          // dmac.h didn't include extern "C" which cause
-          // DmacDescriptor and its members are defined as C++ struct therefore
-          // memcpy will throw warning on copying where simple assignment won't work
-          #pragma GCC diagnostic push
-          #pragma GCC diagnostic ignored "-Wclass-memaccess"
-
           // Initialize descriptors (copy from first ones)
+          // cast to void* to suppress warning: with no trivial copy-assignment [-Wclass-memaccess]
           for(int i=0; i<numReadDescriptors; i++) {
-            memcpy(&extraReadDescriptors[i], firstReadDescriptor,
+            memcpy((void*) &extraReadDescriptors[i], firstReadDescriptor,
               sizeof(DmacDescriptor));
           }
           for(int i=0; i<numWriteDescriptors; i++) {
-            memcpy(&extraWriteDescriptors[i], firstWriteDescriptor,
+            memcpy((void*) &extraWriteDescriptors[i], firstWriteDescriptor,
               sizeof(DmacDescriptor));
           }
-
-          #pragma GCC diagnostic pop
-
         } // end malloc
       } // end extra descriptor check
 

diff --git a/platform.txt b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.7.0
+version=1.7.1
 
 # Compile variables
 # -----------------
@@ -70,7 +70,7 @@ compiler.S.extra_flags=
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
-compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Core/Include/" "-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/DSP/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.1.path}/CMSIS/Device/ATMEL/"
+compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Core/Include/" "-I{runtime.tools.CMSIS-5.4.0.path}/CMSIS/DSP/Include/" "-I{runtime.tools.CMSIS-Atmel-1.2.2.path}/CMSIS/Device/ATMEL/"
 compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 compiler.libraries.ldflags=
+2 −1		README.md
+11 −0		changelog.md
+4 −0		examples/Composite/hid_generic_inout_ramdisk/hid_generic_inout_ramdisk.ino
+4 −0		examples/HID/hid_generic_inout/hid_generic_inout.ino
+7 −0		examples/HID/hid_keyboard/hid_keyboard.ino
+1 −1		library.properties
+5 −4		src/Adafruit_TinyUSB.h
+1 −1		src/arduino/ports/Adafruit_TinyUSB_rp2040.cpp
+1 −1		src/arduino/ports/Adafruit_TinyUSB_samd.cpp
+2 −0		src/osal/osal_pico.h