diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-15 20:26:34 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-15 20:26:34 +0000 |
| commit | 6353b7f4d277bc2145ad408e349f2a9a98c8c397 (patch) | |
| tree | d4ccbfd8eaf3d042c0731d2ab970aea8dddeb768 /nuttx/net/net_close.c | |
| parent | 69ed3e725f394bd249cb732945a0fc989b394746 (diff) | |
| download | px4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.tar.gz px4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.tar.bz2 px4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.zip | |
More SLIP integration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3384 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/net_close.c')
| -rw-r--r-- | nuttx/net/net_close.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c index 50421cb55..ca2e2999c 100644 --- a/nuttx/net/net_close.c +++ b/nuttx/net/net_close.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_close.c * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -146,11 +146,11 @@ static uint16_t netclose_interrupt(struct uip_driver_s *dev, void *pvconn, static inline void netclose_disconnect(FAR struct socket *psock) { struct tcp_close_s state; - irqstate_t flags; + uip_lock_t flags; /* Interrupts are disabled here to avoid race conditions */ - flags = irqsave(); + flags = uip_lock(); /* Is the TCP socket in a connected state? */ @@ -180,7 +180,7 @@ static inline void netclose_disconnect(FAR struct socket *psock) /* Wait for the disconnect event */ - (void)sem_wait(&state.cl_sem); + (void)uip_lockedwait(&state.cl_sem); /* We are now disconnected */ @@ -190,7 +190,7 @@ static inline void netclose_disconnect(FAR struct socket *psock) } } - irqrestore(flags); + uip_unlock(flags); } #endif |