From eaf47ff4685b7193dc26533f09bdc50bb4e0a7b0 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Tue, 19 May 2020 17:44:12 +0200
Subject: [PATCH] refact(ble): Move numeric comparison into our code base
---
epicardium/ble/app/app_main.c | 427 -----------------------------
epicardium/ble/ble.c | 2 -
epicardium/ble/ble_main.c | 13 +-
epicardium/ble/meson.build | 1 -
epicardium/ble/stack.c | 3 +
lib/sdk/Libraries/BTLE/meson.build | 2 +-
6 files changed, 16 insertions(+), 432 deletions(-)
delete mode 100644 epicardium/ble/app/app_main.c
diff --git a/epicardium/ble/app/app_main.c b/epicardium/ble/app/app_main.c
deleted file mode 100644
index b279c758b..000000000
--- a/epicardium/ble/app/app_main.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*************************************************************************************************/
-/*!
- * \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"
-
-#include "modules/log.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);
-
- LOG_INFO("ble", "Confirm Value: %ld", 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 */
diff --git a/epicardium/ble/ble.c b/epicardium/ble/ble.c
index 02c0af400..59b25ef07 100644
--- a/epicardium/ble/ble.c
+++ b/epicardium/ble/ble.c
@@ -65,7 +65,6 @@ static int log_lastflushtick = 0;
/*! \brief Stack initialization for app. */
extern void StackInit(void);
-extern void AppInit(void);
extern void bleuart_init(void);
extern void bleFileTransfer_init(void);
extern void bleCard10_init(void);
@@ -441,7 +440,6 @@ void vBleTask(void *pvParameters)
BbBleDrvSetTxPower(0);
setAddress();
- AppInit();
BleStart();
AttsDynInit();
diff --git a/epicardium/ble/ble_main.c b/epicardium/ble/ble_main.c
index a274f270c..0ec15eaca 100644
--- a/epicardium/ble/ble_main.c
+++ b/epicardium/ble/ble_main.c
@@ -359,6 +359,17 @@ static void bleSetup(bleMsg_t *pMsg)
#endif
}
+void bleHandleNumericComparison(dmSecCnfIndEvt_t *pCnfInd)
+{
+ uint32_t confirm = DmSecGetCompareValue(pCnfInd->confirm);
+ dmConnId_t pair_connId;
+ APP_TRACE_INFO1(">>> Confirm Value: %d <<<", confirm);
+ LOG_INFO("ble", "Confirm Value: %ld", confirm);
+ pair_connId = (dmConnId_t)pCnfInd->hdr.param;
+ /* TODO: Verify that local and peer confirmation values match */
+ LOG_INFO("ble", "Confirming");
+ DmSecCompareRsp(pair_connId, TRUE);
+}
/*************************************************************************************************/
/*!
@@ -492,7 +503,7 @@ static void bleProcMsg(bleMsg_t *pMsg)
break;
case DM_SEC_COMPARE_IND:
- AppHandleNumericComparison(&pMsg->dm.cnfInd);
+ bleHandleNumericComparison(&pMsg->dm.cnfInd);
break;
case DM_HW_ERROR_IND:
diff --git a/epicardium/ble/meson.build b/epicardium/ble/meson.build
index c531ae9a9..770c53c6b 100644
--- a/epicardium/ble/meson.build
+++ b/epicardium/ble/meson.build
@@ -4,7 +4,6 @@ ble_sources = files(
'ble_main.c',
'svc_dis.c',
'svc_core.c',
- 'app/app_main.c',
'app/common/app_db.c',
'app/common/app_ui.c',
'uart.c',
diff --git a/epicardium/ble/stack.c b/epicardium/ble/stack.c
index f96f2c113..a7896b68f 100644
--- a/epicardium/ble/stack.c
+++ b/epicardium/ble/stack.c
@@ -186,5 +186,8 @@ void StackInit(void)
/*TODO card10: Probably want to adjust this */
HciSetMaxRxAclLen(100);
+
+ handlerId = WsfOsSetNextHandler(AppHandler);
+ AppHandlerInit(handlerId);
}
/* clang-format off */
diff --git a/lib/sdk/Libraries/BTLE/meson.build b/lib/sdk/Libraries/BTLE/meson.build
index ab0db7206..f617bccad 100644
--- a/lib/sdk/Libraries/BTLE/meson.build
+++ b/lib/sdk/Libraries/BTLE/meson.build
@@ -59,7 +59,7 @@ sources = files(
'stack/ble-profiles/sources/apps/app/app_master_ae.c',
'stack/ble-profiles/sources/apps/app/app_slave_leg.c',
'stack/ble-profiles/sources/apps/app/app_slave_ae.c',
-#'stack/ble-profiles/sources/apps/app/app_main.c',
+'stack/ble-profiles/sources/apps/app/app_main.c',
'stack/ble-profiles/sources/apps/app/app_server.c',
'stack/ble-profiles/sources/apps/app/app_master_leg.c',
#'stack/ble-profiles/sources/apps/app/common/app_db.c',
--
GitLab