X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=a22e4442cd8fc31ec6650e1e0979d9b6cc6b45a3;hb=9fe2dfd3c4df334607083f989346090e1051a565;hp=d673d0eba94d485ec07615ebd36ef36a603f5071;hpb=63c32ff0f0ee13b505d252821fe1fd55816699e1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index d673d0eb..a22e4442 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -27,15 +27,9 @@
 
 #include "afb-api-so.h"
 #include "afb-api-so-v1.h"
+#include "afb-api-so-v2.h"
 #include "verbose.h"
 
-int afb_api_so_timeout = 15;
-
-void afb_api_so_set_timeout(int to)
-{
-	afb_api_so_timeout = to;
-}
-
 static int load_binding(const char *path, int force)
 {
 	int rc;
@@ -53,9 +47,14 @@ static int load_binding(const char *path, int force)
 	}
 
 	/* retrieves the register function */
+	rc = afb_api_so_v2_add(path, handle);
+	if (rc < 0) {
+		/* error when loading a valid v2 binding */
+		goto error2;
+	}
 	rc = afb_api_so_v1_add(path, handle);
 	if (rc < 0) {
-		/* error when loading a valid v& binding */
+		/* error when loading a valid v1 binding */
 		goto error2;
 	}
 	if (rc == 0) {