summaryrefslogtreecommitdiff
path: root/nuttx/net/uip/uip_callback.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-15 20:26:34 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-15 20:26:34 +0000
commit6353b7f4d277bc2145ad408e349f2a9a98c8c397 (patch)
treed4ccbfd8eaf3d042c0731d2ab970aea8dddeb768 /nuttx/net/uip/uip_callback.c
parent69ed3e725f394bd249cb732945a0fc989b394746 (diff)
downloadpx4-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/uip/uip_callback.c')
-rw-r--r--nuttx/net/uip/uip_callback.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/net/uip/uip_callback.c b/nuttx/net/uip/uip_callback.c
index ad8a704b1..1270fd567 100644
--- a/nuttx/net/uip/uip_callback.c
+++ b/nuttx/net/uip/uip_callback.c
@@ -104,11 +104,11 @@ void uip_callbackinit(void)
FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list)
{
struct uip_callback_s *ret;
- irqstate_t save;
+ uip_lock_t save;
/* Check the head of the free list */
- save = irqsave();
+ save = uip_lock();
ret = g_cbfreelist;
if (ret)
{
@@ -136,7 +136,7 @@ FAR struct uip_callback_s *uip_callbackalloc(FAR struct uip_callback_s **list)
}
#endif
- irqrestore(save);
+ uip_unlock(save);
return ret;
}
@@ -157,13 +157,13 @@ void uip_callbackfree(FAR struct uip_callback_s *cb, FAR struct uip_callback_s *
{
FAR struct uip_callback_s *prev;
FAR struct uip_callback_s *curr;
- irqstate_t save;
+ uip_lock_t save;
if (cb)
{
/* Find the callback structure in the connection's list */
- save = irqsave();
+ save = uip_lock();
if (list)
{
for (prev = NULL, curr = *list;
@@ -189,7 +189,7 @@ void uip_callbackfree(FAR struct uip_callback_s *cb, FAR struct uip_callback_s *
cb->flink = g_cbfreelist;
g_cbfreelist = cb;
- irqrestore(save);
+ uip_unlock(save);
}
}
@@ -210,13 +210,13 @@ uint16_t uip_callbackexecute(FAR struct uip_driver_s *dev, void *pvconn,
uint16_t flags, FAR struct uip_callback_s *list)
{
FAR struct uip_callback_s *next;
- irqstate_t save;
+ uip_lock_t save;
/* Loop for each callback in the list and while there are still events
* set in the flags set.
*/
- save = irqsave();
+ save = uip_lock();
while (list && flags)
{
/* Save the pointer to the next callback in the lists. This is done
@@ -244,7 +244,7 @@ uint16_t uip_callbackexecute(FAR struct uip_driver_s *dev, void *pvconn,
list = next;
}
- irqrestore(save);
+ uip_unlock(save);
return flags;
}