You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/08/10 21:13:56 UTC
[2/2] incubator-mynewt-core git commit: This closes #88. Merge
remote-tracking branch 'bgiori/refactor-services' into develop
This closes #88.
Merge remote-tracking branch 'bgiori/refactor-services' into develop
* bgiori/refactor-services:
Refactored file structure for premade services.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/e291e12d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e291e12d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e291e12d
Branch: refs/heads/develop
Commit: e291e12d37c24f3124553dea454b303d561a7cb2
Parents: 8ec1b8d ddba2ab
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Aug 10 14:13:31 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Aug 10 14:13:31 2016 -0700
----------------------------------------------------------------------
apps/blecent/pkg.yml | 3 +-
apps/blecent/src/main.c | 4 +-
apps/bleprph/pkg.yml | 3 +-
apps/bleprph/src/main.c | 4 +-
apps/bletiny/pkg.yml | 3 +-
apps/bletiny/src/main.c | 4 +-
apps/bleuart/pkg.yml | 3 +-
apps/bleuart/src/main.c | 4 +-
.../lls/include/profiles/lls/ble_svc_lls.h | 44 ----
net/nimble/host/profiles/lls/pkg.yml | 31 ---
net/nimble/host/profiles/lls/src/ble_svc_lls.c | 201 -------------------
.../gap/include/services/gap/ble_svc_gap.h | 39 ++++
net/nimble/host/services/gap/pkg.yml | 31 +++
net/nimble/host/services/gap/src/ble_svc_gap.c | 167 +++++++++++++++
.../gatt/include/services/gatt/ble_svc_gatt.h | 29 +++
net/nimble/host/services/gatt/pkg.yml | 31 +++
.../host/services/gatt/src/ble_svc_gatt.c | 90 +++++++++
.../lls/include/services/lls/ble_svc_lls.h | 44 ++++
net/nimble/host/services/lls/pkg.yml | 31 +++
net/nimble/host/services/lls/src/ble_svc_lls.c | 201 +++++++++++++++++++
.../include/services/mandatory/ble_svc_gap.h | 39 ----
.../include/services/mandatory/ble_svc_gatt.h | 10 -
net/nimble/host/services/mandatory/pkg.yml | 32 ---
.../host/services/mandatory/src/ble_svc_gap.c | 167 ---------------
.../host/services/mandatory/src/ble_svc_gatt.c | 90 ---------
25 files changed, 679 insertions(+), 626 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/blecent/pkg.yml
----------------------------------------------------------------------
diff --cc apps/blecent/pkg.yml
index 3798fee,2fb8be9..b413fad
--- a/apps/blecent/pkg.yml
+++ b/apps/blecent/pkg.yml
@@@ -27,9 -27,9 +27,10 @@@ pkg.deps
- sys/log
- net/nimble/controller
- net/nimble/host
- - net/nimble/host/services/mandatory
+ - net/nimble/host/services/gap
+ - net/nimble/host/services/gatt
- net/nimble/host/store/ram
+ - net/nimble/transport/ram
- libs/console/full
- libs/baselibc
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/blecent/src/main.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bleprph/pkg.yml
----------------------------------------------------------------------
diff --cc apps/bleprph/pkg.yml
index 7c45ee2,f697d83..cfc8e3b
--- a/apps/bleprph/pkg.yml
+++ b/apps/bleprph/pkg.yml
@@@ -27,9 -27,9 +27,10 @@@ pkg.deps
- sys/log
- net/nimble/controller
- net/nimble/host
- - net/nimble/host/services/mandatory
+ - net/nimble/host/services/gap
+ - net/nimble/host/services/gatt
- net/nimble/host/store/ram
+ - net/nimble/transport/ram
- libs/console/full
- libs/baselibc
- libs/newtmgr
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bleprph/src/main.c
----------------------------------------------------------------------
diff --cc apps/bleprph/src/main.c
index 961ed4b,6a9ae84..b08b077
--- a/apps/bleprph/src/main.c
+++ b/apps/bleprph/src/main.c
@@@ -48,13 -49,9 +48,13 @@@
#include "store/ram/ble_store_ram.h"
/* Mandatory services. */
- #include "services/mandatory/ble_svc_gap.h"
- #include "services/mandatory/ble_svc_gatt.h"
+ #include "services/gap/ble_svc_gap.h"
+ #include "services/gatt/ble_svc_gatt.h"
+/* Newtmgr include */
+#include "newtmgr/newtmgr.h"
+#include "nmgrble/newtmgr_ble.h"
+
/* Application-specified header. */
#include "bleprph.h"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bletiny/pkg.yml
----------------------------------------------------------------------
diff --cc apps/bletiny/pkg.yml
index 625adc6,49eba38..9a8b08f
--- a/apps/bletiny/pkg.yml
+++ b/apps/bletiny/pkg.yml
@@@ -27,9 -27,9 +27,10 @@@ pkg.deps
- sys/log
- net/nimble/controller
- net/nimble/host
- - net/nimble/host/services/mandatory
+ - net/nimble/host/services/gap
+ - net/nimble/host/services/gatt
- net/nimble/host/store/ram
+ - net/nimble/transport/ram
- libs/console/full
- libs/shell
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bletiny/src/main.c
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bleuart/pkg.yml
----------------------------------------------------------------------
diff --cc apps/bleuart/pkg.yml
index c93011b,dbe08cc..7a7d20e
--- a/apps/bleuart/pkg.yml
+++ b/apps/bleuart/pkg.yml
@@@ -27,9 -27,9 +27,10 @@@ pkg.deps
- sys/log
- net/nimble/controller
- net/nimble/host
- - net/nimble/host/services/mandatory
+ - net/nimble/host/services/gap
+ - net/nimble/host/services/gatt
- net/nimble/host/store/ram
+ - net/nimble/transport/ram
- libs/console/full
- libs/baselibc
- libs/newtmgr
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e291e12d/apps/bleuart/src/main.c
----------------------------------------------------------------------
diff --cc apps/bleuart/src/main.c
index 061ab3b,1da0ae8..264be92
--- a/apps/bleuart/src/main.c
+++ b/apps/bleuart/src/main.c
@@@ -47,14 -49,9 +47,14 @@@
#include "store/ram/ble_store_ram.h"
/* Mandatory services. */
- #include "services/mandatory/ble_svc_gap.h"
- #include "services/mandatory/ble_svc_gatt.h"
+ #include "services/gap/ble_svc_gap.h"
+ #include "services/gatt/ble_svc_gatt.h"
+/* Newtmgr include */
+#include "newtmgr/newtmgr.h"
+#include "nmgrble/newtmgr_ble.h"
+#include "bleuart/bleuart.h"
+
/** Mbuf settings. */
#define MBUF_NUM_MBUFS (12)
#define MBUF_BUF_SIZE OS_ALIGN(BLE_MBUF_PAYLOAD_SIZE, 4)