summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--service/jni/wifi_hal_stub.h15
-rw-r--r--service/lib/wifi_hal_stub.cpp39
-rw-r--r--service/tools/halutil/halutil.cpp27
3 files changed, 71 insertions, 10 deletions
diff --git a/service/jni/wifi_hal_stub.h b/service/jni/wifi_hal_stub.h
index cd84b4c..158da37 100644
--- a/service/jni/wifi_hal_stub.h
+++ b/service/jni/wifi_hal_stub.h
@@ -72,6 +72,21 @@ wifi_error wifi_get_link_stats_stub(wifi_request_id id,
wifi_error wifi_set_epno_list_stub(int id, wifi_interface_info *iface, int num_networks,
wifi_epno_network *networks, wifi_epno_handler handler);
wifi_error wifi_set_country_code_stub(wifi_interface_handle iface, const char *code);
+wifi_error wifi_get_firmware_memory_dump_stub( wifi_interface_handle iface,
+ wifi_firmware_memory_dump_handler handler);
+wifi_error wifi_set_log_handler_stub(wifi_request_id id, wifi_interface_handle iface,
+ wifi_ring_buffer_data_handler handler);
+wifi_error wifi_set_alert_handler_stub(wifi_request_id id, wifi_interface_handle iface,
+ wifi_alert_handler handler);
+wifi_error wifi_get_firmware_version_stub( wifi_interface_handle iface, char **buffer,
+ int *buffer_size);
+wifi_error wifi_get_ring_buffers_status_stub(wifi_interface_handle iface,
+ u32 *num_rings, wifi_ring_buffer_status **status);
+wifi_error wifi_get_logger_supported_feature_set_stub(wifi_interface_handle iface,
+ unsigned int *support);
+wifi_error wifi_get_ring_data_stub(wifi_interface_handle iface, char *ring_name);
+wifi_error wifi_get_driver_version_stub(wifi_interface_handle iface, char **buffer,
+ int *buffer_size);
#ifdef __cplusplus
}
#endif
diff --git a/service/lib/wifi_hal_stub.cpp b/service/lib/wifi_hal_stub.cpp
index a3b211b..ee2f2e4 100644
--- a/service/lib/wifi_hal_stub.cpp
+++ b/service/lib/wifi_hal_stub.cpp
@@ -150,3 +150,42 @@ wifi_error wifi_set_epno_list_stub(int id, wifi_interface_info *iface, int num_n
wifi_error wifi_set_country_code_stub(wifi_interface_handle iface, const char *code) {
return WIFI_ERROR_NOT_SUPPORTED;
}
+
+wifi_error wifi_get_firmware_memory_dump_stub( wifi_interface_handle iface,
+ wifi_firmware_memory_dump_handler handler){
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_set_log_handler_stub(wifi_request_id id, wifi_interface_handle iface,
+ wifi_ring_buffer_data_handler handler) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_set_alert_handler_stub(wifi_request_id id, wifi_interface_handle iface,
+ wifi_alert_handler handler) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_get_firmware_version_stub( wifi_interface_handle iface, char **buffer,
+ int *buffer_size) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_get_ring_buffers_status_stub(wifi_interface_handle iface,
+ u32 *num_rings, wifi_ring_buffer_status **status) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_get_logger_supported_feature_set_stub(wifi_interface_handle iface,
+ unsigned int *support) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_get_ring_data_stub(wifi_interface_handle iface, char *ring_name) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
+wifi_error wifi_get_driver_version_stub(wifi_interface_handle iface, char **buffer, int *buffer_size) {
+ return WIFI_ERROR_NOT_SUPPORTED;
+}
+
diff --git a/service/tools/halutil/halutil.cpp b/service/tools/halutil/halutil.cpp
index c7f8837..39ca827 100644
--- a/service/tools/halutil/halutil.cpp
+++ b/service/tools/halutil/halutil.cpp
@@ -54,7 +54,14 @@ int init_wifi_hal_func_table(wifi_hal_fn *hal_fn) {
hal_fn->wifi_start_logging = wifi_start_logging_stub;
hal_fn->wifi_set_epno_list = wifi_set_epno_list_stub;
hal_fn->wifi_set_country_code = wifi_set_country_code_stub;
-
+ hal_fn->wifi_get_firmware_memory_dump = wifi_get_firmware_memory_dump_stub;
+ hal_fn->wifi_set_log_handler = wifi_set_log_handler_stub;
+ hal_fn->wifi_set_alert_handler = wifi_set_alert_handler_stub;
+ hal_fn->wifi_get_firmware_version = wifi_get_firmware_version_stub;
+ hal_fn->wifi_get_ring_buffers_status = wifi_get_ring_buffers_status_stub;
+ hal_fn->wifi_get_logger_supported_feature_set = wifi_get_logger_supported_feature_set_stub;
+ hal_fn->wifi_get_ring_data = wifi_get_ring_data_stub;
+ hal_fn->wifi_get_driver_version = wifi_get_driver_version_stub;
return 0;
}
@@ -1929,7 +1936,7 @@ static wifi_error LoggerStart()
{
int ret;
- ret = wifi_start_logging(wlan0Handle,
+ ret = hal_fn.wifi_start_logging(wlan0Handle,
default_logger_param.verbose_level, default_logger_param.flags,
default_logger_param.max_interval_sec, default_logger_param.min_data_size,
default_logger_param.ring_name);
@@ -1954,7 +1961,7 @@ static wifi_error LoggerGetMemdump()
handler.on_firmware_memory_dump = &onFirmwareMemoryDump;
printMsg("Create Memdump event\n");
- int result = wifi_get_firmware_memory_dump(wlan0Handle, handler);
+ int result = hal_fn.wifi_get_firmware_memory_dump(wlan0Handle, handler);
if (result == WIFI_SUCCESS) {
EventInfo info;
@@ -1972,7 +1979,7 @@ static wifi_error LoggerGetMemdump()
static wifi_error LoggerGetRingData()
{
- int result = wifi_get_ring_data(wlan0Handle, default_ring_name);
+ int result = hal_fn.wifi_get_ring_data(wlan0Handle, default_ring_name);
if (result == WIFI_SUCCESS)
printMsg("Get Ring data command success\n");
@@ -1992,7 +1999,7 @@ static wifi_error LoggerGetFW()
return WIFI_ERROR_OUT_OF_MEMORY;
memset(buffer, 0, buffer_size);
- ret = wifi_get_firmware_version(wlan0Handle, &buffer, &buffer_size);
+ ret = hal_fn.wifi_get_firmware_version(wlan0Handle, &buffer, &buffer_size);
if (ret == WIFI_SUCCESS)
printMsg("FW version (len=%d):\n%s\n", buffer_size, buffer);
@@ -2017,7 +2024,7 @@ static wifi_error LoggerGetDriver()
return WIFI_ERROR_OUT_OF_MEMORY;
memset(buffer, 0, buffer_size);
- ret = wifi_get_driver_version(wlan0Handle, &buffer, &buffer_size);
+ ret = hal_fn.wifi_get_driver_version(wlan0Handle, &buffer, &buffer_size);
if (ret == WIFI_SUCCESS)
printMsg("Driver version (len=%d):\n%s\n", buffer_size, buffer);
@@ -2042,7 +2049,7 @@ static wifi_error LoggerGetRingbufferStatus()
return WIFI_ERROR_OUT_OF_MEMORY;
memset(status, 0, sizeof(wifi_ring_buffer_status));
- ret = wifi_get_ring_buffers_status(wlan0Handle, &num_rings, &status);
+ ret = hal_fn.wifi_get_ring_buffers_status(wlan0Handle, &num_rings, &status);
if (ret == WIFI_SUCCESS) {
printMsg("RingBuffer status: [%d ring(s)]\n", num_rings);
@@ -2086,7 +2093,7 @@ static wifi_error LoggerGetFeature()
"WATCHDOG_TIMER"
};
- ret = wifi_get_logger_supported_feature_set(wlan0Handle, &support);
+ ret = hal_fn.wifi_get_logger_supported_feature_set(wlan0Handle, &support);
if (ret == WIFI_SUCCESS) {
printMsg("Logger supported features: %02x [", support);
@@ -2119,7 +2126,7 @@ static wifi_error LoggerSetLogHandler()
handler.on_ring_buffer_data = &onRingBufferData;
printMsg("Setting log handler\n");
- int result = wifi_set_log_handler(loggerCmdId, wlan0Handle, handler);
+ int result = hal_fn.wifi_set_log_handler(loggerCmdId, wlan0Handle, handler);
if (result == WIFI_SUCCESS) {
EventInfo info;
@@ -2142,7 +2149,7 @@ static wifi_error LoggerSetAlertHandler()
handler.on_alert = &onAlert;
printMsg("Create alert handler\n");
- int result = wifi_set_alert_handler(loggerCmdId, wlan0Handle, handler);
+ int result = hal_fn.wifi_set_alert_handler(loggerCmdId, wlan0Handle, handler);
if (result == WIFI_SUCCESS) {
EventInfo info;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 03:05:10 +0000