From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14771 invoked by alias); 27 Jun 2013 19:22:48 -0000 Mailing-List: contact ecos-devel-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: ecos-devel-owner@ecos.sourceware.org Received: (qmail 14717 invoked by uid 89); 27 Jun 2013 19:22:47 -0000 X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.1 Received: from mail.carallon.com (HELO mail.carallon.com) (95.177.28.122) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 27 Jun 2013 19:22:46 +0000 X-MDAV-Result: clean X-MDAV-Processed: mail.carallon.com, Thu, 27 Jun 2013 20:22:44 +0100 Received: from [172.20.1.8] by mail.carallon.com (Cipher TLSv1:-SHA:128) (MDaemon PRO v13.0.5) with ESMTP id md50001323240.msg for ; Thu, 27 Jun 2013 20:22:44 +0100 X-Spam-Processed: mail.carallon.com, Thu, 27 Jun 2013 20:22:44 +0100 (not processed: message from trusted or authenticated source) X-MDRemoteIP: 172.20.1.8 X-Return-Path: will_wagner@carallon.com X-Envelope-From: will_wagner@carallon.com X-MDaemon-Deliver-To: ecos-devel@sourceware.org Message-ID: <51CC9102.9030002@carallon.com> Date: Thu, 27 Jun 2013 19:22:00 -0000 From: Will Wagner User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: eCos development list Subject: [RFC 4/9] * Apply previous ecos modifications to lwip Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2013-06/txt/msg00007.txt.bz2 There had been a couple of changes to lwip source files, these changes need to be ported to the new version Signed-off-by: Andrew Parlane Signed-off-by: Will Wagner --- packages/net/lwip_tcpip/current/src/core/mem.c | 2 +- packages/net/lwip_tcpip/current/src/core/memp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/net/lwip_tcpip/current/src/core/mem.c b/packages/net/lwip_tcpip/current/src/core/mem.c index 1659a2c..753162d 100644 --- a/packages/net/lwip_tcpip/current/src/core/mem.c +++ b/packages/net/lwip_tcpip/current/src/core/mem.c @@ -179,7 +179,7 @@ struct mem { * how that space is calculated). */ #ifndef LWIP_RAM_HEAP_POINTER /** the heap. we need one struct mem at the end and some room for alignment */ -u8_t ram_heap[MEM_SIZE_ALIGNED + (2*SIZEOF_STRUCT_MEM) + MEM_ALIGNMENT]; +u8_t ram_heap[MEM_SIZE_ALIGNED + (2*SIZEOF_STRUCT_MEM) + MEM_ALIGNMENT] MEM_SECTION; #define LWIP_RAM_HEAP_POINTER ram_heap #endif /* LWIP_RAM_HEAP_POINTER */ diff --git a/packages/net/lwip_tcpip/current/src/core/memp.c b/packages/net/lwip_tcpip/current/src/core/memp.c index 9f680e2..c269fc8 100644 --- a/packages/net/lwip_tcpip/current/src/core/memp.c +++ b/packages/net/lwip_tcpip/current/src/core/memp.c @@ -170,7 +170,7 @@ static u8_t *const memp_bases[] = { static u8_t memp_memory[MEM_ALIGNMENT - 1 #define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) ) #include "lwip/memp_std.h" -]; +] MEM_SECTION; #endif /* MEMP_SEPARATE_POOLS */ -- 1.8.1.msysgit.1