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/01/23 04:20:02 UTC
[5/8] incubator-mynewt-larva git commit: Move some global data into
bss.nz.
Move some global data into bss.nz.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/0e04c2a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/0e04c2a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/0e04c2a5
Branch: refs/heads/master
Commit: 0e04c2a5cc7c73b38ccaebd0ef2fbfec030604b6
Parents: eafbdeb
Author: Christopher Collins <cc...@gmail.com>
Authored: Fri Jan 22 17:14:46 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Fri Jan 22 19:19:44 2016 -0800
----------------------------------------------------------------------
net/nimble/host/src/ble_att_svr.c | 3 ++-
net/nimble/host/src/ble_hs.c | 10 ++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/0e04c2a5/net/nimble/host/src/ble_att_svr.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_svr.c b/net/nimble/host/src/ble_att_svr.c
index e92f4b9..e9ffb97 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -17,6 +17,7 @@
#include <string.h>
#include <errno.h>
#include <assert.h>
+#include "bsp/bsp.h"
#include "os/os.h"
#include "nimble/ble.h"
#include "host/ble_uuid.h"
@@ -49,7 +50,7 @@ static void *ble_att_svr_prep_mbuf_mem;
static struct os_mempool ble_att_svr_prep_mbuf_mempool;
static struct os_mbuf_pool ble_att_svr_prep_mbuf_pool;
-static uint8_t ble_att_svr_flat_buf[BLE_ATT_ATTR_MAX_LEN];
+static bssnz_t uint8_t ble_att_svr_flat_buf[BLE_ATT_ATTR_MAX_LEN];
ble_att_svr_notify_fn *ble_att_svr_notify_cb;
void *ble_att_svr_notify_cb_arg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/0e04c2a5/net/nimble/host/src/ble_hs.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs.c b/net/nimble/host/src/ble_hs.c
index 72d390a..e40ea82 100644
--- a/net/nimble/host/src/ble_hs.c
+++ b/net/nimble/host/src/ble_hs.c
@@ -16,6 +16,7 @@
#include <assert.h>
#include <errno.h>
+#include "bsp/bsp.h"
#include "util/tpq.h"
#include "os/os.h"
#include "nimble/hci_transport.h"
@@ -39,13 +40,13 @@
#endif
static struct os_task ble_hs_task;
-static os_stack_t ble_hs_stack[BLE_HS_STACK_SIZE];
+static os_stack_t ble_hs_stack[BLE_HS_STACK_SIZE] bssnz_t;
#define HCI_CMD_BUFS (8)
#define HCI_CMD_BUF_SIZE (260) /* XXX: temporary, Fix later */
struct os_mempool g_hci_cmd_pool;
static os_membuf_t g_hci_cmd_buf[OS_MEMPOOL_SIZE(HCI_CMD_BUFS,
- HCI_CMD_BUF_SIZE)];
+ HCI_CMD_BUF_SIZE)] bssnz_t;
/* XXX: this might be transport layer*/
#define HCI_NUM_OS_EVENTS (32)
@@ -61,8 +62,9 @@ static os_membuf_t g_hci_cmd_buf[OS_MEMPOOL_SIZE(HCI_CMD_BUFS,
OS_MEMPOOL_SIZE(BLE_HS_NUM_MBUFS, BLE_HS_MBUF_MEMBLOCK_SIZE)
struct os_mempool g_hci_os_event_pool;
-static os_membuf_t g_hci_os_event_buf[OS_MEMPOOL_SIZE(HCI_NUM_OS_EVENTS,
- HCI_OS_EVENT_BUF_SIZE)];
+static os_membuf_t
+ g_hci_os_event_buf[OS_MEMPOOL_SIZE(HCI_NUM_OS_EVENTS,
+ HCI_OS_EVENT_BUF_SIZE)] bssnz_t;
static os_membuf_t ble_hs_mbuf_mem[BLE_HS_MBUF_MEMPOOL_SIZE];
static struct os_mempool ble_hs_mbuf_mempool;