miscellaneous update, enhance code coherence.

datalink814_ge/src/phy_ctrl/phy_ctrl.h

@@ -34,7 +34,7 @@
 #define NUM_ANT_SUBNRRW_PATTERN 37
 #define NUM_ANT_NRRW_PATTERN 61
 #define INIT_BEAM_NO 0
-#define INIT_ANT_WD ANT_BEAM_120
+#define INIT_ANT_WD PHY_ANT_BEAM_120
 #define INIT_ANT_NO 0
 
 #define L1_FRAME_NONE_HOPS UINT32_MAX
@@ -159,18 +159,18 @@ typedef struct
 
 typedef enum
 {
-	TIME_WORD_NONE = 0,
-	TIME_WORD_POLL = 1,
-	TIME_WORD_LISTEN_TIMEOUT = 2
+	PHY_TIME_WORD_NONE = 0,
+	PHY_TIME_WORD_POLL = 1,
+	PHY_TIME_WORD_LISTEN_TIMEOUT = 2
 } PHY_TIME_WORD_TYPE;
 
 typedef enum
 {
-	ANT_BEAM_NONE = 0,
-	ANT_BEAM_120 = 1,
-	ANT_BEAM_60 = 2,
-	ANT_BEAM_25 = 3,
-	ANT_BEAM_8 = 4
+	PHY_ANT_BEAM_NONE = 0,
+	PHY_ANT_BEAM_120 = 1,
+	PHY_ANT_BEAM_60 = 2,
+	PHY_ANT_BEAM_25 = 3,
+	PHY_ANT_BEAM_8 = 4
 } PHY_ANT_BEAM_WIDTH;
 
 typedef enum
@@ -215,9 +215,9 @@ typedef struct
 	bool isFrameSync;			 // if last reception frame sync success
 	bool isDecode;				 // if last reception decode success
 	bool isValid;				 // if last reception frame data valid (crc check pass)
+	bool isPresetHop;			 // if using preset frequency hop
 	TIME_WORD recvSlotTime;		 // last slot start time stamp
 	TIME_WORD recvFsTime;		 // last frame sync time stamp
-	bool isPresetHop;			 // if using preset frequency hop
 	PHY_RCD antNo;				 // antenna number record
 	PHY_RCD beamNo;				 // beam number record
 	PHY_RCD beamWd;				 // beam width record
@@ -236,6 +236,7 @@ extern uint16_t hopPattern_10KBPS_10MS[L1_FRAME_10KBPS_10MS_HOPS];
 extern uint16_t hopPattern_10KBPS_20MS[L1_FRAME_10KBPS_20MS_HOPS];
 extern uint16_t hopPattern_40KBPS_10MS[L1_FRAME_40KBPS_10MS_HOPS];
 extern uint16_t hopPattern_40KBPS_20MS[L1_FRAME_40KBPS_20MS_HOPS];
+
 extern uint16_t hopPattern_200KBPS_5MS[L1_FRAME_200KBPS_5MS_HOPS];
 extern uint16_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS];