From f44843760838a306234242aeffefd47ac2c5deb2 Mon Sep 17 00:00:00 2001
From: zhangfeng <hw.zhangfeng@huawei.com>
Date: Thu, 27 Jan 2022 10:41:58 +0000
Subject: [PATCH] 1. disable module componentization boundle file; 2. revert
 power consumption optimize

Signed-off-by: zhangfeng <hw.zhangfeng@huawei.com>
---
 bundle.json                                   | 111 ------------------
 .../ipc_framework/cRPC/src/server.c           |   2 +-
 2 files changed, 1 insertion(+), 112 deletions(-)
 delete mode 100755 bundle.json

diff --git a/bundle.json b/bundle.json
deleted file mode 100755
index fae05e5a7..000000000
--- a/bundle.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-    "name": "@ohos/communication_wifi",
-    "version": "3.1.0",
-    "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.",
-    "homePage": "https://gitee.com/openharmony",
-    "license": "Apache License 2.0",
-    "repository": "https://gitee.com/openharmony/communication_wifi",
-    "domain": "os",
-    "language": "",
-    "publishAs": "code-segment",
-    "private": false,
-    "scripts": {},
-    "tags": [
-        "foundation"
-    ],
-    "keywords": [
-        "communication",
-        "wifi"
-    ],
-    "envs": [],
-    "dirs": [],
-    "author": {
-        "name": "",
-        "email": "",
-        "url": ""
-    },
-    "contributors": [
-        {
-            "name": "",
-            "email": "",
-            "url": ""
-        }
-    ],
-    "segment": {
-        "destPath": "foundation/communication/wifi"
-    },
-    "component": {
-        "name": "wifi_standard",
-        "subsystem": "communication",
-        "syscap": [
-            "SystemCapability.Communication.WiFi"
-        ],
-        "features": [],
-        "adapted_system_type": [
-            "standard"
-        ],
-        "rom": "",
-        "ram": "",
-        "deps": {
-            "components": [
-                "ipc",
-                "ces_standard",
-                "hiviewdfx_hilog_native"
-            ],
-            "third_party": [
-                "wpa_supplicant",
-                "node",
-                "bounds_checking_function",
-                "googletest",
-                "openssl"
-            ]
-        },
-        "build": {
-            "sub_component": [
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi"
-            ],
-            "inner_kits": [
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                },
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_scan.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                }
-            ],
-            "test": [
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/common/unittest:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest:unittest",
-                "//foundation/communication/wifi/tests/wifi_standard/wifi_hal/unittest:unittest"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/server.c b/services/wifi_standard/ipc_framework/cRPC/src/server.c
index 97e425812..03173541a 100644
--- a/services/wifi_standard/ipc_framework/cRPC/src/server.c
+++ b/services/wifi_standard/ipc_framework/cRPC/src/server.c
@@ -199,7 +199,7 @@ int RunRpcLoop(RpcServer *server)
     EventLoop *loop = server->loop;
     while (!loop->stop) {
         BeforeLoop(server);
-        int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, -1);
+        int retval = epoll_wait(loop->epfd, loop->epEvents, loop->setSize, 1);
         for (int i = 0; i < retval; ++i) {
             struct epoll_event *e = loop->epEvents + i;
             int fd = e->data.fd;
-- 
Gitee