summaryrefslogtreecommitdiff
path: root/mesh/main.c
diff options
context:
space:
mode:
authorMichaƂ Lowas-Rzechonek <michal.lowas-rzechonek@silvair.com>2019-06-24 09:32:28 +0200
committerBrian Gix <brian.gix@intel.com>2019-06-24 09:04:44 -0700
commit12b984d1d4d47a8fd5bc8455d586bb208b804ebf (patch)
tree9ea739eea2eeffafcdfd5186e3f9d8f76ed2aae6 /mesh/main.c
parentee70e5e070505e7caef66e9446ac586c378bde0f (diff)
downloadbluez-12b984d1d4d47a8fd5bc8455d586bb208b804ebf.tar.gz
mesh: Move HCI handling to mesh-io-generic
This patch separates 'mesh' module from 'mesh_io', particularly regarding configuration and initialization. Main code is no longer aware of MGMT and HCI usage - querying available HCI interfaces now happens in mesh-io-generic. MGMT code is now extracted into mesh-mgmt module, which mesh-io-generic uses to query interfaces.
Diffstat (limited to 'mesh/main.c')
-rw-r--r--mesh/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesh/main.c b/mesh/main.c
index 3cecd8fbf..262e3da48 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -35,6 +35,7 @@
#include "mesh/mesh.h"
#include "mesh/dbus.h"
+#include "mesh/mesh-io.h"
static const struct option main_options[] = {
{ "index", required_argument, NULL, 'i' },
@@ -166,7 +167,8 @@ int main(int argc, char *argv[])
}
}
- if (!mesh_init(index, config_dir)) {
+
+ if (!mesh_init(config_dir, MESH_IO_TYPE_GENERIC, &index)) {
l_error("Failed to initialize mesh");
status = EXIT_FAILURE;
goto done;