From a24d8e8d358a8155ee37f57441fd73c0a7da0001 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Thu, 4 Jul 2024 11:01:59 +0800 Subject: [PATCH] update (GJB8114) --- df_datalink_sp/src/config/app_config.h | 2 +- df_datalink_sp/src/hwconfig.c | 6 +- .../src/networking/phy_layer/phy_antenna.c | 72 +++++++++---------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/df_datalink_sp/src/config/app_config.h b/df_datalink_sp/src/config/app_config.h index f9d6463..6768624 100644 --- a/df_datalink_sp/src/config/app_config.h +++ b/df_datalink_sp/src/config/app_config.h @@ -52,7 +52,7 @@ #define SCUTIMER_INTR_ID XPAR_SCUTIMER_INTR // Physical Layer Configs -#define PHY_DEVICE_ID 0 +#define PHY_DEVICE_ID 0X00 #define PHY_BASEADDR XPAR_PHYC_BASEADDR #define PHY_BEAM_FORMING_ENABLE // -- Antenna Bram Configs diff --git a/df_datalink_sp/src/hwconfig.c b/df_datalink_sp/src/hwconfig.c index b281039..52169aa 100644 --- a/df_datalink_sp/src/hwconfig.c +++ b/df_datalink_sp/src/hwconfig.c @@ -34,9 +34,9 @@ /************************** Function Prototypes ******************************/ /*********************** Driver Instance Definitions **************************/ -static struct hmc7044_dev *hmc7044_inst; -static struct ad9361_reg_dev *ad9361_1_reg_inst; -static struct ad9361_reg_dev *ad9361_2_reg_inst; +static struct hmc7044_dev *hmc7044_inst = NULL; +static struct ad9361_reg_dev *ad9361_1_reg_inst = NULL; +static struct ad9361_reg_dev *ad9361_2_reg_inst = NULL; // static struct ad9361_rf_phy *ad9361_phy; // static struct ad9361_rf_phy *ad9361_2_phy; diff --git a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c index b312688..b0aa121 100644 --- a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c +++ b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c @@ -69,17 +69,17 @@ // Regex: (([0-9]+, ){8}) const uint16_t freqTable[L1_FRAME_MAX_HOPS] = { - 1084, 1097, 1110, 1123, 1136, 1149, 1162, 1175, - 1188, 1201, 1214, 1227, 1240, 1253, 1266, 1279, - 1292, 1305, 1318, 1331, 1344, 1357, 1370, 1383, - 1396, 1409, 1422, 1435, 1448, 1461, 1474, 1487, - 1500, 1513, 1526, 1539, 1552, 1565, 1578, 1591, - 1604, 1617, 1630, 1643, 1656, 1669, 1682, 1695, - 1708, 1721, 1734, 1747, 1760, 1773, 1786, 1799, - 1812, 1825, 1838, 1851, 1864, 1877, 1890, 1903, - 1916, 1929, 1942, 1955, 1968, 1981, 1994, 2007, - 2020, 2033, 2046, 2059, 2072, 2085, 2098, 2111, - 2124 + 1084U, 1097U, 1110U, 1123U, 1136U, 1149U, 1162U, 1175U, + 1188U, 1201U, 1214U, 1227U, 1240U, 1253U, 1266U, 1279U, + 1292U, 1305U, 1318U, 1331U, 1344U, 1357U, 1370U, 1383U, + 1396U, 1409U, 1422U, 1435U, 1448U, 1461U, 1474U, 1487U, + 1500U, 1513U, 1526U, 1539U, 1552U, 1565U, 1578U, 1591U, + 1604U, 1617U, 1630U, 1643U, 1656U, 1669U, 1682U, 1695U, + 1708U, 1721U, 1734U, 1747U, 1760U, 1773U, 1786U, 1799U, + 1812U, 1825U, 1838U, 1851U, 1864U, 1877U, 1890U, 1903U, + 1916U, 1929U, 1942U, 1955U, 1968U, 1981U, 1994U, 2007U, + 2020U, 2033U, 2046U, 2059U, 2072U, 2085U, 2098U, 2111U, + 2124U }; const int16_t antCalTable[L1_FRAME_MAX_HOPS][L1_ANT_NUM_CH] = @@ -135,55 +135,55 @@ const uint8_t hopPattern_2KBPS_20MS[L1_FRAME_2KBPS_20MS_HOPS] = const uint8_t hopPattern_2KBPS_100MS[L1_FRAME_2KBPS_100MS_HOPS] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, - 80 + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, + 16U, 17U, 18U, 19U, 20U, 21U, 22U, 23U, + 24U, 25U, 26U, 27U, 28U, 29U, 30U, 31U, + 32U, 33U, 34U, 35U, 36U, 37U, 38U, 39U, + 40U, 41U, 42U, 43U, 44U, 45U, 46U, 47U, + 48U, 49U, 50U, 51U, 52U, 53U, 54U, 55U, + 56U, 57U, 58U, 59U, 60U, 61U, 62U, 63U, + 64U, 65U, 66U, 67U, 68U, 69U, 70U, 71U, + 72U, 73U, 74U, 75U, 76U, 77U, 78U, 79U, + 80U }; const uint8_t hopPattern_10KBPS_10MS[L1_FRAME_10KBPS_10MS_HOPS] = { - 80 + 80U }; const uint8_t hopPattern_10KBPS_20MS[L1_FRAME_10KBPS_20MS_HOPS] = { - 80, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10 + 80U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U }; const uint8_t hopPattern_40KBPS_10MS[L1_FRAME_40KBPS_10MS_HOPS] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, }; const uint8_t hopPattern_40KBPS_20MS[L1_FRAME_40KBPS_20MS_HOPS] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18 + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, + 16U, 17U, 18U }; const uint8_t hopPattern_200KBPS_5MS[L1_FRAME_200KBPS_5MS_HOPS] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19 + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, + 16U, 17U, 18U, 19U }; const uint8_t hopPattern_1M2BPS_5MS[L1_FRAME_1M2BPS_5MS_HOPS] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19 + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, + 16U, 17U, 18U, 19U }; /** @} PhysicalLayer_AntennaConfig_Constants*/