josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

feat: 移除sysmon文件, 合并至sysbus

Browse Source
This commit is contained in:
josh
2025-06-24 16:53:40 +08:00
parent 044345f597
commit 9c24f66aae
12 changed files with 685 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/networking/link_layer/link_layer.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include "msg_def.h"
#include "circ_queue.h"
#include "../phy_layer/phy_layer.h"
#include "../../system_monitor.h"
#include "../../systembus/systembus.h"
/************************** Constant Definitions *****************************/
/***************** Macros (Inline Functions) Definitions *********************/
#define AssertL2Event(instPtr, event) (Linklayer_EventHandler((instPtr), (event)))
src/networking/link_layer/scan.c
+2 -2
View File
@@ -250,7 +250,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
DBG_ERROR("Payload length" PRIu16 " out of range.\n", message->dataLen);
return EIGNORE;
}
SYSMON_SVC_PAYLOAD *recvPayload = calloc(1, NORMALIZE_SIZE(sizeof(SYSMON_SVC_PAYLOAD)));
SYSBUS_SVC_PLD *recvPayload = calloc(1, sizeof(SYSBUS_SVC_PLD));
recvPayload->dataId = message->dataId;
recvPayload->nodeId = message->common.src;
recvPayload->dataLen = message->dataLen;
@@ -326,7 +326,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
}
// Get data payload & upload
SYSMON_SVC_PAYLOAD recvPayload;
SYSBUS_SVC_PLD recvPayload;
recvPayload.dataId = message->dataId;
recvPayload.nodeId = message->common.src;
recvPayload.dataLen = message->dataLen;
src/networking/link_layer/service.c
+6 -6
View File
@@ -200,7 +200,7 @@ static int32_t Service_Packing128K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t
if (type == L2_FRAME_SVC)
{
// Packing extra payload
SYSMON_SVC_PAYLOAD *sendPayload;
SYSBUS_SVC_PLD *sendPayload;
SysMonitor_GetSendPayload(&sendPayload);
if(sendPayload == NULL)
{
@@ -278,7 +278,7 @@ static int32_t Service_Packing512K(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t
message->srcSpeedZ = instPtr->sysInfo.vZ;
// Pack extra payload
SYSMON_SVC_PAYLOAD *sendPayload;
SYSBUS_SVC_PLD *sendPayload;
SysMonitor_GetSendPayload(&sendPayload);
if(sendPayload == NULL)
{
@@ -348,7 +348,7 @@ static int32_t Service_Packing2M(L2_INST *instPtr, L2_FRAME_TYPE type, uint8_t d
message->srcSpeedZ = instPtr->sysInfo.vZ;
// Packing extra payload
SYSMON_SVC_PAYLOAD *sendPayload;
SYSBUS_SVC_PLD *sendPayload;
SysMonitor_GetSendPayload(&sendPayload);
if(sendPayload == NULL)
{
@@ -535,7 +535,7 @@ static int32_t Service_PktHandler128K(L2_INST *instPtr, uint8_t *msg)
DBG_ERROR("Payload length" PRIu16 " out of range.\n", message->dataLen);
return EIGNORE;
}
SYSMON_SVC_PAYLOAD *recvPayload = calloc(1, NORMALIZE_SIZE(sizeof(SYSMON_SVC_PAYLOAD)));
SYSBUS_SVC_PLD *recvPayload = calloc(1, sizeof(SYSBUS_SVC_PLD));
recvPayload->dataId = message->dataId;
recvPayload->nodeId = message->common.src;
recvPayload->dataLen = message->dataLen;
@@ -623,7 +623,7 @@ static int32_t Service_PktHandler512K(L2_INST *instPtr, uint8_t *msg)
DBG_ERROR("Payload length" PRIu16 " out of range.\n", message->dataLen);
return EIGNORE;
}
SYSMON_SVC_PAYLOAD *recvPayload = calloc(1, NORMALIZE_SIZE(sizeof(SYSMON_SVC_PAYLOAD)));
SYSBUS_SVC_PLD *recvPayload = calloc(1, sizeof(SYSBUS_SVC_PLD));
recvPayload->dataId = message->dataId;
recvPayload->nodeId = message->common.src;
recvPayload->dataLen = message->dataLen;
@@ -711,7 +711,7 @@ static int32_t Service_PktHandler2M(L2_INST *instPtr, uint8_t *msg)
DBG_ERROR("Payload length" PRIu16 " out of range.\n", message->dataLen);
return EIGNORE;
}
SYSMON_SVC_PAYLOAD *recvPayload = calloc(1, NORMALIZE_SIZE(sizeof(SYSMON_SVC_PAYLOAD)));
SYSBUS_SVC_PLD *recvPayload = calloc(1, sizeof(SYSBUS_SVC_PLD));
recvPayload->dataId = message->dataId;
recvPayload->nodeId = message->common.src;
recvPayload->dataLen = message->dataLen;