Skip to content

Commit 948706d

Browse files
committed
RDKBACCL-839,RDKBACCL-880 : Removed onewifi db & addressed build issues
with latest tip for EasyMesh enabled build Reason for change: Addeded required cflags and code changes in bbapend recipes Test procedure: Onewifi process is up and running and db also not created at /opt/secure/wifi path Risks: None Signed-off-by: keerthana.p <[email protected]>
1 parent 4c67f33 commit 948706d

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi-libwebconfig.bbappend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=libwebconfig"
22

33
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=libwebconfig"
4-
SRCREV_libwebconfig = "5f68e4e1d965d7ceaf378a4e0bd94f8d2dcbcccd"
4+
SRCREV_libwebconfig = "850296b0a26daa25e5849176baaf289b6017b519"
55

66
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap unified-wifi-mesh-header ', '', d)}"
77
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' --enable-easymesh ', '', d)}"

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-one-wifi.bbappend

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
44

55
SRC_URI_remove = "${CMF_GIT_ROOT}/rdkb/components/opensource/ccsp/OneWifi;protocol=${CMF_GIT_PROTOCOL};branch=${CMF_GIT_BRANCH};name=OneWifi"
66
SRC_URI = "git://github.com/rdkcentral/OneWifi.git;protocol=https;branch=develop;name=OneWifi"
7-
SRCREV_OneWifi = "5f68e4e1d965d7ceaf378a4e0bd94f8d2dcbcccd"
7+
SRCREV_OneWifi = "850296b0a26daa25e5849176baaf289b6017b519"
88
DEPENDS_append = " mesh-agent "
99
DEPENDS_remove = " opensync "
1010
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' rdk-wifi-libhostap ', '', d)}"
@@ -19,6 +19,17 @@ CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DEASY_M
1919
EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', 'ONEWIFI_STA_MGR_APP_SUPPORT=true', 'ONEWIFI_STA_MGR_APP_SUPPORT=false', d)}"
2020
CFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sta_manager', '-DONEWIFI_STA_MGR_APP_SUPPORT', '', d)}"
2121

22+
EXTRA_OECONF_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' ONEWIFI_CAC_APP_SUPPORT=true ', '', d)}"
23+
CFLAGS_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'EasyMesh', ' -DONEWIFI_CAC_APP_SUPPORT -DONEWIFI_DB_SUPPORT ', '', d)}"
24+
25+
EXTRA_OECONF_append = " ONEWIFI_CSI_APP_SUPPORT=true"
26+
EXTRA_OECONF_append = " ONEWIFI_MOTION_APP_SUPPORT=true"
27+
EXTRA_OECONF_append = " ONEWIFI_HARVESTER_APP_SUPPORT=true"
28+
EXTRA_OECONF_append = " ONEWIFI_ANALYTICS_APP_SUPPORT=true"
29+
EXTRA_OECONF_append = " ONEWIFI_LEVL_APP_SUPPORT=true"
30+
EXTRA_OECONF_append = " ONEWIFI_WHIX_APP_SUPPORT=true"
31+
EXTRA_OECONF_append = " ONEWIFI_BLASTER_APP_SUPPORT=true"
32+
2233
SRC_URI += " \
2334
file://checkwifi.sh \
2435
file://onewifi_pre_start.sh \

meta-rdk-mtk-bpir4/recipes-ccsp/hal/files/hal_interface.patch

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#Signed-off-by:[email protected]
77
################################################
88
diff --git a/wifi_hal_ap.h b/wifi_hal_ap.h
9-
index f5c37db..9f3f732 100644
9+
index 00134cc..34934c9 100644
1010
--- a/wifi_hal_ap.h
1111
+++ b/wifi_hal_ap.h
1212
@@ -349,7 +349,8 @@ typedef enum
@@ -19,7 +19,7 @@ index f5c37db..9f3f732 100644
1919
} wifi_neighborScanMode_t;
2020

2121
/**
22-
@@ -2711,7 +2712,9 @@ typedef struct {
22+
@@ -2842,7 +2843,9 @@ typedef struct {
2323
typedef struct {
2424
BOOL mld_enable;
2525
UINT mld_id;
@@ -29,7 +29,7 @@ index f5c37db..9f3f732 100644
2929
} __attribute__((packed)) wifi_mld_common_info_t;
3030

3131
typedef struct {
32-
@@ -2736,6 +2739,14 @@ typedef struct {
32+
@@ -2867,6 +2870,14 @@ typedef struct {
3333
} __attribute__((packed)) wifi_back_haul_sta_t;
3434

3535
#define WIFI_AP_MAX_SSID_LEN 33
@@ -44,7 +44,7 @@ index f5c37db..9f3f732 100644
4444
typedef struct {
4545
CHAR ssid[WIFI_AP_MAX_SSID_LEN];
4646
BOOL enabled;
47-
@@ -2762,6 +2773,8 @@ typedef struct {
47+
@@ -2894,6 +2905,8 @@ typedef struct {
4848
mac_address_t bssid; /**< The BSSID. This variable should only be used in the get API. It can't used to change the interface MAC */
4949
UINT wmmNoAck;
5050
UINT wepKeyLength;
@@ -53,17 +53,26 @@ index f5c37db..9f3f732 100644
5353
BOOL bssHotspot;
5454
UINT wpsPushButton;
5555
char beaconRateCtl[32];
56-
@@ -2919,4 +2932,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
56+
@@ -3055,4 +3068,4 @@ INT wifi_hal_analytics_callback_register(wifi_analytics_callback callback);
5757
}
5858
#endif
5959

6060
-#endif
6161
\ No newline at end of file
6262
+#endif
6363
diff --git a/wifi_hal_generic.h b/wifi_hal_generic.h
64-
index a55ede6..c8ca1a8 100644
64+
index a55ede6..c172320 100644
6565
--- a/wifi_hal_generic.h
6666
+++ b/wifi_hal_generic.h
67+
@@ -357,7 +357,7 @@ typedef struct {
68+
unsigned short caps;
69+
unsigned int beacon_int;
70+
unsigned int freq;
71+
- unsigned char ie[256];
72+
+ unsigned char ie[512];
73+
size_t ie_len;
74+
wifi_security_modes_t sec_mode;
75+
wifi_encryption_method_t enc_method;
6776
@@ -832,6 +832,7 @@ typedef struct {
6877
BOOL radio_presence[MAX_NUM_RADIOS]; /**< Indicates if the interfaces is present (not in deep sleep)*/
6978
wifi_multi_link_info_t mu_info;

meta-rdk-mtk-bpir4/recipes-ccsp/hal/rdk-wifi-hal.bbappend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-hal"
22

33
SRC_URI += "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-hal"
4-
SRCREV_rdk-wifi-hal = "384def11912712f0184740f10607d60be0064743"
4+
SRCREV_rdk-wifi-hal = "ec5afd02d0d87613509b325a04fa0a2fe50636cb"
55

66
CFLAGS_append = " -D_PLATFORM_BANANAPI_R4_ -DBANANA_PI_PORT -DFEATURE_SINGLE_PHY "
77
CFLAGS_append_kirkstone = " -fcommon"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
SRC_URI_remove = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=main;name=rdk-wifi-util"
22

33
SRC_URI = "git://github.com/rdkcentral/rdk-wifi-hal.git;protocol=https;branch=develop;name=rdk-wifi-util"
4-
SRCREV_rdk-wifi-util = "384def11912712f0184740f10607d60be0064743"
4+
SRCREV_rdk-wifi-util = "ec5afd02d0d87613509b325a04fa0a2fe50636cb"

0 commit comments

Comments
 (0)