|
@@ -26,6 +26,7 @@
|
|
/*Image2HeaderVersion: 3.2*/
|
|
/*Image2HeaderVersion: 3.2*/
|
|
#include "../mp_precomp.h"
|
|
#include "../mp_precomp.h"
|
|
#include "../phydm_precomp.h"
|
|
#include "../phydm_precomp.h"
|
|
|
|
+#include <linux/kernel.h>
|
|
|
|
|
|
static bool check_positive(struct phy_dm_struct *dm, const u32 condition1,
|
|
static bool check_positive(struct phy_dm_struct *dm, const u32 condition1,
|
|
const u32 condition2, const u32 condition3,
|
|
const u32 condition2, const u32 condition3,
|
|
@@ -1346,7 +1347,6 @@ void odm_read_and_config_mp_8822b_radioa(struct phy_dm_struct *dm)
|
|
u32 i = 0;
|
|
u32 i = 0;
|
|
u8 c_cond;
|
|
u8 c_cond;
|
|
bool is_matched = true, is_skipped = false;
|
|
bool is_matched = true, is_skipped = false;
|
|
- u32 array_len = sizeof(array_mp_8822b_radioa) / sizeof(u32);
|
|
|
|
u32 *array = array_mp_8822b_radioa;
|
|
u32 *array = array_mp_8822b_radioa;
|
|
|
|
|
|
u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
|
|
u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
|
|
@@ -1354,7 +1354,7 @@ void odm_read_and_config_mp_8822b_radioa(struct phy_dm_struct *dm)
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
"===> %s\n", __func__);
|
|
"===> %s\n", __func__);
|
|
|
|
|
|
- for (; (i + 1) < array_len; i = i + 2) {
|
|
|
|
|
|
+ for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_radioa); i = i + 2) {
|
|
v1 = array[i];
|
|
v1 = array[i];
|
|
v2 = array[i + 1];
|
|
v2 = array[i + 1];
|
|
|
|
|
|
@@ -2506,7 +2506,6 @@ void odm_read_and_config_mp_8822b_radiob(struct phy_dm_struct *dm)
|
|
u32 i = 0;
|
|
u32 i = 0;
|
|
u8 c_cond;
|
|
u8 c_cond;
|
|
bool is_matched = true, is_skipped = false;
|
|
bool is_matched = true, is_skipped = false;
|
|
- u32 array_len = sizeof(array_mp_8822b_radiob) / sizeof(u32);
|
|
|
|
u32 *array = array_mp_8822b_radiob;
|
|
u32 *array = array_mp_8822b_radiob;
|
|
|
|
|
|
u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
|
|
u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
|
|
@@ -2514,7 +2513,7 @@ void odm_read_and_config_mp_8822b_radiob(struct phy_dm_struct *dm)
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
"===> %s\n", __func__);
|
|
"===> %s\n", __func__);
|
|
|
|
|
|
- for (; (i + 1) < array_len; i = i + 2) {
|
|
|
|
|
|
+ for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_radiob); i = i + 2) {
|
|
v1 = array[i];
|
|
v1 = array[i];
|
|
v2 = array[i + 1];
|
|
v2 = array[i + 1];
|
|
|
|
|
|
@@ -4239,13 +4238,12 @@ static const char *const array_mp_8822b_txpwr_lmt[] = {
|
|
void odm_read_and_config_mp_8822b_txpwr_lmt(struct phy_dm_struct *dm)
|
|
void odm_read_and_config_mp_8822b_txpwr_lmt(struct phy_dm_struct *dm)
|
|
{
|
|
{
|
|
u32 i = 0;
|
|
u32 i = 0;
|
|
- u32 array_len = sizeof(array_mp_8822b_txpwr_lmt) / sizeof(u8 *);
|
|
|
|
u8 **array = (u8 **)array_mp_8822b_txpwr_lmt;
|
|
u8 **array = (u8 **)array_mp_8822b_txpwr_lmt;
|
|
|
|
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
"===> %s\n", __func__);
|
|
"===> %s\n", __func__);
|
|
|
|
|
|
- for (i = 0; i < array_len; i += 7) {
|
|
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(array_mp_8822b_txpwr_lmt); i += 7) {
|
|
u8 *regulation = array[i];
|
|
u8 *regulation = array[i];
|
|
u8 *band = array[i + 1];
|
|
u8 *band = array[i + 1];
|
|
u8 *bandwidth = array[i + 2];
|
|
u8 *bandwidth = array[i + 2];
|
|
@@ -4723,13 +4721,12 @@ static const char *const array_mp_8822b_txpwr_lmt_type5[] = {
|
|
void odm_read_and_config_mp_8822b_txpwr_lmt_type5(struct phy_dm_struct *dm)
|
|
void odm_read_and_config_mp_8822b_txpwr_lmt_type5(struct phy_dm_struct *dm)
|
|
{
|
|
{
|
|
u32 i = 0;
|
|
u32 i = 0;
|
|
- u32 array_len = sizeof(array_mp_8822b_txpwr_lmt_type5) / sizeof(u8 *);
|
|
|
|
u8 **array = (u8 **)array_mp_8822b_txpwr_lmt_type5;
|
|
u8 **array = (u8 **)array_mp_8822b_txpwr_lmt_type5;
|
|
|
|
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
ODM_RT_TRACE(dm, ODM_COMP_INIT,
|
|
"===> odm_read_and_config_mp_8822b_txpwr_lmt_type5\n");
|
|
"===> odm_read_and_config_mp_8822b_txpwr_lmt_type5\n");
|
|
|
|
|
|
- for (i = 0; i < array_len; i += 7) {
|
|
|
|
|
|
+ for (i = 0; i < ARRAY_SIZE(array_mp_8822b_txpwr_lmt_type5); i += 7) {
|
|
u8 *regulation = array[i];
|
|
u8 *regulation = array[i];
|
|
u8 *band = array[i + 1];
|
|
u8 *band = array[i + 1];
|
|
u8 *bandwidth = array[i + 2];
|
|
u8 *bandwidth = array[i + 2];
|