aboutsummaryrefslogtreecommitdiff
path: root/nuttx/mm/mm_granfree.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-09-12 15:18:56 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-09-12 15:18:56 +0000
commiteac15a4720dd9d514ab7d683fb68797c174293cc (patch)
tree17de2185cab9be6f29164a2336855a57b8495627 /nuttx/mm/mm_granfree.c
parent1b7dad5a765bc86ee194f72b7a75d76b93e87943 (diff)
downloadpx4-firmware-eac15a4720dd9d514ab7d683fb68797c174293cc.tar.gz
px4-firmware-eac15a4720dd9d514ab7d683fb68797c174293cc.tar.bz2
px4-firmware-eac15a4720dd9d514ab7d683fb68797c174293cc.zip
Fix MMC/SD support for Wildfire board; Granule allocator can now be used from intrrupt handler
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5134 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/mm/mm_granfree.c')
-rw-r--r--nuttx/mm/mm_granfree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/mm/mm_granfree.c b/nuttx/mm/mm_granfree.c
index 96fdda87e..aa14207f3 100644
--- a/nuttx/mm/mm_granfree.c
+++ b/nuttx/mm/mm_granfree.c
@@ -75,13 +75,13 @@ static inline void gran_common_free(FAR struct gran_s *priv,
unsigned int granmask;
unsigned int ngranules;
unsigned int avail;
- uint32_t gatmask;
+ uint32_t gatmask;
DEBUGASSERT(priv && memory && size <= 32 * (1 << priv->log2gran));
/* Get exclusive access to the GAT */
- gran_semtake(priv);
+ gran_enter_critical(priv);
/* Determine the granule number of the first granule in the allocation */
@@ -121,7 +121,7 @@ static inline void gran_common_free(FAR struct gran_s *priv,
priv->gat[gatidx] &= ~(gatmask << gatbit);
}
- gran_semgive(priv);
+ gran_leave_critical(priv);
}
/****************************************************************************