diff --git a/df_datalink_sp/src/system_monitor.c b/df_datalink_sp/src/system_monitor.c index c56a89f..a4c901c 100644 --- a/df_datalink_sp/src/system_monitor.c +++ b/df_datalink_sp/src/system_monitor.c @@ -289,16 +289,3 @@ void SysMonitor_GetHardwareStatus(HWSTATE *state) memcpy(state, &(sysMonitorInst->hwState[buffIndx]), sizeof(HWSTATE)); sysMonitorInst->hwStateCtrl.rBusy = buffIndex_old; } - - -// @System log -/** - * Get the latest system running log. - */ -void SysMonitor_GetSyslog(SYSLOG *log) -{ - ASSERT(sysMonitorInst != NULL); - SysMonitor_GetLinklayerLog(&(log->linkLog)); - SysMonitor_GetPhysicalLayerLog(&(log->phyLog)); - SysMonitor_GetHardwareStatus(&(log->hwState)); -} \ No newline at end of file diff --git a/df_datalink_sp/src/system_monitor.h b/df_datalink_sp/src/system_monitor.h index 32f77eb..4447e5b 100644 --- a/df_datalink_sp/src/system_monitor.h +++ b/df_datalink_sp/src/system_monitor.h @@ -141,18 +141,6 @@ typedef struct __attribute__((packed)) uint8_t dummy; } HWSTATE; -typedef struct -{ - // Link layer log - LINKLOG linkLog; - - // Physical layer log - PHYLOG phyLog; - - // Hardware status - HWSTATE hwState; -} SYSLOG; - typedef struct { uint32_t dataId; @@ -177,6 +165,4 @@ void SysMonitor_GetLinklayerLog(LINKLOG *log); void SysMonitor_GetPhysicalLayerLog(PHYLOG *log); void SysMonitor_GetHardwareStatus(HWSTATE *state); -void SysMonitor_GetSyslog(SYSLOG *log); - #endif //__SYSTEM_MONITOR_H_ diff --git a/df_datalink_sp/src/systembus/systembus.h b/df_datalink_sp/src/systembus/systembus.h index 6d1675a..e136735 100644 --- a/df_datalink_sp/src/systembus/systembus.h +++ b/df_datalink_sp/src/systembus/systembus.h @@ -36,7 +36,10 @@ typedef struct typedef struct { SYSBUS_CONFIG config; - SYSLOG sysLog; + SYSBUSLOG sysbusLog; // systembus log + LINKLOG linkLog; // Link layer log + PHYLOG phyLog; // Physical layer log + HWSTATE hwState; // Hardware status SYSBUS_UART *uartInst; CIRC_QUEUE *txQueue; CIRC_QUEUE *rxQueue;