Remove Android-specific code and update listener header in

fastrpc_apps_user.c

Signed-off-by: Vinayak Katoch <[email protected]>

Author: Vinayak Katoch

src/fastrpc_apps_user.c

@@ -64,7 +64,7 @@
 #include "fastrpc_perf.h"
 #include "fastrpc_pm.h"
 #include "fastrpc_procbuf.h"
-#include "listener_android.h"
+#include "listener.h"
 #include "log_config.h"
 #include "platform_libs.h"
 #include "remotectl.h"
@@ -86,19 +86,8 @@
 #define DSP_MOUNT_LOCATION "/usr/lib/dsp/"
 #define DSP_DOM_LOCATION "/usr/lib/dsp/xdspn"
 #endif
-#define VENDOR_DSP_LOCATION "/vendor/dsp/"
-#define VENDOR_DOM_LOCATION "/vendor/dsp/xdsp/"
-
-#ifdef LE_ENABLE
-#define PROPERTY_VALUE_MAX                                                     \
-  92 // as this macro is defined in cutils for Android platforms, defined
-     // explicitly for LE platform
-#elif (defined _ANDROID) || (defined ANDROID)
-/// TODO: Bharath #include "cutils/properties.h"
-#define PROPERTY_VALUE_MAX 92
-#else
+
 #define PROPERTY_VALUE_MAX 92
-#endif
 
 #ifndef _WIN32
 #include <poll.h>
@@ -241,26 +230,6 @@ const char *ENV_DEBUG_VAR_NAME[] = {"FASTRPC_PROCESS_ATTRS",
                                     "FASTRPC_DEBUG_PDDUMP",
                                     "FASTRPC_PROCESS_ATTRS_PERSISTENT",
                                     "ro.debuggable"};
-const char *ANDROIDP_DEBUG_VAR_NAME[] = {"vendor.fastrpc.process.attrs",
-                                         "vendor.fastrpc.debug.trace",
-                                         "vendor.fastrpc.debug.testsig",
-                                         "vendor.fastrpc.perf.kernel",
-                                         "vendor.fastrpc.perf.adsp",
-                                         "vendor.fastrpc.perf.freq",
-                                         "vendor.fastrpc.debug.systrace",
-                                         "vendor.fastrpc.debug.pddump",
-                                         "persist.vendor.fastrpc.process.attrs",
-                                         "ro.build.type"};
-const char *ANDROID_DEBUG_VAR_NAME[] = {"fastrpc.process.attrs",
-                                        "fastrpc.debug.trace",
-                                        "fastrpc.debug.testsig",
-                                        "fastrpc.perf.kernel",
-                                        "fastrpc.perf.adsp",
-                                        "fastrpc.perf.freq",
-                                        "fastrpc.debug.systrace",
-                                        "fastrpc.debug.pddump",
-                                        "persist.fastrpc.process.attrs",
-                                        "ro.build.type"};
 
 const char *SUBSYSTEM_NAME[] = {"adsp", "mdsp", "sdsp", "cdsp", "cdsp1", "reserved", "reserved", "reserved"};
 
@@ -274,10 +243,6 @@ static const size_t invoke_end_trace_strlen = sizeof(INVOKE_END_TRACE_STR) - 1;
 
 int NO_ENV_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
     sizeof(ENV_DEBUG_VAR_NAME) / sizeof(char *);
-int NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
-    sizeof(ANDROIDP_DEBUG_VAR_NAME) / sizeof(char *);
-int NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
-    sizeof(ANDROID_DEBUG_VAR_NAME) / sizeof(char *);
 
 /* Shell prefix for signed and unsigned */
 const char *const SIGNED_SHELL = "fastrpc_shell_";
@@ -504,29 +469,8 @@ int fastrpc_get_property_int(fastrpc_properties UserPropKey, int defValue) {
   const char *env = getenv(ENV_DEBUG_VAR_NAME[UserPropKey]);
   if (env != 0)
     return (int)atoi(env);
-#if !defined(LE_ENABLE) // Android platform
-#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
-  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(
-        ERROR,
-        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
-        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return defValue;
-  }
-  return (int)property_get_int32(ANDROIDP_DEBUG_VAR_NAME[UserPropKey],
-                                 defValue);
-#else // system library
-  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(ERROR,
-         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
-         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return defValue;
-  }
-  return (int)property_get_int32(ANDROID_DEBUG_VAR_NAME[UserPropKey], defValue);
-#endif
-#else // non-Android platforms
+
   return defValue;
-#endif
 }
 int fastrpc_get_property_string(fastrpc_properties UserPropKey, char *value,
                                 char *defValue) {
@@ -543,34 +487,12 @@ int fastrpc_get_property_string(fastrpc_properties UserPropKey, char *value,
     value[PROPERTY_VALUE_MAX - 1] = '\0';
     return strlen(env);
   }
-#if !defined(LE_ENABLE) // Android platform
-#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
-  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(
-        ERROR,
-        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
-        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return len;
-  }
-  return property_get(ANDROIDP_DEBUG_VAR_NAME[UserPropKey], (int *)value,
-                      (int *)defValue);
-#else // system library
-  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(ERROR,
-         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
-         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return len;
-  }
-  return property_get(ANDROID_DEBUG_VAR_NAME[UserPropKey], value, defValue);
-#endif
-#else // non-Android platforms
   if (defValue != NULL) {
     strncpy(value, defValue, PROPERTY_VALUE_MAX - 1);
     value[PROPERTY_VALUE_MAX - 1] = '\0';
     return strlen(defValue);
   }
   return len;
-#endif
 }
 
 /*
@@ -1611,7 +1533,7 @@ int remote_handle64_invoke_async(remote_handle64 local,
   return nErr;
 }
 
-int listener_android_geteventfd(int domain, int *fd);
+int listener_geteventfd(int domain, int *fd);
 int remote_handle_open_domain(int domain, const char *name, remote_handle *ph,
                               uint64_t *t_spawn, uint64_t *t_load) {
   char dlerrstr[255];
@@ -1634,7 +1556,7 @@ int remote_handle_open_domain(int domain, const char *name, remote_handle *ph,
   if (!strncmp(name, ITRANSPORT_PREFIX "geteventfd",
                    strlen(ITRANSPORT_PREFIX "geteventfd"))) {
     FARF(RUNTIME_RPC_HIGH, "getting event fd");
-    return listener_android_geteventfd(domain, (int *)ph);
+    return listener_geteventfd(domain, (int *)ph);
   }
   if (!strncmp(name, ITRANSPORT_PREFIX "attachguestos",
                    strlen(ITRANSPORT_PREFIX "attachguestos"))) {
@@ -3143,7 +3065,7 @@ PL_DEP(fastrpc_apps_user);
 PL_DEP(gpls);
 PL_DEP(apps_std);
 PL_DEP(rpcmem);
-PL_DEP(listener_android);
+PL_DEP(listener);
 PL_DEP(fastrpc_async);
 
 static int attach_guestos(int domain) {
@@ -3191,7 +3113,7 @@ static void domain_deinit(int domain) {
     pthread_mutex_unlock(&hlist[domain].mut);
 
     dspsignal_domain_deinit(domain);
-    listener_android_domain_deinit(domain);
+    listener_domain_deinit(domain);
     hlist[domain].first_revrpc_done = 0;
     pthread_mutex_lock(&hlist[domain].async_init_deinit_mut);
     fastrpc_async_domain_deinit(domain);
@@ -3489,28 +3411,6 @@ static int open_shell(int domain_id, apps_std_FILE *fh, int unsigned_shell) {
     strlcat(absName, shell_absName, absNameLen);
     nErr = apps_std_fopen(absName, "r", fh);
   }
-  if (nErr) {
-    absNameLen = strlen(VENDOR_DSP_LOCATION) + shell_absNameLen + 1;
-    VERIFYC(NULL !=
-                (absName = (char *)realloc(absName, sizeof(char) * absNameLen)),
-            AEE_ENOMEMORY);
-    strlcpy(absName, VENDOR_DSP_LOCATION, absNameLen);
-    strlcat(absName, shell_absName, absNameLen);
-
-    nErr = apps_std_fopen(absName, "r", fh);
-    if (nErr) {
-      absNameLen = strlen(VENDOR_DOM_LOCATION) + shell_absNameLen + 1;
-      VERIFYC(NULL != (absName =
-                           (char *)realloc(absName, sizeof(char) * absNameLen)),
-              AEE_ENOMEMORY);
-      strlcpy(absName, VENDOR_DSP_LOCATION, absNameLen);
-      strlcat(absName, SUBSYSTEM_NAME[domain], absNameLen);
-      strlcat(absName, "/", absNameLen);
-      strlcat(absName, shell_absName, absNameLen);
-
-      nErr = apps_std_fopen(absName, "r", fh);
-    }
-  }
   if (!nErr)
     FARF(ALWAYS, "Successfully opened %s, domain %d", absName, domain);
 bail:
@@ -3532,10 +3432,10 @@ static int open_shell(int domain_id, apps_std_FILE *fh, int unsigned_shell) {
       *fh = -1;
     } else {
       FARF(ERROR,
-           "Error 0x%x: %s failed for domain %d search paths used are %s, %s, "
-           "%s (errno %s)\n",
-           nErr, __func__, domain, DSP_MOUNT_LOCATION, VENDOR_DSP_LOCATION,
-           VENDOR_DOM_LOCATION, strerror(errno));
+        "Error 0x%x: %s failed for domain %d search paths used are %s, "
+        "%s/%s (errno %s)\n",
+        nErr, __func__, domain, DSP_MOUNT_LOCATION, DSP_MOUNT_LOCATION, 
+        SUBSYSTEM_NAME[domain], strerror(errno));
     }
   }
   return nErr;
@@ -4064,7 +3964,7 @@ static int domain_init(int domain, int *dev) {
   hlist[domain].state = FASTRPC_DOMAIN_STATE_INIT;
   hlist[domain].ref = 0;
   pthread_mutex_unlock(&hlist[domain].mut);
-  VERIFY(AEE_SUCCESS == (nErr = listener_android_domain_init(
+  VERIFY(AEE_SUCCESS == (nErr = listener_domain_init(
                              domain, hlist[domain].th_params.update_requested,
                              &hlist[domain].th_params.r_sem)));
 bail:
@@ -4110,7 +4010,7 @@ static void fastrpc_apps_user_deinit(void) {
       pthread_mutex_destroy(&hlist[i].init);
       pthread_mutex_destroy(&hlist[i].async_init_deinit_mut);
     }
-    listener_android_deinit();
+    listener_deinit();
     free(hlist);
     hlist = NULL;
   }
@@ -4218,7 +4118,7 @@ static int fastrpc_apps_user_init(void) {
     pthread_mutex_init(&hlist[i].init, 0);
     pthread_mutex_init(&hlist[i].async_init_deinit_mut, 0);
   }
-  listener_android_init();
+  listener_init();
   VERIFY(AEE_SUCCESS == (nErr = pthread_key_create(&tlsKey, exit_thread)));
   VERIFY(AEE_SUCCESS == (nErr = PL_INIT(apps_std)));
   GenCrc32Tab(POLY32, crc_table);