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/11/08 22:55:04 UTC
[14/22] incubator-mynewt-core git commit: moved tps to services dir.
moved tps to services dir.
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/df94f010
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/df94f010
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/df94f010
Branch: refs/heads/develop
Commit: df94f0101803639aa412193a8eb6f0677ac94c27
Parents: ef3024f
Author: Brian Giori <br...@gmail.com>
Authored: Mon Aug 1 17:20:30 2016 -0700
Committer: Brian Giori <br...@gmail.com>
Committed: Mon Aug 1 17:20:30 2016 -0700
----------------------------------------------------------------------
.../tps/include/profiles/tps/ble_svc_tps.h | 31 -------
net/nimble/host/profiles/tps/pkg.yml | 32 -------
net/nimble/host/profiles/tps/src/ble_svc_tps.c | 98 --------------------
.../tps/include/services/tps/ble_svc_tps.h | 31 +++++++
net/nimble/host/services/tps/pkg.yml | 32 +++++++
net/nimble/host/services/tps/src/ble_svc_tps.c | 98 ++++++++++++++++++++
6 files changed, 161 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/profiles/tps/include/profiles/tps/ble_svc_tps.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/profiles/tps/include/profiles/tps/ble_svc_tps.h b/net/nimble/host/profiles/tps/include/profiles/tps/ble_svc_tps.h
deleted file mode 100644
index c1797ae..0000000
--- a/net/nimble/host/profiles/tps/include/profiles/tps/ble_svc_tps.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_SVC_TPS_
-#define H_BLE_SVC_TPS_
-
-struct ble_hs_cfg;
-
-#define BLE_SVC_TPS_UUID16 0x1804
-#define BLE_SVC_TPS_CHR_UUID16_TX_POWER_LEVEL 0x2a07
-
-int ble_svc_tps_init(struct ble_hs_cfg *cfg);
-
-#endif
-
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/profiles/tps/pkg.yml
----------------------------------------------------------------------
diff --git a/net/nimble/host/profiles/tps/pkg.yml b/net/nimble/host/profiles/tps/pkg.yml
deleted file mode 100644
index 92f43bb..0000000
--- a/net/nimble/host/profiles/tps/pkg.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-pkg.name: net/nimble/host/profiles/tps
-pkg.description: Tx Power Service adopted specification.
-pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
- - ble
- - bluetooth
- - tps
- - nimble
-
-pkg.deps:
- - net/nimble/host
-
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/profiles/tps/src/ble_svc_tps.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/profiles/tps/src/ble_svc_tps.c b/net/nimble/host/profiles/tps/src/ble_svc_tps.c
deleted file mode 100644
index fbbd0b5..0000000
--- a/net/nimble/host/profiles/tps/src/ble_svc_tps.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <string.h>
-#include "host/ble_hs.h"
-#include "profiles/tps/ble_svc_tps.h"
-#include "../../../src/ble_hci_priv.h"
-
-int8_t ble_svc_tps_tx_power_level;
-
-/* Access function */
-static int
-ble_svc_tps_access(uint16_t conn_handle, uint16_t attr_handle,
- struct ble_gatt_access_ctxt *ctxt, void *arg);
-
-static const struct ble_gatt_svc_def ble_svc_tps_defs[] = {
- {
- /*** Service: Tx Power Service. */
- .type = BLE_GATT_SVC_TYPE_PRIMARY,
- .uuid128 = BLE_UUID16(BLE_SVC_TPS_UUID16),
- .characteristics = (struct ble_gatt_chr_def[]) { {
- /*** Characteristic: Tx Power Level. */
- .uuid128 = BLE_UUID16(BLE_SVC_TPS_CHR_UUID16_TX_POWER_LEVEL),
- .access_cb = ble_svc_tps_access,
- .flags = BLE_GATT_CHR_F_READ,
- }, {
- 0, /* No more characteristics in this service. */
- } },
- },
-
- {
- 0, /* No more services. */
- },
-};
-
-/**
- * Simple read access callback for the tx power level
- * characteristic.
- */
-static int
-ble_svc_tps_access(uint16_t conn_handle, uint16_t attr_handle,
- struct ble_gatt_access_ctxt *ctxt, void *arg)
-{
- int rc;
-
- assert(ctxt->chr == &ble_svc_tps_defs[0].characteristics[0]);
-
- switch (ctxt->op) {
- case BLE_GATT_ACCESS_OP_READ_CHR:
- ble_hci_util_read_adv_tx_pwr(&ble_svc_tps_tx_power_level);
- rc = os_mbuf_append(ctxt->om, &ble_svc_tps_tx_power_level,
- sizeof ble_svc_tps_tx_power_level);
- return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
-
- default:
- assert(0);
- return BLE_ATT_ERR_UNLIKELY;
- }
-
- return 0;
-}
-
-/**
- * Initialize the TPS
- */
-int
-ble_svc_tps_init(struct ble_hs_cfg *cfg)
-{
- int rc;
- rc = ble_gatts_count_cfg(ble_svc_tps_defs, cfg);
- if (rc != 0) {
- return rc;
- }
-
- rc = ble_gatts_add_svcs(ble_svc_tps_defs);
- if (rc != 0) {
- return rc;
- }
-
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/services/tps/include/services/tps/ble_svc_tps.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/services/tps/include/services/tps/ble_svc_tps.h b/net/nimble/host/services/tps/include/services/tps/ble_svc_tps.h
new file mode 100644
index 0000000..c1797ae
--- /dev/null
+++ b/net/nimble/host/services/tps/include/services/tps/ble_svc_tps.h
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_SVC_TPS_
+#define H_BLE_SVC_TPS_
+
+struct ble_hs_cfg;
+
+#define BLE_SVC_TPS_UUID16 0x1804
+#define BLE_SVC_TPS_CHR_UUID16_TX_POWER_LEVEL 0x2a07
+
+int ble_svc_tps_init(struct ble_hs_cfg *cfg);
+
+#endif
+
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/services/tps/pkg.yml
----------------------------------------------------------------------
diff --git a/net/nimble/host/services/tps/pkg.yml b/net/nimble/host/services/tps/pkg.yml
new file mode 100644
index 0000000..45d85b6
--- /dev/null
+++ b/net/nimble/host/services/tps/pkg.yml
@@ -0,0 +1,32 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: net/nimble/host/services/tps
+pkg.description: Tx Power Service adopted specification.
+pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+ - ble
+ - bluetooth
+ - tps
+ - nimble
+
+pkg.deps:
+ - net/nimble/host
+
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/df94f010/net/nimble/host/services/tps/src/ble_svc_tps.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/services/tps/src/ble_svc_tps.c b/net/nimble/host/services/tps/src/ble_svc_tps.c
new file mode 100644
index 0000000..3f241b0
--- /dev/null
+++ b/net/nimble/host/services/tps/src/ble_svc_tps.c
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <assert.h>
+#include <string.h>
+#include "host/ble_hs.h"
+#include "services/tps/ble_svc_tps.h"
+#include "../../../src/ble_hci_priv.h"
+
+int8_t ble_svc_tps_tx_power_level;
+
+/* Access function */
+static int
+ble_svc_tps_access(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt, void *arg);
+
+static const struct ble_gatt_svc_def ble_svc_tps_defs[] = {
+ {
+ /*** Service: Tx Power Service. */
+ .type = BLE_GATT_SVC_TYPE_PRIMARY,
+ .uuid128 = BLE_UUID16(BLE_SVC_TPS_UUID16),
+ .characteristics = (struct ble_gatt_chr_def[]) { {
+ /*** Characteristic: Tx Power Level. */
+ .uuid128 = BLE_UUID16(BLE_SVC_TPS_CHR_UUID16_TX_POWER_LEVEL),
+ .access_cb = ble_svc_tps_access,
+ .flags = BLE_GATT_CHR_F_READ,
+ }, {
+ 0, /* No more characteristics in this service. */
+ } },
+ },
+
+ {
+ 0, /* No more services. */
+ },
+};
+
+/**
+ * Simple read access callback for the tx power level
+ * characteristic.
+ */
+static int
+ble_svc_tps_access(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt, void *arg)
+{
+ int rc;
+
+ assert(ctxt->chr == &ble_svc_tps_defs[0].characteristics[0]);
+
+ switch (ctxt->op) {
+ case BLE_GATT_ACCESS_OP_READ_CHR:
+ ble_hci_util_read_adv_tx_pwr(&ble_svc_tps_tx_power_level);
+ rc = os_mbuf_append(ctxt->om, &ble_svc_tps_tx_power_level,
+ sizeof ble_svc_tps_tx_power_level);
+ return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+
+ default:
+ assert(0);
+ return BLE_ATT_ERR_UNLIKELY;
+ }
+
+ return 0;
+}
+
+/**
+ * Initialize the TPS
+ */
+int
+ble_svc_tps_init(struct ble_hs_cfg *cfg)
+{
+ int rc;
+ rc = ble_gatts_count_cfg(ble_svc_tps_defs, cfg);
+ if (rc != 0) {
+ return rc;
+ }
+
+ rc = ble_gatts_add_svcs(ble_svc_tps_defs);
+ if (rc != 0) {
+ return rc;
+ }
+
+ return 0;
+}