diff mbox series

[BlueZ,1/1] Mesh: make SIG model header file locations more consistent

Message ID 20200901115418.82056-2-daan@dptechnics.com
State New
Headers show
Series [BlueZ,1/1] Mesh: make SIG model header file locations more consistent | expand

Commit Message

Daan Pape Sept. 1, 2020, 11:54 a.m. UTC 
---
 tools/mesh-gatt/onoff-model.c |  2 +-
 tools/mesh-gatt/onoff-model.h | 33 ---------------------------------
 tools/meshctl.c               |  2 +-
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 tools/mesh-gatt/onoff-model.h
diff mbox series

Patch

diff --git a/tools/mesh-gatt/onoff-model.c b/tools/mesh-gatt/onoff-model.c
index be519c969..140dddb79 100644
--- a/tools/mesh-gatt/onoff-model.c
+++ b/tools/mesh-gatt/onoff-model.c
@@ -47,7 +47,7 @@ 
 #include "tools/mesh-gatt/node.h"
 #include "tools/mesh-gatt/prov-db.h"
 #include "tools/mesh-gatt/util.h"
-#include "tools/mesh-gatt/onoff-model.h"
+#include "tools/mesh/generic-onoff-model.h"
 
 static uint8_t trans_id;
 static uint16_t onoff_app_idx = APP_IDX_INVALID;
diff --git a/tools/mesh-gatt/onoff-model.h b/tools/mesh-gatt/onoff-model.h
deleted file mode 100644
index 31599056d..000000000
--- a/tools/mesh-gatt/onoff-model.h
+++ /dev/null
@@ -1,33 +0,0 @@ 
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2017  Intel Corporation. All rights reserved.
- *
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#define GENERIC_ONOFF_SERVER_MODEL_ID	0x1000
-#define GENERIC_ONOFF_CLIENT_MODEL_ID	0x1001
-
-#define OP_GENERIC_ONOFF_GET			0x8201
-#define OP_GENERIC_ONOFF_SET			0x8202
-#define OP_GENERIC_ONOFF_SET_UNACK		0x8203
-#define OP_GENERIC_ONOFF_STATUS			0x8204
-
-void onoff_set_node(const char *args);
-bool onoff_client_init(uint8_t ele);
diff --git a/tools/meshctl.c b/tools/meshctl.c
index 57998fded..e8eafff01 100644
--- a/tools/meshctl.c
+++ b/tools/meshctl.c
@@ -50,6 +50,7 @@ 
 
 #include "mesh/agent.h"
 #include "mesh/config-model.h"
+#include "mesh/generic-onoff-model.h"
 
 #include "mesh-gatt/mesh-net.h"
 #include "mesh-gatt/gatt.h"
@@ -60,7 +61,6 @@ 
 #include "mesh-gatt/prov.h"
 #include "mesh-gatt/util.h"
 #include "mesh-gatt/prov-db.h"
-#include "mesh-gatt/onoff-model.h"
 
 /* String display constants */
 #define COLORED_NEW	COLOR_GREEN "NEW" COLOR_OFF