docker/deploy-env/Dockerfile

-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 RUN set -e -x ;\
     export DEBIAN_FRONTEND=noninteractive ;\
@@ -10,7 +10,7 @@ RUN set -e -x ;\
         llvm \
         python3-pip ;\
     pip3 install \
-        clang \
+        clang==10.0.1 \
         sphinx \
         sphinx_rtd_theme ;\
     rm -rf /var/lib/apt/lists

epicardium/FreeRTOSConfig.h

 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
-#define  MXC_ASSERT_ENABLE
-#include "mxc_assert.h"
-
 #include "max32665.h"
 
+#include <assert.h>
+
 /* CMSIS keeps a global updated with current system clock in Hz */
 #define configCPU_CLOCK_HZ          ((unsigned long)96000000)
 
@@ -51,7 +50,10 @@
 
 #define INCLUDE_vTaskSuspend        1
 #define INCLUDE_vTaskDelay          1
+#define INCLUDE_vTaskDelete         1
 #define INCLUDE_uxTaskGetStackHighWaterMark 1
+#define INCLUDE_xTimerPendFunctionCall 1
+#define INCLUDE_xSemaphoreGetMutexHolder 1
 
 /* Allow static allocation of data structures */
 #define configSUPPORT_STATIC_ALLOCATION 1
@@ -69,7 +71,7 @@
 #define xPortSysTickHandler   SysTick_Handler
 
 /* Assert */
-#define configASSERT(x)       MXC_ASSERT(x)
+#define configASSERT(x)       assert(x)
 
 /* Tickless idle hooks */
 typedef uint32_t TickType_t;

epicardium/api/caller.c

@@ -5,8 +5,17 @@
 #define MXC_ASSERT_ENABLE
 #include "mxc_assert.h"
 
+static uint32_t irq_save = 0;
+
 void *_api_call_start(api_id_t id, uintptr_t size)
 {
+	/*
+	 * Disable all maskable interrupts here, to be turned on again at the
+	 * end of _api_call_transact().
+	 */
+	irq_save = __get_PRIMASK();
+	__set_PRIMASK(1);
+
 	while (SEMA_GetSema(_API_SEMAPHORE) == E_BUSY) {
 	}
 
@@ -51,6 +60,12 @@ void *_api_call_transact(void *buffer)
 	API_CALL_MEM->call_flag = _API_FLAG_IDLE;
 	SEMA_FreeSema(_API_SEMAPHORE);
 
+	/*
+	 * Re-enable interrupts (if previously enabled) after completing the API
+	 * call.
+	 */
+	__set_PRIMASK(irq_save);
+
 	return API_CALL_MEM->buffer;
 }
 
@@ -109,7 +124,7 @@ int api_fetch_args(char *buf, size_t cnt)
 		return 0;
 	}
 
-	int i;
+	size_t i;
 	for (i = 0; i < cnt && API_CALL_MEM->buffer[i + 0x20] != '\0'; i++) {
 		buf[i] = API_CALL_MEM->buffer[i + 0x20];
 	}

epicardium/api/common.h

@@ -38,7 +38,7 @@ struct api_call_mem {
 	api_id_t id;
 
 	/* ID of the current interrupt */
-	api_int_id_t int_id;
+	volatile api_int_id_t int_id;
 
 	/*
 	 * Buffer for arguments/return value.  This buffer will be

epicardium/api/control.c

 #include "epicardium.h"
 #include "api/dispatcher.h"
-#include "api/interrupt-sender.h"
-#include "modules/log.h"
 
 #include "card10.h"
 
@@ -10,6 +8,7 @@
 #include "tmr.h"
 
 static void __core1_init(void);
+extern void interrupt_trigger_sync(api_int_id_t id);
 
 struct core1_info {
 	/* Location of core1's interrupt vector table */
@@ -76,6 +75,11 @@ void __core1_init(void)
 	 */
 	TMR_IntClear(MXC_TMR5);
 
+	/*
+	 * Disable the SysTick
+	 */
+	SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk;
+
 	/*
 	 * Reset Interrupts
 	 *
@@ -201,14 +205,19 @@ void core1_boot(void)
 
 void core1_trigger_reset(void)
 {
-	/* Signal core 1 that we intend to load a new payload. */
-	api_interrupt_trigger(EPIC_INT_RESET);
+	/*
+	 * Signal core 1 that we intend to load a new payload.
+	 *
+	 * This needs to be synchroneous because otherwise we will deadlock
+	 * (Lifecycle task busy-spins and interrupt can never get dispatched).
+	 */
+	interrupt_trigger_sync(EPIC_INT_RESET);
 }
 
-void core1_wait_ready(void)
+bool core1_is_ready(void)
 {
-	/* Wait for the core to accept */
-	while (1) {
+	bool ready;
+
 	while (SEMA_GetSema(_CONTROL_SEMAPHORE) == E_BUSY) {
 	}
 
@@ -216,12 +225,21 @@ void core1_wait_ready(void)
 	 * core 1 will set the ready flag once it is spinning in the
 	 * above loop, waiting for a new IVT.
 	 */
-		if (core1_info.ready) {
-			break;
-		}
+	ready = core1_info.ready;
 
 	SEMA_FreeSema(_CONTROL_SEMAPHORE);
 
+	return ready;
+}
+
+void core1_wait_ready(void)
+{
+	/* Wait for the core to accept */
+	while (1) {
+		if (core1_is_ready()) {
+			break;
+		}
+
 		for (int i = 0; i < 10000; i++) {
 		}
 	}
@@ -235,6 +253,9 @@ void core1_wait_ready(void)
 
 void core1_load(void *ivt, char *args)
 {
+	while (SEMA_GetSema(_CONTROL_SEMAPHORE) == E_BUSY) {
+	}
+
 	/* If the core is currently in an API call, reset it. */
 	API_CALL_MEM->call_flag = _API_FLAG_IDLE;
 	API_CALL_MEM->id        = 0;

epicardium/api/dispatcher.c

@@ -9,7 +9,7 @@
 /* This function is defined by the generated dispatcher code */
 void __api_dispatch_call(api_id_t id, void *buffer);
 
-static volatile bool event_ready = false;
+static volatile bool call_pending = false;
 
 int api_dispatcher_init()
 {
@@ -34,7 +34,7 @@ int api_dispatcher_init()
 
 bool api_dispatcher_poll_once()
 {
-	if (event_ready) {
+	if (call_pending) {
 		return false;
 	}
 
@@ -46,22 +46,27 @@ bool api_dispatcher_poll_once()
 		return false;
 	}
 
-	event_ready = true;
+	call_pending = true;
 	return true;
 }
 
 bool api_dispatcher_poll()
 {
-	if (event_ready) {
+	if (call_pending) {
 		return true;
 	}
 
 	return api_dispatcher_poll_once();
 }
 
+bool api_dispatcher_call_pending()
+{
+	return call_pending;
+}
+
 api_id_t api_dispatcher_exec()
 {
-	if (!event_ready) {
+	if (!call_pending) {
 		return 0;
 	}
 
@@ -69,7 +74,7 @@ api_id_t api_dispatcher_exec()
 	__api_dispatch_call(id, API_CALL_MEM->buffer);
 	API_CALL_MEM->call_flag = _API_FLAG_RETURNED;
 
-	event_ready = false;
+	call_pending = false;
 	SEMA_FreeSema(_API_SEMAPHORE);
 
 	/* Notify the caller that we returned */
@@ -86,7 +91,7 @@ void api_prepare_args(char *args)
 	 * collide with any integer return value of API calls like epic_exec().
 	 */
 	API_CALL_MEM->id = 0;
-	for (int i = 0; i <= strlen(args); i++) {
+	for (size_t i = 0; i <= strlen(args); i++) {
 		API_CALL_MEM->buffer[i + 0x20] = args[i];
 	}
 }

epicardium/api/dispatcher.h

@@ -15,6 +15,12 @@ int api_dispatcher_init();
 bool api_dispatcher_poll_once();
 bool api_dispatcher_poll();
 
+/*
+ * Check if the other core requested a call or if we are already excuting it.
+ * Only returns a cached version, without acquiring any locks.
+ */
+bool api_dispatcher_call_pending();
+
 /*
  * Attempt to dispatch a call, if one had been polled using
  * api_dispatcher_poll().  Will return 0 if no call was dispatched or the ID of
@@ -39,6 +45,9 @@ void core1_boot(void);
 /* Reset core 1 into a state where it can accept a new payload */
 void core1_trigger_reset(void);
 
+/* Check if core 1 is ready for a new payload */
+bool core1_is_ready(void);
+
 /* Wait for core 1 to respond that it is ready for a new payload */
 void core1_wait_ready(void);
 

epicardium/api/genapi.py

@@ -246,7 +246,7 @@ void __dispatch_isr(api_int_id_t id)
     # Generate Dispatcher {{{
     with open(args.server, "w") as f_dispatcher:
         tmp = """\
-#include "modules/log.h"
+#include "os/core.h"
 #include "{header}"
 
 void __api_dispatch_call(uint32_t id, void*epc__apistub_buffer)

epicardium/api/interrupt-sender.c

 #include "api/interrupt-sender.h"
 #include "api/common.h"
 #include "tmr_utils.h"
-
-static bool int_enabled[EPIC_INT_NUM];
-
-int api_interrupt_trigger(api_int_id_t id)
-{
-	if (id >= EPIC_INT_NUM) {
-		return -EINVAL;
-	}
-
-	if (int_enabled[id]) {
-		while (API_CALL_MEM->int_id != (-1))
-			;
-
-		API_CALL_MEM->int_id = id;
-		TMR_TO_Start(MXC_TMR5, 1, 0);
-	}
-	return 0;
-}
+#include <assert.h>
 
 void api_interrupt_init(void)
 {
 	API_CALL_MEM->int_id = (-1);
-
-	for (int i = 0; i < EPIC_INT_NUM; i++) {
-		int_enabled[i] = false;
 }
 
-	/* Reset interrupt is always enabled */
-	int_enabled[EPIC_INT_RESET] = true;
-}
-
-int epic_interrupt_enable(api_int_id_t int_id)
+bool api_interrupt_is_ready(void)
 {
-	if (int_id >= EPIC_INT_NUM) {
-		return -EINVAL;
+	return API_CALL_MEM->int_id == (api_int_id_t)(-1);
 }
 
-	int_enabled[int_id] = true;
-	return 0;
-}
-
-int epic_interrupt_disable(api_int_id_t int_id)
+void api_interrupt_trigger(api_int_id_t id)
 {
-	if (int_id >= EPIC_INT_NUM || int_id == EPIC_INT_RESET) {
-		return -EINVAL;
-	}
+	assert(API_CALL_MEM->int_id == (api_int_id_t)(-1));
 
-	int_enabled[int_id] = false;
-	return 0;
+	API_CALL_MEM->int_id = id;
+	TMR_TO_Start(MXC_TMR5, 1, 0);
 }

epicardium/api/interrupt-sender.h

@@ -2,4 +2,5 @@
 #include "api/common.h"
 
 void api_interrupt_init(void);
-int api_interrupt_trigger(api_int_id_t id);
+bool api_interrupt_is_ready(void);
+void api_interrupt_trigger(api_int_id_t id);

epicardium/ble/app/app_main.c

-/*************************************************************************************************/
-/*!
- *  \file
- *
- *  \brief  Application framework main module.
- *
- *  Copyright (c) 2011-2018 Arm Ltd. All Rights Reserved.
- *  ARM Ltd. confidential and proprietary.
- *
- *  IMPORTANT.  Your use of this file is governed by a Software License Agreement
- *  ("Agreement") that must be accepted in order to download or otherwise receive a
- *  copy of this file.  You may not use or copy this file for any purpose other than
- *  as described in the Agreement.  If you do not agree to all of the terms of the
- *  Agreement do not use this file and delete all copies in your possession or control;
- *  if you do not have a copy of the Agreement, you must contact ARM Ltd. prior
- *  to any use, copying or further distribution of this software.
- */
-/*************************************************************************************************/
-
-/* card10:
- * copied from: lib/sdk/Libraries/BTLE/stack/ble-profiles/sources/apps/app/app_main.c
- *
- * Reason: we need to correctly implement AppHandleNumericComparison
- */
-/* clang-format off */
-/* clang-formet turned off for easier diffing against orginal file */
-#include <string.h>
-#include "wsf_types.h"
-#include "wsf_msg.h"
-#include "sec_api.h"
-#include "wsf_trace.h"
-#include "wsf_timer.h"
-#include "wsf_assert.h"
-#include "util/bstream.h"
-#include "dm_api.h"
-#include "app_api.h"
-#include "app_main.h"
-#include "app_ui.h"
-
-/**************************************************************************************************
-  Global Variables
-**************************************************************************************************/
-
-/*! Configuration pointer for advertising */
-appAdvCfg_t *pAppAdvCfg;
-
-/*! Configuration pointer for extended and periodic advertising */
-appExtAdvCfg_t *pAppExtAdvCfg;
-
-/*! Configuration pointer for slave */
-appSlaveCfg_t *pAppSlaveCfg;
-
-/*! Configuration pointer for master */
-appMasterCfg_t *pAppMasterCfg;
-
-/*! Configuration pointer for extended master */
-appExtMasterCfg_t *pAppExtMasterCfg;
-
-/*! Configuration pointer for security */
-appSecCfg_t *pAppSecCfg;
-
-/*! Configuration pointer for connection parameter update */
-appUpdateCfg_t *pAppUpdateCfg;
-
-/*! Configuration pointer for discovery */
-appDiscCfg_t *pAppDiscCfg;
-
-/*! Configuration pointer for application */
-appCfg_t *pAppCfg;
-
-/*! Connection control block array */
-appConnCb_t appConnCb[DM_CONN_MAX];
-
-/*! WSF handler ID */
-wsfHandlerId_t appHandlerId;
-
-/*! Main control block */
-appCb_t appCb;
-
-/*! Configuration structure for incoming request actions */
-const appReqActCfg_t appReqActCfg =
-{
-  APP_ACT_ACCEPT        /*! Action for the remote connection parameter request */
-};
-
-/*! Configuration pointer for incoming request actions on master */
-appReqActCfg_t *pAppMasterReqActCfg = (appReqActCfg_t *) &appReqActCfg;
-
-/*! Configurable pointer for incoming request actions on slave */
-appReqActCfg_t *pAppSlaveReqActCfg = (appReqActCfg_t *) &appReqActCfg;
-
-/*************************************************************************************************/
-/*!
- *  \brief  Process messages from the event handler.
- *
- *  \param  pMsg    Pointer to message.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-static void appProcMsg(wsfMsgHdr_t *pMsg)
-{
-  switch(pMsg->event)
-  {
-    case APP_BTN_POLL_IND:
-      appUiBtnPoll();
-      break;
-
-    case APP_UI_TIMER_IND:
-      appUiTimerExpired(pMsg);
-      break;
-
-    default:
-      break;
-  }
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Check the bonded state of a connection.
- *
- *  \param  connId      DM connection ID.
- *
- *  \return Bonded state.
- */
-/*************************************************************************************************/
-bool_t appCheckBonded(dmConnId_t connId)
-{
-  WSF_ASSERT((connId > 0) && (connId <= DM_CONN_MAX));
-
-  return appConnCb[connId - 1].bonded;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Check the bond-by-LTK state of a connection.
- *
- *  \param  connId      DM connection ID.
- *
- *  \return Bond-by-LTK state.
- */
-/*************************************************************************************************/
-bool_t appCheckBondByLtk(dmConnId_t connId)
-{
-  WSF_ASSERT((connId > 0) && (connId <= DM_CONN_MAX));
-
-  return appConnCb[connId - 1].bondByLtk;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Return the number of existing connections of the given role.
- *
- *  \param  role      Connection role
- *
- *  \return Number of connections.
- */
-/*************************************************************************************************/
-uint8_t appNumConns(uint8_t role)
-{
-  appConnCb_t   *pCcb = appConnCb;
-  uint8_t       i, j;
-
-  for (i = DM_CONN_MAX, j = 0; i > 0; i--, pCcb++)
-  {
-    if ((pCcb->connId != DM_CONN_ID_NONE) && (DmConnRole(pCcb->connId) == role))
-    {
-      j++;
-    }
-  }
-
-  return j;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  App framework handler init function called during system initialization.
- *
- *  \param  handlerID  WSF handler ID for App.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppInit(void)
-{
-  appHandlerId = WsfOsSetNextHandler(AppHandler);
-
-  AppDbInit();
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  WSF event handler for app framework.
- *
- *  \param  event   WSF event mask.
- *  \param  pMsg    WSF message.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppHandler(wsfEventMask_t event, wsfMsgHdr_t *pMsg)
-{
-  if (pMsg != NULL)
-  {
-    APP_TRACE_INFO1("App got evt %d", pMsg->event);
-
-    if (pMsg->event >= APP_MASTER_MSG_START)
-    {
-      /* pass event to master handler */
-      (*appCb.masterCback)(pMsg);
-    }
-    else if (pMsg->event >= APP_SLAVE_MSG_START)
-    {
-      /* pass event to slave handler */
-      (*appCb.slaveCback)(pMsg);
-    }
-    else
-    {
-      appProcMsg(pMsg);
-    }
-  }
-  else
-  {
-    if (event & APP_BTN_DOWN_EVT)
-    {
-      AppUiBtnPressed();
-    }
-  }
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Handle a passkey request during pairing.  If the passkey is to displayed, a
- *          random passkey is generated and displayed.  If the passkey is to be entered
- *          the user is prompted to enter the passkey.
- *
- *  \param  pAuthReq  DM authentication requested event structure.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppHandlePasskey(dmSecAuthReqIndEvt_t *pAuthReq)
-{
-  uint32_t passkey;
-  uint8_t  buf[SMP_PIN_LEN];
-
-  if (pAuthReq->display)
-  {
-    /* generate random passkey, limit to 6 digit max */
-    SecRand((uint8_t *) &passkey, sizeof(uint32_t));
-    passkey %= 1000000;
-
-    /* convert to byte buffer */
-    buf[0] = UINT32_TO_BYTE0(passkey);
-    buf[1] = UINT32_TO_BYTE1(passkey);
-    buf[2] = UINT32_TO_BYTE2(passkey);
-
-    /* send authentication response to DM */
-    DmSecAuthRsp((dmConnId_t) pAuthReq->hdr.param, SMP_PIN_LEN, buf);
-
-    /* display passkey */
-    AppUiDisplayPasskey(passkey);
-  }
-  else
-  {
-    /* prompt user to enter passkey */
-    AppUiAction(APP_UI_PASSKEY_PROMPT);
-  }
-}
-
-/*************************************************************************************************/
-/*!
-*  \brief  Handle a numeric comparison indication during pairing.  The confirmation value is
-*          displayed and the user is prompted to verify that the local and peer confirmation
-*          values match.
-*
-*  \param  pCnfInd  DM confirmation indication event structure.
-*
-*  \return None.
-*/
-/*************************************************************************************************/
-void AppHandleNumericComparison(dmSecCnfIndEvt_t *pCnfInd)
-{
-  uint32_t confirm = DmSecGetCompareValue(pCnfInd->confirm);
-
-  /* display confirmation value */
-  AppUiDisplayConfirmValue(confirm);
-
-  /* TODO: Verify that local and peer confirmation values match */
-  DmSecCompareRsp((dmConnId_t)pCnfInd->hdr.param, TRUE);
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Close the connection with the give connection identifier.
- *
- *  \param  connId    Connection identifier.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppConnClose(dmConnId_t connId)
-{
-  DmConnClose(DM_CLIENT_ID_APP, connId, HCI_ERR_REMOTE_TERMINATED);
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Get a list of connection identifiers of open connections.
- *
- *  \param  pConnIdList    Buffer to hold connection IDs (must be DM_CONN_MAX bytes).
- *
- *  \return Number of open connections.
- *
- */
-/*************************************************************************************************/
-uint8_t AppConnOpenList(dmConnId_t *pConnIdList)
-{
-  appConnCb_t   *pCcb = appConnCb;
-  uint8_t       i;
-  uint8_t       pos = 0;
-
-  memset(pConnIdList, DM_CONN_ID_NONE, DM_CONN_MAX);
-
-  for (i = DM_CONN_MAX; i > 0; i--, pCcb++)
-  {
-    if (pCcb->connId != DM_CONN_ID_NONE)
-    {
-      pConnIdList[pos++] = pCcb->connId;
-    }
-  }
-
-  return pos;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Check if a connection is open.
- *
- *  \return Connection ID of open connection or DM_CONN_ID_NONE if no open connections.
- */
-/*************************************************************************************************/
-dmConnId_t AppConnIsOpen(void)
-{
-  appConnCb_t   *pCcb = appConnCb;
-  uint8_t       i;
-
-  for (i = DM_CONN_MAX; i > 0; i--, pCcb++)
-  {
-    if (pCcb->connId != DM_CONN_ID_NONE)
-    {
-      return pCcb->connId;
-    }
-  }
-
-  return DM_CONN_ID_NONE;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Get the device database record handle associated with an open connection.
- *
- *  \param  connId    Connection identifier.
- *
- *  \return Database record handle or APP_DB_HDL_NONE.
- */
-/*************************************************************************************************/
-appDbHdl_t AppDbGetHdl(dmConnId_t connId)
-{
-  return appConnCb[connId-1].dbHdl;
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Add device to resolving list.
- *
- *  \param  pMsg    Pointer to DM callback event message.
- *  \param  connId  Connection identifier.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppAddDevToResList(dmEvt_t *pMsg, dmConnId_t connId)
-{
-  dmSecKey_t *pPeerKey;
-  appDbHdl_t hdl = appConnCb[connId - 1].dbHdl;
-
-  /* if LL Privacy is supported and the peer device has distributed its IRK */
-  if (HciLlPrivacySupported() && ((pPeerKey = AppDbGetKey(hdl, DM_KEY_IRK, NULL))!= NULL))
-  {
-    /* add peer device to resolving list. If all-zero local or peer IRK is used then
-       LL will only use or accept local or peer identity address respectively. */
-    DmPrivAddDevToResList(pPeerKey->irk.addrType, pPeerKey->irk.bdAddr, pPeerKey->irk.key,
-                          DmSecGetLocalIrk(), TRUE, pMsg->hdr.param);
-  }
-}
-
-/*************************************************************************************************/
-/*!
- *  \brief  Update privacy mode for a given peer device.
- *
- *  \param  hdl     Database record handle.
- *
- *  \return None.
- */
-/*************************************************************************************************/
-void AppUpdatePrivacyMode(appDbHdl_t hdl)
-{
-  /* if peer device's been added to resolving list but RPA Only attribute not found on peer device */
-  if ((hdl != APP_DB_HDL_NONE) && AppDbGetPeerAddedToRl(hdl) && !AppDbGetPeerRpao(hdl))
-  {
-    dmSecKey_t *pPeerKey = AppDbGetKey(hdl, DM_KEY_IRK, NULL);
-    if (pPeerKey != NULL)
-    {
-      /* set device privacy mode for this peer device */
-      DmPrivSetPrivacyMode(pPeerKey->irk.addrType, pPeerKey->irk.bdAddr, DM_PRIV_MODE_DEVICE);
-
-      /* make sure resolving list flag cleared */
-      AppDbSetPeerAddedToRl(hdl, FALSE);
-    }
-  }
-}
-/* clang-format on */

epicardium/ble/ble_adv.c

+#include "ble_api.h"
+#include "epicardium.h"
+#include "os/core.h"
+#include "os/config.h"
+
+#include "wsf_types.h"
+#include "util/bstream.h"
+#include "wsf_msg.h"
+#include "wsf_trace.h"
+#include "app_api.h"
+#include "app_db.h"
+#include "svc_ch.h"
+#include "profiles/gap_api.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define DEFAULT_ADV_INTERVAL_US 500000
+
+/*! configurable parameters for advertising */
+static appAdvCfg_t bleAdvCfg = {
+	{ 0, 0 }, /*! Advertising durations in ms */
+	{ DEFAULT_ADV_INTERVAL_US / 625,
+	  0 } /*! Advertising intervals in 0.625 ms units */
+};
+
+static bool tainted;
+
+/**************************************************************************************************
+  Advertising Data
+**************************************************************************************************/
+
+/* clang-format off */
+/*! advertising data, discoverable mode */
+static const uint8_t bleAdvDataDisc[] = {
+	/*! flags */
+	2,                        /*! length */
+	DM_ADV_TYPE_FLAGS,        /*! AD type */
+	DM_FLAG_LE_LIMITED_DISC | /*! flags */
+	DM_FLAG_LE_BREDR_NOT_SUP,
+
+	3,
+	DM_ADV_TYPE_APPEARANCE,
+	UINT16_TO_BYTES(CH_APPEAR_WATCH),
+
+	/*! service UUID list */
+	17,
+	DM_ADV_TYPE_128_UUID_PART,
+	CARD10_UUID_SUFFIX,
+	0x0,
+	CARD10_UUID_PREFIX,
+
+	2,                    /*! length */
+	DM_ADV_TYPE_TX_POWER, /*! AD type */
+	0,                    /*! tx power */
+};
+
+/*! advertising data, discoverable mode with HID service*/
+static const uint8_t bleAdvDataDiscHID[] = {
+	/*! flags */
+	2,                        /*! length */
+	DM_ADV_TYPE_FLAGS,        /*! AD type */
+	DM_FLAG_LE_LIMITED_DISC | /*! flags */
+	DM_FLAG_LE_BREDR_NOT_SUP,
+
+	3,
+	DM_ADV_TYPE_APPEARANCE,
+	UINT16_TO_BYTES(CH_APPEAR_WATCH),
+
+	/*! service UUID list */
+	17,
+	DM_ADV_TYPE_128_UUID_PART,
+	CARD10_UUID_SUFFIX,
+	0x0,
+	CARD10_UUID_PREFIX,
+
+	3,                        /*! length */
+	DM_ADV_TYPE_16_UUID_PART, /*! AD type */
+	UINT16_TO_BYTES(ATT_UUID_HID_SERVICE)
+};
+
+/*! scan data, discoverable mode */
+uint8_t bleScanDataDisc[] = {
+	/*! device name */
+	14,                     /*! length */
+	DM_ADV_TYPE_LOCAL_NAME, /*! AD type */
+	'c','a','r','d','1','0','-','0','0','0','0','0','0',
+
+	3,                      /*! length */
+	DM_ADV_TYPE_16_SOLICIT, /*! AD type */
+	UINT16_TO_BYTES(ATT_UUID_CURRENT_TIME_SERVICE),
+};
+/* clang-format on */
+
+/*! advertising data, connectable mode */
+static const uint8_t bleAdvDataConn[] = {
+	/*! flags */
+	2,                 /*! length */
+	DM_ADV_TYPE_FLAGS, /*! AD type */
+	DM_FLAG_LE_BREDR_NOT_SUP,
+};
+
+static uint8_t advertising_mode        = APP_MODE_NONE;
+static uint8_t advertising_mode_target = APP_MODE_NONE;
+
+void ble_adv_proc_msg(bleMsg_t *pMsg)
+{
+	switch (pMsg->hdr.event) {
+	case DM_ADV_START_IND:
+		LOG_INFO(
+			"ble",
+			"Advertisement started %u %u",
+			advertising_mode,
+			advertising_mode_target
+		);
+		if (advertising_mode != advertising_mode_target ||
+		    advertising_mode_target == APP_MODE_NONE) {
+			AppAdvStop();
+		}
+		break;
+
+	case DM_ADV_STOP_IND:
+		LOG_INFO(
+			"ble",
+			"Advertisement stopped %u %u",
+			advertising_mode,
+			advertising_mode_target
+		);
+		if (advertising_mode != advertising_mode_target) {
+			advertising_mode = advertising_mode_target;
+			AppAdvStart(advertising_mode);
+		}
+		break;
+	case DM_CONN_CLOSE_IND:
+		/* Stack overwrites advertising mode after connection close.
+		 * Force our desired mode.
+		 */
+		advertising_mode = APP_MODE_NONE;
+		AppAdvStop();
+		break;
+	};
+}
+
+void ble_adv_init(void)
+{
+	char buf[32];
+	char a, b, c, d, e, f, K;
+
+	/* clang-format off */
+	int result = epic_config_get_string("ble_mac", buf, sizeof(buf));
+	if (result == 0) {
+		if (sscanf(buf,
+			   "%c%c:%c%c:%c%c:%c%c:%c%c:%c%c",
+			   &K, &K, &K, &K, &K, &K,
+			   &a, &b, &c, &d, &e, &f) == 12) {
+			bleScanDataDisc[9]  = a;
+			bleScanDataDisc[10] = b;
+			bleScanDataDisc[11] = c;
+			bleScanDataDisc[12] = d;
+			bleScanDataDisc[13] = e;
+			bleScanDataDisc[14] = f;
+		}
+	}
+	/* clang-format on */
+
+	pAppAdvCfg = (appAdvCfg_t *)&bleAdvCfg;
+}
+
+void ble_adv_setup(void)
+{
+	/* set advertising and scan response data for discoverable mode */
+	if (config_get_boolean_with_default("ble_hid_enable", false)) {
+		AppAdvSetData(
+			APP_ADV_DATA_DISCOVERABLE,
+			sizeof(bleAdvDataDiscHID),
+			(uint8_t *)bleAdvDataDiscHID
+		);
+	} else {
+		AppAdvSetData(
+			APP_ADV_DATA_DISCOVERABLE,
+			sizeof(bleAdvDataDisc),
+			(uint8_t *)bleAdvDataDisc
+		);
+	}
+
+	AppAdvSetData(
+		APP_SCAN_DATA_DISCOVERABLE,
+		sizeof(bleScanDataDisc),
+		(uint8_t *)bleScanDataDisc
+	);
+
+	/* set advertising and scan response data for connectable mode */
+	AppAdvSetData(
+		APP_ADV_DATA_CONNECTABLE,
+		sizeof(bleAdvDataConn),
+		(uint8_t *)bleAdvDataConn
+	);
+	AppAdvSetData(APP_SCAN_DATA_CONNECTABLE, 0, NULL);
+
+	bleAdvCfg.advInterval[0] = DEFAULT_ADV_INTERVAL_US / 625;
+}
+
+void ble_adv_set_interval(uint32_t interval_us)
+{
+	bleAdvCfg.advInterval[0] = interval_us / 625;
+	tainted                  = true;
+}
+
+void ble_adv_stop(void)
+{
+	if (advertising_mode != APP_MODE_NONE) {
+		advertising_mode_target = APP_MODE_NONE;
+		advertising_mode        = APP_MODE_NONE;
+		AppAdvStop();
+	}
+}
+
+static void adv_start(uint8_t mode)
+{
+	if (advertising_mode != APP_MODE_NONE) {
+		/* We need to stop advertising in between or the
+		* adv set will not be changed.
+		* Also need to wait for the stop operation to finish
+		* before we can start again
+		* Also need to set the variables first as we don't
+		* have a lock on the stack.*/
+		advertising_mode_target = mode;
+		advertising_mode        = APP_MODE_NONE;
+		AppAdvStop();
+	} else {
+		advertising_mode        = mode;
+		advertising_mode_target = mode;
+		AppAdvStart(advertising_mode);
+	}
+	tainted = false;
+}
+
+void ble_adv_start(uint8_t mode)
+{
+	adv_start(mode);
+	tainted = true;
+}
+
+void ble_adv_discoverable(bool discoverable)
+{
+	if (discoverable) {
+		if (advertising_mode != APP_MODE_DISCOVERABLE || tainted) {
+			LOG_INFO("ble", "Making bondable and discoverable");
+			adv_start(APP_MODE_DISCOVERABLE);
+		}
+	} else {
+		/* TODO: This does way more than the function name indicates */
+		if (AppDbCheckBonded()) {
+			if (advertising_mode != APP_MODE_CONNECTABLE ||
+			    tainted) {
+				LOG_INFO("ble", "Bonded. Making connectable");
+				adv_start(APP_MODE_CONNECTABLE);
+			}
+		} else {
+			LOG_INFO("ble", "Not bonded. Stop advertising");
+			ble_adv_stop();
+		}
+	}
+}