From 27312c4895aff603d7f6845e63fcf0236e203397 Mon Sep 17 00:00:00 2001 From: Vladimir Zidar Date: Wed, 7 Jun 2017 00:33:39 +0200 Subject: [PATCH] LP-528 partially revert 9f16143ba76aff279b118a178f93504a8f5fbea0 (uavobjects cannot be in ccm - loading from external SPI flash optionally uses DMA) --- flight/uavobjects/uavobjectmanager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flight/uavobjects/uavobjectmanager.c b/flight/uavobjects/uavobjectmanager.c index 84e6d1b50..8368f87a3 100644 --- a/flight/uavobjects/uavobjectmanager.c +++ b/flight/uavobjects/uavobjectmanager.c @@ -225,7 +225,7 @@ static struct UAVOData *UAVObjAllocSingle(uint32_t num_bytes) uint32_t object_size = sizeof(struct UAVOSingle) + num_bytes; /* Allocate the object from the heap */ - struct UAVOSingle *uavo_single = (struct UAVOSingle *)pios_fastheapmalloc(object_size); + struct UAVOSingle *uavo_single = (struct UAVOSingle *)pios_malloc(object_size); if (!uavo_single) { return NULL; @@ -250,7 +250,7 @@ static struct UAVOData *UAVObjAllocMulti(uint32_t num_bytes) uint32_t object_size = sizeof(struct UAVOMulti) + num_bytes; /* Allocate the object from the heap */ - struct UAVOMulti *uavo_multi = (struct UAVOMulti *)pios_fastheapmalloc(object_size); + struct UAVOMulti *uavo_multi = (struct UAVOMulti *)pios_malloc(object_size); if (!uavo_multi) { return NULL; @@ -1598,7 +1598,7 @@ static InstanceHandle createInstance(struct UAVOData *obj, uint16_t instId) /* Create the actual instance */ uint32_t size = sizeof(struct UAVOMultiInst) + obj->instance_size; - instEntry = (struct UAVOMultiInst *)pios_fastheapmalloc(size); + instEntry = (struct UAVOMultiInst *)pios_malloc(size); if (!instEntry) { return NULL; }