Skip to content

Commit 4fb6d24

Browse files
Vinayak Katochquic-vkatoch
authored andcommitted
Remove unused function, update fallback comment, update pl_list.c,
update Makefile.am, and update PROPERTY_VALUE_MAX definition. Signed-off-by: Vinayak Katoch <[email protected]>
1 parent 1c8bc71 commit 4fb6d24

File tree

6 files changed

+7
-44
lines changed

6 files changed

+7
-44
lines changed

inc/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ noinst_HEADERS = \
5353
fastrpc_procbuf.h \
5454
fastrpc_process_attributes.h \
5555
fastrpc_trace.h \
56-
listener_android.h \
56+
listener.h \
5757
listener_buf.h \
5858
log_config.h \
5959
mod_table.h \

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LIBDSPRPC_SOURCES = \
1919
dspsignal.c \
2020
dspqueue/dspqueue_cpu.c \
2121
dspqueue/dspqueue_rpc_stub.c \
22-
listener_android.c \
22+
listener.c \
2323
apps_std_imp.c \
2424
apps_mem_imp.c \
2525
apps_mem_skel.c \

src/adspmsgd_printf.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,6 @@ typedef struct __attribute__((packed)) {
2020
char file[LOG_FILENAME_SIZE];
2121
} LogNode;
2222

23-
#if 0
24-
static inline android_LogPriority convert_level_to_android_priority(
25-
enum adspmsgd_apps_Level level)
26-
{
27-
switch (level) {
28-
case LOW:
29-
return LOW;
30-
case MEDIUM:
31-
return MEDIUM;
32-
case HIGH:
33-
return HIGH;
34-
case ERROR:
35-
return ERROR;
36-
case FATAL:
37-
return FATAL;
38-
default:
39-
return 0;
40-
}
41-
}
42-
#endif
43-
4423
int adspmsgd_apps_log(const unsigned char *log_message_buffer,
4524
int log_message_bufferLen) {
4625
LogNode *logMessage = (LogNode *)log_message_buffer;

src/apps_std_imp.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ __QAIC_IMPL_EXPORT int __QAIC_IMPL(apps_std_fopen_with_env)(
10881088
}
10891089
FREEIF(absName);
10901090

1091-
// fallback: If not found in domain path /vendor/dsp/adsp try in /vendor/dsp
1091+
// fallback to open the file without domain
10921092
absNameLen = strlen(dirName) + strlen(name) + 2;
10931093
VERIFYC(NULL != (absName = (char *)malloc(sizeof(char) * absNameLen)),
10941094
AEE_ENOMEMORY);
@@ -1157,14 +1157,7 @@ __QAIC_IMPL_EXPORT int __QAIC_IMPL(apps_std_fopen_with_env_fd)(
11571157
VERIFYC(NULL != delim, AEE_EBADPARM);
11581158
VERIFYC(NULL != name, AEE_EBADPARM);
11591159
VERIFYC(NULL != envvarname, AEE_EBADPARM);
1160-
#if 0 //TODO: Bharath
1161-
char *tempName = name;
1162-
tempName += 2;
1163-
if (tempName[0] == '\0') {
1164-
nErr = AEE_EBADPARM;
1165-
goto bail;
1166-
}
1167-
#endif
1160+
11681161
FASTRPC_ATRACE_BEGIN_L("%s for %s in %s mode from path in environment "
11691162
"variable %s delimited with %s",
11701163
__func__, name, mode, envvarname, delim);
@@ -1223,7 +1216,7 @@ __QAIC_IMPL_EXPORT int __QAIC_IMPL(apps_std_fopen_with_env_fd)(
12231216
}
12241217
FREEIF(absName);
12251218

1226-
// fallback: If not found in domain path /vendor/dsp/adsp try in /vendor/dsp
1219+
// fallback to open the file without domain
12271220
absNameLen = strlen(dirName) + strlen(name) + 2;
12281221
VERIFYC(NULL != (absName = (char *)malloc(sizeof(char) * absNameLen)),
12291222
AEE_ENOMEMORY);

src/fastrpc_mem.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,7 @@
4141
#include "shared.h"
4242
#include "verify.h"
4343

44-
#ifdef LE_ENABLE
45-
#define PROPERTY_VALUE_MAX \
46-
92 // as this macro is defined in cutils for Android platforms, defined
47-
// explicitly for LE platform
48-
#elif (defined _ANDROID) || (defined ANDROID)
49-
// TODO: Bharath #include "cutils/properties.h"
5044
#define PROPERTY_VALUE_MAX 92
51-
#else
52-
#define PROPERTY_VALUE_MAX 92
53-
#endif
5445

5546
#ifndef _WIN32
5647
#include <poll.h>

src/pl_list.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "platform_libs.h"
55

66
PL_DEP(gpls)
7-
PL_DEP(listener_android)
7+
PL_DEP(listener)
88

99
struct platform_lib *(*pl_list[])(void) = {PL_ENTRY(gpls),
10-
PL_ENTRY(listener_android), 0};
10+
PL_ENTRY(listener), 0};

0 commit comments

Comments
 (0)