You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2022/03/17 10:50:22 UTC
[mynewt-nimble] 12/22: nimble/transport: Remove RAM transport
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 4ba36ff76fa5e448bcc72c927e94a1340707f40b
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Thu Mar 3 18:06:48 2022 +0100
nimble/transport: Remove RAM transport
Not needed anymore, "native" transport does not need any extra code.
---
.../ram/include/transport/ram/ble_hci_ram.h | 35 ---
nimble/transport/ram/pkg.yml | 36 ----
nimble/transport/ram/src/ble_hci_ram.c | 238 ---------------------
nimble/transport/ram/syscfg.yml | 33 ---
4 files changed, 342 deletions(-)
diff --git a/nimble/transport/ram/include/transport/ram/ble_hci_ram.h b/nimble/transport/ram/include/transport/ram/ble_hci_ram.h
deleted file mode 100644
index 3c37e32..0000000
--- a/nimble/transport/ram/include/transport/ram/ble_hci_ram.h
+++ /dev/null
@@ -1,35 +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_HCI_RAM_
-#define H_BLE_HCI_RAM_
-
-#include "nimble/ble_hci_trans.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void ble_hci_ram_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nimble/transport/ram/pkg.yml b/nimble/transport/ram/pkg.yml
deleted file mode 100644
index bb8397b..0000000
--- a/nimble/transport/ram/pkg.yml
+++ /dev/null
@@ -1,36 +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: nimble/transport/ram
-pkg.description: XXX
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
- - ble
- - bluetooth
-
-pkg.deps:
- - "@apache-mynewt-core/kernel/os"
- - nimble
-
-pkg.apis:
- - ble_transport
-
-pkg.init:
- ble_hci_ram_init: 'MYNEWT_VAL(BLE_TRANS_RAM_SYSINIT_STAGE)'
diff --git a/nimble/transport/ram/src/ble_hci_ram.c b/nimble/transport/ram/src/ble_hci_ram.c
deleted file mode 100644
index 3f10e9d..0000000
--- a/nimble/transport/ram/src/ble_hci_ram.c
+++ /dev/null
@@ -1,238 +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 <errno.h>
-#include <stddef.h>
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
-#include "os/os.h"
-#include "mem/mem.h"
-#include "nimble/ble.h"
-#include "nimble/ble_hci_trans.h"
-#include "transport/ram/ble_hci_ram.h"
-
-static ble_hci_trans_rx_cmd_fn *ble_hci_ram_rx_cmd_hs_cb;
-static void *ble_hci_ram_rx_cmd_hs_arg;
-
-static ble_hci_trans_rx_cmd_fn *ble_hci_ram_rx_cmd_ll_cb;
-static void *ble_hci_ram_rx_cmd_ll_arg;
-
-static ble_hci_trans_rx_acl_fn *ble_hci_ram_rx_acl_hs_cb;
-static void *ble_hci_ram_rx_acl_hs_arg;
-
-static ble_hci_trans_rx_acl_fn *ble_hci_ram_rx_acl_ll_cb;
-static void *ble_hci_ram_rx_acl_ll_arg;
-
-static struct os_mempool ble_hci_ram_cmd_pool;
-static os_membuf_t ble_hci_ram_cmd_buf[
- OS_MEMPOOL_SIZE(1, BLE_HCI_TRANS_CMD_SZ)
-];
-
-static struct os_mempool ble_hci_ram_evt_hi_pool;
-static os_membuf_t ble_hci_ram_evt_hi_buf[
- OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT),
- MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE))
-];
-
-static struct os_mempool ble_hci_ram_evt_lo_pool;
-static os_membuf_t ble_hci_ram_evt_lo_buf[
- OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT),
- MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE))
-];
-
-void
-ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *cmd_cb,
- void *cmd_arg,
- ble_hci_trans_rx_acl_fn *acl_cb,
- void *acl_arg)
-{
- ble_hci_ram_rx_cmd_hs_cb = cmd_cb;
- ble_hci_ram_rx_cmd_hs_arg = cmd_arg;
- ble_hci_ram_rx_acl_hs_cb = acl_cb;
- ble_hci_ram_rx_acl_hs_arg = acl_arg;
-}
-
-void
-ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb,
- void *cmd_arg,
- ble_hci_trans_rx_acl_fn *acl_cb,
- void *acl_arg)
-{
- ble_hci_ram_rx_cmd_ll_cb = cmd_cb;
- ble_hci_ram_rx_cmd_ll_arg = cmd_arg;
- ble_hci_ram_rx_acl_ll_cb = acl_cb;
- ble_hci_ram_rx_acl_ll_arg = acl_arg;
-}
-
-int
-ble_hci_trans_hs_cmd_tx(uint8_t *cmd)
-{
- int rc;
-
- assert(ble_hci_ram_rx_cmd_ll_cb != NULL);
-
- rc = ble_hci_ram_rx_cmd_ll_cb(cmd, ble_hci_ram_rx_cmd_ll_arg);
- return rc;
-}
-
-int
-ble_hci_trans_ll_evt_tx(uint8_t *hci_ev)
-{
- int rc;
-
- assert(ble_hci_ram_rx_cmd_hs_cb != NULL);
-
- rc = ble_hci_ram_rx_cmd_hs_cb(hci_ev, ble_hci_ram_rx_cmd_hs_arg);
- return rc;
-}
-
-int
-ble_hci_trans_hs_acl_tx(struct os_mbuf *om)
-{
- int rc;
-
- assert(ble_hci_ram_rx_acl_ll_cb != NULL);
-
- rc = ble_hci_ram_rx_acl_ll_cb(om, ble_hci_ram_rx_acl_ll_arg);
- return rc;
-}
-
-int
-ble_hci_trans_ll_acl_tx(struct os_mbuf *om)
-{
- int rc;
-
- assert(ble_hci_ram_rx_acl_hs_cb != NULL);
-
- rc = ble_hci_ram_rx_acl_hs_cb(om, ble_hci_ram_rx_acl_hs_arg);
- return rc;
-}
-
-uint8_t *
-ble_hci_trans_buf_alloc(int type)
-{
- uint8_t *buf;
-
- switch (type) {
- case BLE_HCI_TRANS_BUF_CMD:
- buf = os_memblock_get(&ble_hci_ram_cmd_pool);
- break;
-
- case BLE_HCI_TRANS_BUF_EVT_HI:
- buf = os_memblock_get(&ble_hci_ram_evt_hi_pool);
- if (buf == NULL) {
- /* If no high-priority event buffers remain, try to grab a
- * low-priority one.
- */
- buf = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
- }
- break;
-
- case BLE_HCI_TRANS_BUF_EVT_LO:
- buf = os_memblock_get(&ble_hci_ram_evt_lo_pool);
- break;
-
- default:
- assert(0);
- buf = NULL;
- }
-
- return buf;
-}
-
-void
-ble_hci_trans_buf_free(uint8_t *buf)
-{
- int rc;
-
- /* XXX: this may look a bit odd, but the controller uses the command
- * buffer to send back the command complete/status as an immediate
- * response to the command. This was done to insure that the controller
- * could always send back one of these events when a command was received.
- * Thus, we check to see which pool the buffer came from so we can free
- * it to the appropriate pool
- */
- if (os_memblock_from(&ble_hci_ram_evt_hi_pool, buf)) {
- rc = os_memblock_put(&ble_hci_ram_evt_hi_pool, buf);
- assert(rc == 0);
- } else if (os_memblock_from(&ble_hci_ram_evt_lo_pool, buf)) {
- rc = os_memblock_put(&ble_hci_ram_evt_lo_pool, buf);
- assert(rc == 0);
- } else {
- assert(os_memblock_from(&ble_hci_ram_cmd_pool, buf));
- rc = os_memblock_put(&ble_hci_ram_cmd_pool, buf);
- assert(rc == 0);
- }
-}
-
-/**
- * Unsupported; the RAM transport does not have a dedicated ACL data packet
- * pool.
- */
-int
-ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg)
-{
- return BLE_ERR_UNSUPPORTED;
-}
-
-int
-ble_hci_trans_reset(void)
-{
- /* No work to do. All allocated buffers are owned by the host or
- * controller, and they will get freed by their owners.
- */
- return 0;
-}
-
-void
-ble_hci_ram_init(void)
-{
- int rc;
-
- /* Ensure this function only gets called by sysinit. */
- SYSINIT_ASSERT_ACTIVE();
-
- /*
- * Create memory pool of HCI command buffers. NOTE: we currently dont
- * allow this to be configured. The controller will only allow one
- * outstanding command. We decided to keep this a pool in case we allow
- * allow the controller to handle more than one outstanding command.
- */
- rc = os_mempool_init(&ble_hci_ram_cmd_pool,
- 1,
- BLE_HCI_TRANS_CMD_SZ,
- ble_hci_ram_cmd_buf,
- "ble_hci_ram_cmd_pool");
- SYSINIT_PANIC_ASSERT(rc == 0);
-
- rc = os_mempool_init(&ble_hci_ram_evt_hi_pool,
- MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT),
- MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE),
- ble_hci_ram_evt_hi_buf,
- "ble_hci_ram_evt_hi_pool");
- SYSINIT_PANIC_ASSERT(rc == 0);
-
- rc = os_mempool_init(&ble_hci_ram_evt_lo_pool,
- MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT),
- MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE),
- ble_hci_ram_evt_lo_buf,
- "ble_hci_ram_evt_lo_pool");
- SYSINIT_PANIC_ASSERT(rc == 0);
-}
diff --git a/nimble/transport/ram/syscfg.yml b/nimble/transport/ram/syscfg.yml
deleted file mode 100644
index 6286dfe..0000000
--- a/nimble/transport/ram/syscfg.yml
+++ /dev/null
@@ -1,33 +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.
-#
-
-syscfg.defs:
- BLE_TRANS_RAM_SYSINIT_STAGE:
- description: >
- Sysinit stage for the RAM BLE transport.
- value: 100
-
-syscfg.vals:
- BLE_HCI_EVT_HI_BUF_COUNT: 2
- BLE_HCI_EVT_LO_BUF_COUNT: 8
- BLE_HCI_EVT_BUF_SIZE: 70
- BLE_ACL_BUF_COUNT: 4
- BLE_ACL_BUF_SIZE: 65535
-
-syscfg.vals.BLE_EXT_ADV:
- BLE_HCI_EVT_BUF_SIZE: 257