mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-17 20:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use SYS_ARCH_SET macro at appropriate places

Browse Source 
Use SYS_ARCH_SET to simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
This commit is contained in:
Axel Lin 2015-11-30 22:22:28 +08:00 committed by Dirk Ziegelmeier
parent fb6d0f9006
commit bd4c4b5959
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/api_msg.c
View File

@ -366,7 +366,6 @@ err_tcp(void *arg, err_t err)
{ {
struct netconn *conn; struct netconn *conn;
enum netconn_state old_state; enum netconn_state old_state;
SYS_ARCH_DECL_PROTECT(lev);
conn = (struct netconn *)arg; conn = (struct netconn *)arg;
LWIP_ASSERT("conn != NULL", (conn != NULL)); LWIP_ASSERT("conn != NULL", (conn != NULL));
@ -374,9 +373,7 @@ err_tcp(void *arg, err_t err)
conn->pcb.tcp = NULL; conn->pcb.tcp = NULL;
/* no check since this is always fatal! */ /* no check since this is always fatal! */
SYS_ARCH_PROTECT(lev); SYS_ARCH_SET(conn->last_err, err);
conn->last_err = err;
SYS_ARCH_UNPROTECT(lev);
/* reset conn->state now before waking up other threads */ /* reset conn->state now before waking up other threads */
old_state = conn->state; old_state = conn->state;

5
src/api/sockets.c
View File

@ -460,7 +460,6 @@ static void
free_socket(struct lwip_sock *sock, int is_tcp) free_socket(struct lwip_sock *sock, int is_tcp)
{ {
void *lastdata; void *lastdata;
SYS_ARCH_DECL_PROTECT(lev);
lastdata = sock->lastdata; lastdata = sock->lastdata;
sock->lastdata = NULL; sock->lastdata = NULL;
@ -468,9 +467,7 @@ free_socket(struct lwip_sock *sock, int is_tcp)
sock->err = 0; sock->err = 0;
/* Protect socket array */ /* Protect socket array */
SYS_ARCH_PROTECT(lev); SYS_ARCH_SET(sock->conn, NULL);
sock->conn = NULL;
SYS_ARCH_UNPROTECT(lev);
/* don't use 'sock' after this line, as another task might have allocated it */ /* don't use 'sock' after this line, as another task might have allocated it */
if (lastdata != NULL) { if (lastdata != NULL) {

11
src/core/pbuf.c
View File

@ -117,11 +117,7 @@ void
pbuf_free_ooseq(void) pbuf_free_ooseq(void)
{ {
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
SYS_ARCH_DECL_PROTECT(old_level); SYS_ARCH_SET(pbuf_free_ooseq_pending, 0);
SYS_ARCH_PROTECT(old_level);
pbuf_free_ooseq_pending = 0;
SYS_ARCH_UNPROTECT(old_level);
for (pcb = tcp_active_pcbs; NULL != pcb; pcb = pcb->next) { for (pcb = tcp_active_pcbs; NULL != pcb; pcb = pcb->next) {
if (NULL != pcb->ooseq) { if (NULL != pcb->ooseq) {
@ -151,10 +147,7 @@ static void
pbuf_pool_is_empty(void) pbuf_pool_is_empty(void)
{ {
#ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL #ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL
SYS_ARCH_DECL_PROTECT(old_level); SYS_ARCH_SET(pbuf_free_ooseq_pending, 1);
SYS_ARCH_PROTECT(old_level);
pbuf_free_ooseq_pending = 1;
SYS_ARCH_UNPROTECT(old_level);
#else /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */ #else /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
u8_t queued; u8_t queued;
SYS_ARCH_DECL_PROTECT(old_level); SYS_ARCH_DECL_PROTECT(old_level);