File myriad-firmware-path.patch of Package dldt

Overview Repositories Revisions Requests Users Attributes Meta

File myriad-firmware-path.patch of Package dldt (Revision b49dd0f22b8d7edb033c68894ea286ca)

Currently displaying revision b49dd0f22b8d7edb033c68894ea286ca , Show latest

diff --git a/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c b/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c
index bd7802d9..58118d6a 100644
--- a/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c
+++ b/inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c
@@ -479,14 +479,6 @@ static ncStatus_t getLibDirectory(char *firmware_directory, const int firwmare_d
             fprintf(stderr, "GetModuleHandle returned %d", ret);
         }
         GetModuleFileNameA(hm, path_to_lib_file, MAX_PATH_LENGTH - 1);
-#else
-        Dl_info info;
-        dladdr(ncDeviceOpen, &info);
-        rc = mv_strncpy(path_to_lib_file, MAX_PATH_LENGTH, info.dli_fname, MAX_PATH_LENGTH - 1);
-        if (rc != 0) {
-            return NC_ERROR;
-        }
-#endif
         // Path can contains library name. Use path before last '/'
         char* pointerToSeparator = NULL;
         size_t lib_dir_path_len = 0;
@@ -498,6 +490,9 @@ static ncStatus_t getLibDirectory(char *firmware_directory, const int firwmare_d
         }
 
         rc = mv_strncpy(firmware_directory, firwmare_directory_length, path_to_lib_file, lib_dir_path_len);
+#else
+        rc = mv_strncpy(path_to_lib_file, MAX_PATH_LENGTH, "/lib/firmware/", MAX_PATH_LENGTH - 1);
+#endif
         if (rc != 0) {
             return NC_ERROR;
         }
@@ -555,6 +550,8 @@ ncStatus_t getFirmwarePath(char *firmware_file_path, const int firmware_file_len
         return NC_INVALID_PARAMETERS;
     }
 
+    fprintf (stderr, "getFirmwarePath (%s, %i)\n", firmware_file_path, firmware_file_length);
+
     ncStatus_t ncStatus;
     int rc;
 
@@ -601,13 +598,20 @@ ncStatus_t getFirmwarePath(char *firmware_file_path, const int firmware_file_len
         return NC_ERROR;
     }
     mvLog(MVLOG_DEBUG, "Firmware name %s", firmware_full_name);
+    fprintf (stderr, "Firmware name %s\n", firmware_full_name);
 
     ///     Get file location
+#if 0
     ncStatus = getLibDirectory(firmware_dir, FIRMWARE_DIR_LENGTH);
+#else
+    rc = mv_strncpy(firmware_dir, FIRMWARE_DIR_LENGTH, "/lib/firmware/", FIRMWARE_DIR_LENGTH - 1);
+#endif
     if (ncStatus != NC_OK) {
         return ncStatus;
     }
-    mvLog(MVLOG_DEBUG, "Firmware dir %s", firmware_full_name);
+
+    mvLog(MVLOG_DEBUG, "Firmware dir %s", firmware_dir);
+    fprintf (stderr, "Firmware dir %s\n", firmware_dir);
 
     rc = snprintf(full_path_to_firmware, MAX_PATH_LENGTH, "%s%s", firmware_dir, firmware_full_name);
     if (rc < 0) {

Places

File myriad-firmware-path.patch of Package dldt (Revision b49dd0f22b8d7edb033c68894ea286ca)

Places