minor cleanup

Author: Holden

source/portable/BufferManagement/BufferAllocation.c

@@ -24,16 +24,14 @@
 #define STATIC_ASSERT( e ) \
     enum { ASSERT_CONCAT( assert_line_, __LINE__ ) = 1 / ( !!( e ) ) }
 
-#define baALIGNMENT_MASK                        ( portBYTE_ALIGNMENT - 1U )
-
 #if ipconfigIS_ENABLED( ipconfigBUFFER_ALLOC_STATIC )
     #define baINTERRUPT_BUFFER_GET_THRESHOLD    ( 3 )
     #if ipconfigIS_DISABLED( ipconfigBUFFER_ALLOC_STATIC_CUSTOM_SIZE )
         uxBufferAllocFixedSize = ipTOTAL_ETHERNET_FRAME_SIZE;
     #endif
     STATIC_ASSERT( uxBufferAllocFixedSize > 0 );
     #define baBUFFER_SIZE            ( uxBufferAllocFixedSize + ipBUFFER_PADDING )
-    #define baBUFFER_SIZE_ALIGNED    ( ( baBUFFER_SIZE + portBYTE_ALIGNMENT ) & ~baALIGNMENT_MASK )
+    #define baBUFFER_SIZE_ALIGNED    ( ( baBUFFER_SIZE + portBYTE_ALIGNMENT ) & ~portBYTE_ALIGNMENT_MASK )
 #else
 
 /* The obtained network buffer must be large enough to hold a packet that might
@@ -184,9 +182,9 @@ UBaseType_t uxGetNumberOfFreeNetworkBuffers( void )
 
         /* Round up xSize to the nearest multiple of N bytes,
          * where N equals 'sizeof( size_t )'. */
-        if( ( xSize & baALIGNMENT_MASK ) != 0U )
+        if( ( xSize & portBYTE_ALIGNMENT_MASK ) != 0U )
         {
-            const size_t xBytesRequiredForAlignment = portBYTE_ALIGNMENT - ( xSize & baALIGNMENT_MASK );
+            const size_t xBytesRequiredForAlignment = portBYTE_ALIGNMENT - ( xSize & portBYTE_ALIGNMENT_MASK );
 
             if( baADD_WILL_OVERFLOW( xSize, xBytesRequiredForAlignment ) == 0 )
             {
@@ -421,9 +419,9 @@ NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedS
             xIntegerOverflowed = pdTRUE;
         }
 
-        if( ( xRequestedSizeBytesCopy & baALIGNMENT_MASK ) != 0U )
+        if( ( xRequestedSizeBytesCopy & portBYTE_ALIGNMENT_MASK ) != 0U )
         {
-            const size_t xBytesRequiredForAlignment = portBYTE_ALIGNMENT - ( xRequestedSizeBytesCopy & baALIGNMENT_MASK );
+            const size_t xBytesRequiredForAlignment = portBYTE_ALIGNMENT - ( xRequestedSizeBytesCopy & portBYTE_ALIGNMENT_MASK );
 
             if( baADD_WILL_OVERFLOW( xRequestedSizeBytesCopy, xBytesRequiredForAlignment ) == 0 )
             {

source/portable/NetworkInterface/DriverSAM/gmac_SAM.c

@@ -123,22 +123,6 @@
  * @{
  */
 
-/*
- *     When BufferAllocation_1.c is used, the network buffer space
- *     is declared statically as 'ucNetworkPackets[]'.
- *     Like the DMA descriptors, this array is located in a non-cached area.
- *     Here an example of the total size:
- *
- *         #define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS    24
- *         #define GMAC_FRAME_LENTGH_MAX                     1536
- *         Hidden space for back-pointer and IP-type         16
- *
- *     Total size: 24 * ( 1536 + 16 ) = 37248 bytes
- */
-__attribute__( ( aligned( 32 ) ) )
-__attribute__( ( section( ".first_data" ) ) )
-uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * NETWORK_BUFFER_SIZE ];
-
 /** TX descriptor lists */
 __attribute__( ( section( ".first_data" ) ) )
 COMPILER_ALIGNED( 8 )