From 8587c5cbb40fd60b37d762dfafa8fef683eb4fea Mon Sep 17 00:00:00 2001 From: QuakeGod <QuakeGod@sina.com> Date: 星期一, 17 十月 2022 02:53:49 +0800 Subject: [PATCH] fix some utf-8 to GBK --- Inc/KBus.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Inc/KBus.h b/Inc/KBus.h index 82dcc08..3436a55 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,20 +206,20 @@ S_TIMEOUT=2 } ; + unsigned char BCC(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 CheckPacket(pPacket p1,int len1); +int CheckPacket(int nChn, pPacket p1, int len1); /* */ -int ParsePacket(pPacket p1, int Len1); +int ParsePacket(int nChn, pPacket p1, int Len1); typedef struct tagMachineConfig { - int bMaster; + int bKBusMaster; int nAddr; }stMachineConfig; @@ -238,10 +239,9 @@ int GetStat(void); - - - - +int KBusRepeaterFunc(int nChn); +int KBusMasterFunc(int nChn); +int KBusSlaveFunc(int nChn); #endif /* __KBUS_H__ */ -- Gitblit v1.9.1