[RFC,BlueZ,05/10] tools/userchan-tester: Convert to use ELL library

Commit Message

Stotland, Inga Nov. 7, 2020, 7:03 a.m. UTC

This reworks the source code to use ELL primitives and removes
dependecies on GLib.
---
 Makefile.tools          | 4 ++--
 tools/userchan-tester.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

Patch

diff --git a/Makefile.tools b/Makefile.tools
index 15613a5c9..7c29e115b 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -165,12 +165,12 @@  tools_hci_tester_SOURCES = tools/hci-tester.c monitor/bt.h
 tools_hci_tester_LDADD = src/libshared-glib.la $(GLIB_LIBS)
 
 tools_userchan_tester_SOURCES = tools/userchan-tester.c monitor/bt.h \
-				emulator/hciemu.h emulator/hciemu.c \
+				emulator/hciemu.h emulator/hciemu-ell.c \
 				emulator/btdev.h emulator/btdev.c \
 				emulator/bthost.h emulator/bthost.c \
 				emulator/smp.c
 tools_userchan_tester_LDADD = lib/libbluetooth-internal.la \
-				src/libshared-glib.la $(GLIB_LIBS)
+				src/libshared-ell.la $(ell_ldadd)
 endif
 
 if TOOLS
diff --git a/tools/userchan-tester.c b/tools/userchan-tester.c
index c17644fb8..21c853221 100644
--- a/tools/userchan-tester.c
+++ b/tools/userchan-tester.c
@@ -18,8 +18,6 @@ 
 #include <errno.h>
 #include <stdbool.h>
 
-#include <glib.h>
-
 #include "lib/bluetooth.h"
 #include "lib/hci.h"
 #include "lib/mgmt.h"