merge buffer allocation methods

Author: Holden

source/include/NetworkBufferManagement.h

@@ -34,45 +34,35 @@
 #endif
 /* *INDENT-ON* */
 
+#ifndef ipconfigBUFFER_ALLOC
+#define ipconfigBUFFER_ALLOC    0
+#endif
+
 /* NOTE PUBLIC API FUNCTIONS. */
 BaseType_t xNetworkBuffersInitialise( void );
+
 NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedSizeBytes,
                                                               TickType_t xBlockTimeTicks );
 
-/* The definition of the below function is only available if BufferAllocation_2.c has been linked into the source. */
-NetworkBufferDescriptor_t * pxNetworkBufferGetFromISR( size_t xRequestedSizeBytes );
 void vReleaseNetworkBufferAndDescriptor( NetworkBufferDescriptor_t * const pxNetworkBuffer );
 
-/* The definition of the below function is only available if BufferAllocation_2.c has been linked into the source. */
+NetworkBufferDescriptor_t * pxDuplicateNetworkBufferWithDescriptor( const NetworkBufferDescriptor_t * const pxNetworkBuffer,
+																	size_t uxNewLength );
+
+#if ( ipconfigBUFFER_ALLOC != 0 )
+NetworkBufferDescriptor_t * pxResizeNetworkBufferWithDescriptor( NetworkBufferDescriptor_t * pxNetworkBuffer,
+                                                                 size_t xNewSizeBytes );
+NetworkBufferDescriptor_t * pxNetworkBufferGetFromISR( size_t xRequestedSizeBytes );
+
 BaseType_t vNetworkBufferReleaseFromISR( NetworkBufferDescriptor_t * const pxNetworkBuffer );
-uint8_t * pucGetNetworkBuffer( size_t * pxRequestedSizeBytes );
-void vReleaseNetworkBuffer( uint8_t * pucEthernetBuffer );
+#endif
 
 /* Get the current number of free network buffers. */
 UBaseType_t uxGetNumberOfFreeNetworkBuffers( void );
 
 /* Get the lowest number of free network buffers. */
 UBaseType_t uxGetMinimumFreeNetworkBuffers( void );
 
-/* Copy a network buffer into a bigger buffer. */
-NetworkBufferDescriptor_t * pxDuplicateNetworkBufferWithDescriptor( const NetworkBufferDescriptor_t * const pxNetworkBuffer,
-                                                                    size_t uxNewLength );
-
-/* Increase the size of a Network Buffer.
- * In case BufferAllocation_2.c is used, the new space must be allocated. */
-NetworkBufferDescriptor_t * pxResizeNetworkBufferWithDescriptor( NetworkBufferDescriptor_t * pxNetworkBuffer,
-                                                                 size_t xNewSizeBytes );
-
-#if ipconfigTCP_IP_SANITY
-
-/*
- * Check if an address is a valid pointer to a network descriptor
- * by looking it up in the array of network descriptors
- */
-    UBaseType_t bIsValidNetworkDescriptor( const NetworkBufferDescriptor_t * pxDesc );
-    BaseType_t prvIsFreeBuffer( const NetworkBufferDescriptor_t * pxDescr );
-#endif
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     } /* extern "C" */