rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

OP-286 UAVObjectManager: Dont store pointer to initialize function for

Browse Source 
UAVObjects, but pass it in from the macro definition.  Saves memory for each
objects.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2559 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2011-01-24 07:51:17 +00:00 committed by peabody124
parent 0fa8589fc3
commit 3fc8169330
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/UAVObjects/inc/uavobjectmanager.h
View File

@ -135,7 +135,7 @@ const char* UAVObjGetName(UAVObjHandle obj);
uint32_t UAVObjGetNumBytes(UAVObjHandle obj); uint32_t UAVObjGetNumBytes(UAVObjHandle obj);
uint16_t UAVObjGetNumInstances(UAVObjHandle obj); uint16_t UAVObjGetNumInstances(UAVObjHandle obj);
UAVObjHandle UAVObjGetLinkedObj(UAVObjHandle obj); UAVObjHandle UAVObjGetLinkedObj(UAVObjHandle obj);
uint16_t UAVObjCreateInstance(UAVObjHandle obj); uint16_t UAVObjCreateInstance(UAVObjHandle obj, UAVObjInitializeCallback initCb);
int32_t UAVObjIsSingleInstance(UAVObjHandle obj); int32_t UAVObjIsSingleInstance(UAVObjHandle obj);
int32_t UAVObjIsMetaobject(UAVObjHandle obj); int32_t UAVObjIsMetaobject(UAVObjHandle obj);
int32_t UAVObjIsSettings(UAVObjHandle obj); int32_t UAVObjIsSettings(UAVObjHandle obj);

3
flight/UAVObjects/inc/uavobjecttemplate.h
View File

@ -60,7 +60,7 @@
#define $(NAME)InstSet(instId, dataIn) UAVObjSetInstanceData($(NAME)Handle(), instId, dataIn) #define $(NAME)InstSet(instId, dataIn) UAVObjSetInstanceData($(NAME)Handle(), instId, dataIn)
#define $(NAME)ConnectQueue(queue) UAVObjConnectQueue($(NAME)Handle(), queue, EV_MASK_ALL_UPDATES) #define $(NAME)ConnectQueue(queue) UAVObjConnectQueue($(NAME)Handle(), queue, EV_MASK_ALL_UPDATES)
#define $(NAME)ConnectCallback(cb) UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES) #define $(NAME)ConnectCallback(cb) UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES)
#define $(NAME)CreateInstance() UAVObjCreateInstance($(NAME)Handle()) #define $(NAME)CreateInstance() UAVObjCreateInstance($(NAME)Handle(),&$(NAME)SetDefaults)
#define $(NAME)RequestUpdate() UAVObjRequestUpdate($(NAME)Handle()) #define $(NAME)RequestUpdate() UAVObjRequestUpdate($(NAME)Handle())
#define $(NAME)RequestInstUpdate(instId) UAVObjRequestInstanceUpdate($(NAME)Handle(), instId) #define $(NAME)RequestInstUpdate(instId) UAVObjRequestInstanceUpdate($(NAME)Handle(), instId)
#define $(NAME)Updated() UAVObjUpdated($(NAME)Handle()) #define $(NAME)Updated() UAVObjUpdated($(NAME)Handle())
@ -80,6 +80,7 @@ $(DATAFIELDINFO)
// Generic interface functions // Generic interface functions
int32_t $(NAME)Initialize(); int32_t $(NAME)Initialize();
UAVObjHandle $(NAME)Handle(); UAVObjHandle $(NAME)Handle();
void $(NAME)SetDefaults(UAVObjHandle obj, uint16_t instId);
#endif // $(NAMEUC)_H #endif // $(NAMEUC)_H

12
flight/UAVObjects/uavobjectmanager.c
View File

@ -69,7 +69,6 @@ struct ObjectListStruct {
int8_t isSettings; /** Set to 1 if this object is a settings object */ int8_t isSettings; /** Set to 1 if this object is a settings object */
uint16_t numBytes; /** Number of data bytes contained in the object (for a single instance) */ uint16_t numBytes; /** Number of data bytes contained in the object (for a single instance) */
uint16_t numInstances; /** Number of instances */ uint16_t numInstances; /** Number of instances */
UAVObjInitializeCallback initCb; /** Object field and metadata initialization callback */
struct ObjectListStruct* linkedObj; /** Linked object, for regular objects this is the metaobject and for metaobjects it is the parent object */ struct ObjectListStruct* linkedObj; /** Linked object, for regular objects this is the metaobject and for metaobjects it is the parent object */
ObjectInstList* instances; /** List of object instances, instance 0 always exists */ ObjectInstList* instances; /** List of object instances, instance 0 always exists */
ObjectEventList* events; /** Event queues registered on the object */ ObjectEventList* events; /** Event queues registered on the object */
@ -197,7 +196,6 @@ UAVObjHandle UAVObjRegister(uint32_t id, const char* name, const char* metaName,
objEntry->numBytes = numBytes; objEntry->numBytes = numBytes;
objEntry->events = NULL; objEntry->events = NULL;
objEntry->numInstances = 0; objEntry->numInstances = 0;
objEntry->initCb = initCb;
objEntry->instances = NULL; objEntry->instances = NULL;
objEntry->linkedObj = NULL; // will be set later objEntry->linkedObj = NULL; // will be set later
LL_APPEND(objList, objEntry); LL_APPEND(objList, objEntry);
@ -225,9 +223,9 @@ UAVObjHandle UAVObjRegister(uint32_t id, const char* name, const char* metaName,
} }
// Initialize object fields and metadata to default values // Initialize object fields and metadata to default values
if ( objEntry->initCb != NULL ) if ( initCb != NULL )
{ {
objEntry->initCb((UAVObjHandle)objEntry, 0); initCb((UAVObjHandle)objEntry, 0);
} }
// Attempt to load object's metadata from the SD card (not done directly on the metaobject, but through the object) // Attempt to load object's metadata from the SD card (not done directly on the metaobject, but through the object)
@ -366,7 +364,7 @@ uint16_t UAVObjGetNumInstances(UAVObjHandle obj)
* \param[in] obj The object handle * \param[in] obj The object handle
* \return The instance ID or 0 if an error * \return The instance ID or 0 if an error
*/ */
uint16_t UAVObjCreateInstance(UAVObjHandle obj) uint16_t UAVObjCreateInstance(UAVObjHandle obj, UAVObjInitializeCallback initCb)
{ {
ObjectList* objEntry; ObjectList* objEntry;
ObjectInstList* instEntry; ObjectInstList* instEntry;
@ -384,9 +382,9 @@ uint16_t UAVObjCreateInstance(UAVObjHandle obj)
} }
// Initialize instance data // Initialize instance data
if ( objEntry->initCb != NULL ) if ( initCb != NULL )
{ {
objEntry->initCb(obj, instEntry->instId); initCb(obj, instEntry->instId);
} }
// Unlock // Unlock

7
flight/UAVObjects/uavobjecttemplate.c
View File

@ -42,9 +42,6 @@
// Private variables // Private variables
static UAVObjHandle handle; static UAVObjHandle handle;
// Private functions
static void setDefaults(UAVObjHandle obj, uint16_t instId);
/** /**
* Initialize object. * Initialize object.
* \return 0 Success * \return 0 Success
@ -54,7 +51,7 @@ int32_t $(NAME)Initialize()
{ {
// Register object with the object manager // Register object with the object manager
handle = UAVObjRegister($(NAMEUC)_OBJID, $(NAMEUC)_NAME, $(NAMEUC)_METANAME, 0, handle = UAVObjRegister($(NAMEUC)_OBJID, $(NAMEUC)_NAME, $(NAMEUC)_METANAME, 0,
$(NAMEUC)_ISSINGLEINST, $(NAMEUC)_ISSETTINGS, $(NAMEUC)_NUMBYTES, &setDefaults); $(NAMEUC)_ISSINGLEINST, $(NAMEUC)_ISSETTINGS, $(NAMEUC)_NUMBYTES, &$(NAME)SetDefaults);
// Done // Done
if (handle != 0) if (handle != 0)
@ -72,7 +69,7 @@ int32_t $(NAME)Initialize()
* If a default value is not specified the object fields * If a default value is not specified the object fields
* will be initialized to zero. * will be initialized to zero.
*/ */
static void setDefaults(UAVObjHandle obj, uint16_t instId) void $(NAME)SetDefaults(UAVObjHandle obj, uint16_t instId)
{ {
$(NAME)Data data; $(NAME)Data data;
UAVObjMetadata metadata; UAVObjMetadata metadata;