martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use INHERIT mechanism for AQH_Tag16IpcMsg."

Browse Source 
This reverts commit 07abc76a7a.
This commit is contained in:
Martin Preuss
2023-09-12 21:33:00 +02:00
parent 07abc76a7a
commit 11798a39d6
3 changed files with 3 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
aqhome/ipc/data/msg_data_connect.c
View File

@@ -58,8 +58,7 @@ void AQH_ConnectDataIpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf,
char *userId=NULL; char *userId=NULL;
uint32_t flags=0; uint32_t flags=0;
AQH_Tag16IpcMsg_ParseTags(msg, 0); tagList=AQH_Tag16IpcMsg_ParseTags(msg, 0);
tagList=AQH_Tag16IpcMsg_GetTags(msg);
if (tagList) { if (tagList) {
const GWEN_TAG16 *tag; const GWEN_TAG16 *tag;

45
aqhome/ipc/msg_ipc_tag16.c
View File

@@ -18,47 +18,14 @@
GWEN_INHERIT(GWEN_MSG, GWEN_TAG16_LIST);
GWEN_TAG16_LIST *_parseTags(const GWEN_MSG *msg, int doCopy);
void GWENHYWFAR_CB _freeTagList(void *bp, void *p);
GWEN_MSG *AQH_Tag16IpcMsg_new(uint8_t protoId, uint8_t protoVer, uint16_t code, uint32_t payloadLen, const uint8_t *payload) GWEN_MSG *AQH_Tag16IpcMsg_new(uint8_t protoId, uint8_t protoVer, uint16_t code, uint32_t payloadLen, const uint8_t *payload)
{ {
return GWEN_IpcMsg_new(protoId, protoVer, code, payloadLen, payload); return GWEN_IpcMsg_new(protoId, protoVer, code, payloadLen, payload);
} }
void AQH_Tag16IpcMsg_ParseTags(GWEN_MSG *msg, int doCopy)
{
if (msg && !GWEN_INHERIT_ISOFTYPE(GWEN_MSG, GWEN_TAG16_LIST, msg)) {
GWEN_TAG16_LIST *tagList;
tagList=_parseTags(msg, doCopy); GWEN_TAG16_LIST *AQH_Tag16IpcMsg_ParseTags(const GWEN_MSG *msg, int doCopy)
if (tagList) {
GWEN_INHERIT_SETDATA(GWEN_MSG, GWEN_TAG16_LIST, msg, tagList, _freeTagList);
}
}
}
const GWEN_TAG16_LIST *AQH_Tag16IpcMsg_GetTags(const GWEN_MSG *msg)
{
GWEN_TAG16_LIST *tagList;
tagList=GWEN_INHERIT_GETDATA(GWEN_MSG, GWEN_TAG16_LIST, msg);
return tagList;
}
GWEN_TAG16_LIST *_parseTags(const GWEN_MSG *msg, int doCopy)
{ {
uint32_t msgSize; uint32_t msgSize;
@@ -87,16 +54,6 @@ GWEN_TAG16_LIST *_parseTags(const GWEN_MSG *msg, int doCopy)
void _freeTagList(void *bp, void *p)
{
GWEN_TAG16_LIST *tagList;
tagList=(GWEN_TAG16_LIST*) p;
GWEN_Tag16_List_free(tagList);
}
void AQH_Tag16IpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText) void AQH_Tag16IpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText)
{ {
if (GWEN_Msg_GetBytesInBuffer(msg)>=GWEN_MSGIPC_OFFS_PAYLOAD) { if (GWEN_Msg_GetBytesInBuffer(msg)>=GWEN_MSGIPC_OFFS_PAYLOAD) {

4
aqhome/ipc/msg_ipc_tag16.h
View File

@@ -18,9 +18,7 @@
AQHOME_API GWEN_MSG *AQH_Tag16IpcMsg_new(uint8_t protoId, uint8_t protoVer, uint16_t code, uint32_t payloadLen, const uint8_t *payload); AQHOME_API GWEN_MSG *AQH_Tag16IpcMsg_new(uint8_t protoId, uint8_t protoVer, uint16_t code, uint32_t payloadLen, const uint8_t *payload);
AQHOME_API GWEN_TAG16_LIST *AQH_Tag16IpcMsg_ParseTags(const GWEN_MSG *msg, int doCopy);
AQHOME_API void AQH_Tag16IpcMsg_ParseTags(GWEN_MSG *msg, int doCopy);
AQHOME_API const GWEN_TAG16_LIST *AQH_Tag16IpcMsg_GetTags(const GWEN_MSG *msg);
AQHOME_API void AQH_Tag16IpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText); AQHOME_API void AQH_Tag16IpcMsg_DumpToBuffer(const GWEN_MSG *msg, GWEN_BUFFER *dbuf, const char *sText);