* [PATCH BlueZ 0/1] Mesh: make SIG model header file locations more consistent @ 2020-09-01 11:54 Daan Pape 2020-09-01 11:54 ` [PATCH BlueZ 1/1] " Daan Pape 0 siblings, 1 reply; 4+ messages in thread From: Daan Pape @ 2020-09-01 11:54 UTC (permalink / raw) To: linux-bluetooth; +Cc: Daan Pape The configuration model header was now in the tools/mesh directory while the Generic OnOff header was in the tools/mesh-gatt directory. In preparation of implementing the Generic OnOff client model in the mesh-cfgclient tool and to make the structure more consistent I renamed and moved the header file of the Generic OnOff model to the tools/mesh directory. Daan Pape (1): Mesh: make SIG model header file locations more consistent 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 -- 2.25.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH BlueZ 1/1] Mesh: make SIG model header file locations more consistent 2020-09-01 11:54 [PATCH BlueZ 0/1] Mesh: make SIG model header file locations more consistent Daan Pape @ 2020-09-01 11:54 ` Daan Pape 2020-09-01 14:30 ` [BlueZ,1/1] " bluez.test.bot 2020-09-01 14:31 ` bluez.test.bot 0 siblings, 2 replies; 4+ messages in thread From: Daan Pape @ 2020-09-01 11:54 UTC (permalink / raw) To: linux-bluetooth; +Cc: Daan Pape --- 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 --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 -- 2.25.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [BlueZ,1/1] Mesh: make SIG model header file locations more consistent 2020-09-01 11:54 ` [PATCH BlueZ 1/1] " Daan Pape @ 2020-09-01 14:30 ` bluez.test.bot 2020-09-01 14:31 ` bluez.test.bot 1 sibling, 0 replies; 4+ messages in thread From: bluez.test.bot @ 2020-09-01 14:30 UTC (permalink / raw) To: linux-bluetooth, daan [-- Attachment #1: Type: text/plain, Size: 350 bytes --] This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. While we are preparing for reviewing the patches, we found the following issue/warning. Test Result: checkgitlint Failed Outputs: 3: B6 Body message is missing --- Regards, Linux Bluetooth ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: Mesh: make SIG model header file locations more consistent 2020-09-01 11:54 ` [PATCH BlueZ 1/1] " Daan Pape 2020-09-01 14:30 ` [BlueZ,1/1] " bluez.test.bot @ 2020-09-01 14:31 ` bluez.test.bot 1 sibling, 0 replies; 4+ messages in thread From: bluez.test.bot @ 2020-09-01 14:31 UTC (permalink / raw) To: linux-bluetooth, daan [-- Attachment #1: Type: text/plain, Size: 857 bytes --] This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. While we are preparing for reviewing the patches, we found the following issue/warning. Test Result: checkbuild Failed Outputs: ar: `u' modifier ignored since `D' is the default (see `U') ar: `u' modifier ignored since `D' is the default (see `U') ar: `u' modifier ignored since `D' is the default (see `U') ar: `u' modifier ignored since `D' is the default (see `U') tools/meshctl.c:53:10: fatal error: mesh/generic-onoff-model.h: No such file or directory 53 | #include "mesh/generic-onoff-model.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [Makefile:6791: tools/meshctl.o] Error 1 make: *** [Makefile:4010: all] Error 2 --- Regards, Linux Bluetooth ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-01 14:32 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-09-01 11:54 [PATCH BlueZ 0/1] Mesh: make SIG model header file locations more consistent Daan Pape 2020-09-01 11:54 ` [PATCH BlueZ 1/1] " Daan Pape 2020-09-01 14:30 ` [BlueZ,1/1] " bluez.test.bot 2020-09-01 14:31 ` bluez.test.bot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).