emulator: Create separate server BR/EDR/LE and BR/EDR types

pauloborges · Jan 31, 2013 · 1ffa263 · 1ffa263
1 parent cdc90de
commit 1ffa263
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/emulator/main.c b/emulator/main.c
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
 	struct server *server2;
 	struct server *server3;
 	struct server *server4;
+	struct server *server5;
 	bool enable_vhci = false;
 	sigset_t mask;
 
@@ -109,20 +110,25 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "Failed to open Virtual HCI device\n");
 	}
 
-	server1 = server_open_unix(SERVER_TYPE_BREDR, "/tmp/bt-server-bredr");
+	server1 = server_open_unix(SERVER_TYPE_BREDRLE,
+						"/tmp/bt-server-bredrle");
 	if (!server1)
-		fprintf(stderr, "Failed to open BR/EDR server channel\n");
+		fprintf(stderr, "Failed to open BR/EDR/LE server channel\n");
 
-	server2 = server_open_unix(SERVER_TYPE_AMP, "/tmp/bt-server-amp");
+	server2 = server_open_unix(SERVER_TYPE_BREDR, "/tmp/bt-server-bredr");
 	if (!server2)
-		fprintf(stderr, "Failed to open AMP server channel\n");
+		fprintf(stderr, "Failed to open BR/EDR server channel\n");
 
-	server3 = server_open_unix(SERVER_TYPE_LE, "/tmp/bt-server-le");
+	server3 = server_open_unix(SERVER_TYPE_AMP, "/tmp/bt-server-amp");
 	if (!server3)
-		fprintf(stderr, "Failed to open LE server channel\n");
+		fprintf(stderr, "Failed to open AMP server channel\n");
 
-	server4 = server_open_unix(SERVER_TYPE_MONITOR, "/tmp/bt-server-mon");
+	server4 = server_open_unix(SERVER_TYPE_LE, "/tmp/bt-server-le");
 	if (!server4)
+		fprintf(stderr, "Failed to open LE server channel\n");
+
+	server5 = server_open_unix(SERVER_TYPE_MONITOR, "/tmp/bt-server-mon");
+	if (!server5)
 		fprintf(stderr, "Failed to open monitor server channel\n");
 
 	return mainloop_run();

diff --git a/emulator/server.c b/emulator/server.c
@@ -217,6 +217,9 @@ static void server_accept_callback(int fd, uint32_t events, void *user_data)
 	}
 
 	switch (server->type) {
+	case SERVER_TYPE_BREDRLE:
+		type = BTDEV_TYPE_BREDRLE;
+		break;
 	case SERVER_TYPE_BREDR:
 		type = BTDEV_TYPE_BREDR;
 		break;

diff --git a/emulator/server.h b/emulator/server.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 enum server_type {
+	SERVER_TYPE_BREDRLE,
 	SERVER_TYPE_BREDR,
 	SERVER_TYPE_LE,
 	SERVER_TYPE_AMP,