From f4f290279d32d3cd656472a3298345bc7418cd78 Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期一, 17 十月 2022 20:42:45 +0800 Subject: [PATCH] arrange again radio fp0 klink knet --- Inc/KBus.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Inc/KBus.h b/Inc/KBus.h index 82dcc08..57fe899 100644 --- a/Inc/KBus.h +++ b/Inc/KBus.h @@ -11,7 +11,7 @@ #define __KBUS_H__ typedef unsigned char uchar; -extern int bMaster,bSlave; +extern unsigned char bKBusMaster,bKBusSlave,bKBusRepeater;; enum enCMDs { cmdNone = '0', //Nothing @@ -49,9 +49,9 @@ extern unsigned char nCurPollId; extern unsigned char nSeq; -extern volatile int MasterRecved; -extern volatile int MasterRecvOK; -extern volatile int SlaveRecved; +extern volatile unsigned char MasterRecved; +extern volatile unsigned char MasterRecvOK; +extern volatile unsigned char SlaveRecved; extern unsigned int SendTimeuS; extern volatile int RecvTimeuS; extern int DelayuS; @@ -143,6 +143,7 @@ }; }; } stChnStat; + extern stChnStat ChnStats[8]; typedef struct tagSlaveStat @@ -205,23 +206,23 @@ S_TIMEOUT=2 } ; -unsigned char BCC(void * pData, int nSize); -// +unsigned char KBusBCC(void * pData, int nSize); +// /* Make a Packet and return Packet Length */ -int MakePacket(pPacket p1,uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData ); +int KBusMakePacket(pPacket p1,uchar Src, uchar Dst, uchar nType, uchar nSEQ, uchar DataLen, void *pData ); /* */ -int CheckPacket(pPacket p1,int len1); +int KBusCheckPacket(int nChn, pPacket p1, int len1); /* */ -int ParsePacket(pPacket p1, int Len1); +int KBusParsePacket(int nChn, pPacket p1, int Len1); typedef struct tagMachineConfig { - int bMaster; + int bKBusMaster; int nAddr; }stMachineConfig; - +/* int InitMachine(stMachineConfig * pConfig); int SetConfig(void ); @@ -237,11 +238,10 @@ int WriteData(void); int GetStat(void); - - - - - +*/ +int KBusRepeaterFunc(int nChn); +int KBusMasterFunc(int nChn); +int KBusSlaveFunc(int nChn); #endif /* __KBUS_H__ */ -- Gitblit v1.9.1