Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / native_client / src / trusted / service_runtime / sel_ldr.h

diff --git a/src/native_client/src/trusted/service_runtime/sel_ldr.h b/src/native_client/src/trusted/service_runtime/sel_ldr.h
index 8aafb53..6acf1ed 100644 (file)
--- a/src/native_client/src/trusted/service_runtime/sel_ldr.h
+++ b/src/native_client/src/trusted/service_runtime/sel_ldr.h
@@ -33,6 +33,8 @@
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/elf.h"
 
+#include "native_client/src/public/nacl_app.h"
+
 #include "native_client/src/shared/platform/nacl_host_desc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
@@ -120,14 +122,6 @@ struct NaClApp {
    */
 
   /*
-   * aux_info can contain an arbitrary NUL terminated string.  It is
-   * set via the load_module RPC, and is intended to enable the
-   * browser plugin to provide information that would be useful for
-   * the debugger.
-   */
-  char                      *aux_info;
-
-  /*
    * Determined at load time; OS-determined.
    * Read-only after load, so accesses do not require locking.
    */
@@ -645,32 +639,26 @@ static const uintptr_t kNaClBadAddress = (uintptr_t) -1;
  * The caller is responsible for invoking NaClDescUnref() on it when
  * done.
  */
-struct NaClDesc *NaClGetDesc(struct NaClApp *nap,
-                             int            d);
-
-/*
- * Takes ownership of ndp.
- */
-void NaClSetDesc(struct NaClApp   *nap,
-                 int              d,
-                 struct NaClDesc  *ndp);
+struct NaClDesc *NaClAppGetDesc(struct NaClApp *nap,
+                                int            d);
 
+/* NaClAppSetDesc() is defined in src/public/chrome_main.h. */
 
-int32_t NaClSetAvail(struct NaClApp   *nap,
-                     struct NaClDesc  *ndp);
+int32_t NaClAppSetDescAvail(struct NaClApp   *nap,
+                            struct NaClDesc  *ndp);
 
 /*
  * Versions that are called while already holding the desc_mu lock
  */
-struct NaClDesc *NaClGetDescMu(struct NaClApp *nap,
-                               int            d);
+struct NaClDesc *NaClAppGetDescMu(struct NaClApp *nap,
+                                  int            d);
 
-void NaClSetDescMu(struct NaClApp   *nap,
-                   int              d,
-                   struct NaClDesc  *ndp);
+void NaClAppSetDescMu(struct NaClApp   *nap,
+                      int              d,
+                      struct NaClDesc  *ndp);
 
-int32_t NaClSetAvailMu(struct NaClApp   *nap,
-                       struct NaClDesc  *ndp);
+int32_t NaClAppSetDescAvailMu(struct NaClApp   *nap,
+                              struct NaClDesc  *ndp);
 
 
 int NaClAddThread(struct NaClApp        *nap,
@@ -698,13 +686,12 @@ void NaClSetUpBootstrapChannel(struct NaClApp  *nap,
 void NaClSecureCommandChannel(struct NaClApp  *nap);
 
 /*
- * Loads the |nexe| as a NaCl app module. The NaClApp takes an ownership
- * of the |aux_info|. The |load_cb| callback is invoked before the the
- * |nexe| is loaded to allow validation being run in parallel.
+ * Loads the |nexe| as a NaCl app module.
+ * The |load_cb| callback is invoked before the the |nexe| is loaded to allow
+ * validation being run in parallel.
  */
 void NaClAppLoadModule(struct NaClApp      *self,
                        struct NaClDesc     *nexe,
-                       char                *aux_info,
                        void                (*load_cb)(void *instance_data,
                                                       NaClErrorCode status),
                        void                *instance_data);