Use seperate ATTR_NON_NULL_PTR_ARG() decorators in the XMEGA TWI driver to prevent...

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 924aebf..3837149 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -14,6 +14,7 @@
   *   - Added new Printer Device Class driver
   *   - Added support for the XMEGA C3 Xplained board
   *   - Added support for the U2S board (thanks to megal0maniac)
   *   - Added new Printer Device Class driver
   *   - Added support for the XMEGA C3 Xplained board
   *   - Added support for the U2S board (thanks to megal0maniac)

+  *   - Added TWI Master driver for the XMEGA architecture (thanks to Michael Janssen)

   *  - Library Applications:
   *   - Added new Printer class bootloader
   *   - Added new Mass Storage class bootloader
   *  - Library Applications:
   *   - Added new Printer class bootloader
   *   - Added new Mass Storage class bootloader

diff --git a/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
index 1f45263..8ea19e5 100644 (file)
--- a/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
@@ -247,7 +247,7 @@
                         */
                        bool TWI_ReceiveByte(TWI_t* const TWI,
                                             uint8_t* const Byte,
                         */
                        bool TWI_ReceiveByte(TWI_t* const TWI,
                                             uint8_t* const Byte,

-                                            const bool LastByte) ATTR_NON_NULL_PTR_ARG(1, 2);
+                                            const bool LastByte) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);

 
                        /** High level function to perform a complete packet transfer over the TWI bus to the specified
                         *  device.
 
                        /** High level function to perform a complete packet transfer over the TWI bus to the specified
                         *  device.


@@ -268,7 +268,7 @@
                                               const uint8_t* InternalAddress,
                                               uint8_t InternalAddressLen,
                                               uint8_t* Buffer,
                                               const uint8_t* InternalAddress,
                                               uint8_t InternalAddressLen,
                                               uint8_t* Buffer,

-                                              uint8_t Length) ATTR_NON_NULL_PTR_ARG(1, 4);
+                                              uint8_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(4);

 
                        /** High level function to perform a complete packet transfer over the TWI bus from the specified
                         *  device.
 
                        /** High level function to perform a complete packet transfer over the TWI bus from the specified
                         *  device.


@@ -289,7 +289,7 @@
                                                const uint8_t* InternalAddress,
                                                uint8_t InternalAddressLen,
                                                const uint8_t* Buffer,
                                                const uint8_t* InternalAddress,
                                                uint8_t InternalAddressLen,
                                                const uint8_t* Buffer,

-                                               uint8_t Length) ATTR_NON_NULL_PTR_ARG(1, 4);
+                                               uint8_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(4);

 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)