Skip to content

Commit bbba284

Browse files
KKopyscinskiKKopyscinski
committed
porting: update syscfg after ISO Broadcast implementation.
1 parent d8312d8 commit bbba284

File tree

10 files changed

+428
-31
lines changed

10 files changed

+428
-31
lines changed

‎porting/examples/linux/include/syscfg/syscfg.h‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file was generated by Apache newt version: 1.11.0-dev
2+
* This file was generated by Apache newt version: 1.12.0-dev
33
*/
44

55
#ifndef H_MYNEWT_SYSCFG_
@@ -454,6 +454,10 @@
454454
#define MYNEWT_VAL_BLE_ISO (0)
455455
#endif
456456

457+
#ifndef MYNEWT_VAL_BLE_ISO_BROADCASTER
458+
#define MYNEWT_VAL_BLE_ISO_BROADCASTER (0)
459+
#endif
460+
457461
#ifndef MYNEWT_VAL_BLE_ISO_TEST
458462
#define MYNEWT_VAL_BLE_ISO_TEST (0)
459463
#endif
@@ -474,10 +478,22 @@
474478
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
475479
#endif
476480

481+
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS
482+
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS (0)
483+
#endif
484+
477485
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER
478486
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0)
479487
#endif
480488

489+
#ifndef MYNEWT_VAL_BLE_PHY_2M
490+
#define MYNEWT_VAL_BLE_PHY_2M (0)
491+
#endif
492+
493+
#ifndef MYNEWT_VAL_BLE_PHY_CODED
494+
#define MYNEWT_VAL_BLE_PHY_CODED (0)
495+
#endif
496+
481497
#ifndef MYNEWT_VAL_BLE_POWER_CONTROL
482498
#define MYNEWT_VAL_BLE_POWER_CONTROL (0)
483499
#endif
@@ -711,6 +727,10 @@
711727
#define MYNEWT_VAL_BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT (0)
712728
#endif
713729

730+
#ifndef MYNEWT_VAL_BLE_HS_GAP_UNHANDLED_HCI_EVENT
731+
#define MYNEWT_VAL_BLE_HS_GAP_UNHANDLED_HCI_EVENT (0)
732+
#endif
733+
714734
#ifndef MYNEWT_VAL_BLE_HS_LOG_LVL
715735
#define MYNEWT_VAL_BLE_HS_LOG_LVL (1)
716736
#endif
@@ -771,6 +791,14 @@
771791
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
772792
#endif
773793

794+
#ifndef MYNEWT_VAL_BLE_MAX_BIG
795+
#define MYNEWT_VAL_BLE_MAX_BIG (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
796+
#endif
797+
798+
#ifndef MYNEWT_VAL_BLE_MAX_BIS
799+
#define MYNEWT_VAL_BLE_MAX_BIS (4)
800+
#endif
801+
774802
#ifndef MYNEWT_VAL_BLE_MESH
775803
#define MYNEWT_VAL_BLE_MESH (0)
776804
#endif
@@ -783,6 +811,10 @@
783811
#define MYNEWT_VAL_BLE_SM_BONDING (0)
784812
#endif
785813

814+
#ifndef MYNEWT_VAL_BLE_SM_CSIS_SIRK
815+
#define MYNEWT_VAL_BLE_SM_CSIS_SIRK (0)
816+
#endif
817+
786818
#ifndef MYNEWT_VAL_BLE_SM_IO_CAP
787819
#define MYNEWT_VAL_BLE_SM_IO_CAP (BLE_HS_IO_NO_INPUT_OUTPUT)
788820
#endif
@@ -1116,6 +1148,24 @@
11161148
#define MYNEWT_VAL_BLE_TRANSPORT_HS (1)
11171149
#endif
11181150

1151+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT
1152+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
1153+
#endif
1154+
1155+
/* Value copied from BLE_TRANSPORT_ISO_COUNT */
1156+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
1157+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
1158+
#endif
1159+
1160+
/* Value copied from BLE_TRANSPORT_ISO_COUNT */
1161+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
1162+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
1163+
#endif
1164+
1165+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE
1166+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
1167+
#endif
1168+
11191169
/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport) */
11201170
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
11211171
#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
@@ -1138,6 +1188,9 @@
11381188
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__socket
11391189
#define MYNEWT_VAL_BLE_TRANSPORT_LL__socket (1)
11401190
#endif
1191+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__uart_ll
1192+
#define MYNEWT_VAL_BLE_TRANSPORT_LL__uart_ll (0)
1193+
#endif
11411194
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL
11421195
#define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
11431196
#endif
@@ -1265,4 +1318,11 @@
12651318
#define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
12661319
#define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_linux 1
12671320

1321+
/*** Included APIs */
1322+
#define MYNEWT_API_TRNG_HW_IMPL 1
1323+
#define MYNEWT_API_ble_transport 1
1324+
#define MYNEWT_API_console 1
1325+
#define MYNEWT_API_log 1
1326+
#define MYNEWT_API_stats 1
1327+
12681328
#endif

‎porting/examples/linux/include/sysflash/sysflash.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
/**
2-
* This file was generated by Apache newt version: 1.11.0-dev
2+
* This file was generated by Apache newt version: 1.12.0-dev
33
*/
44

55
#ifndef H_MYNEWT_SYSFLASH_
66
#define H_MYNEWT_SYSFLASH_
77

88
#include "flash_map/flash_map.h"
99

10+
#define FLASH_AREA_COUNT 6
11+
1012
/**
1113
* This flash map definition is used for two purposes:
1214
* 1. To locate the meta area, which contains the true flash map definition.
1315
* 2. As a fallback in case the meta area cannot be read from flash.
1416
*/
15-
extern const struct flash_area sysflash_map_dflt[6];
17+
extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
18+
19+
/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
1620

1721
#define FLASH_AREA_BOOTLOADER 0
1822
#define FLASH_AREA_BOOTLOADER_DEVICE 0

‎porting/examples/linux_blemesh/include/syscfg/syscfg.h‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file was generated by Apache newt version: 1.11.0-dev
2+
* This file was generated by Apache newt version: 1.12.0-dev
33
*/
44

55
#ifndef H_MYNEWT_SYSCFG_
@@ -455,6 +455,10 @@
455455
#define MYNEWT_VAL_BLE_ISO (0)
456456
#endif
457457

458+
#ifndef MYNEWT_VAL_BLE_ISO_BROADCASTER
459+
#define MYNEWT_VAL_BLE_ISO_BROADCASTER (0)
460+
#endif
461+
458462
#ifndef MYNEWT_VAL_BLE_ISO_TEST
459463
#define MYNEWT_VAL_BLE_ISO_TEST (0)
460464
#endif
@@ -475,10 +479,22 @@
475479
#define MYNEWT_VAL_BLE_PERIODIC_ADV (0)
476480
#endif
477481

482+
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS
483+
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS (0)
484+
#endif
485+
478486
#ifndef MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER
479487
#define MYNEWT_VAL_BLE_PERIODIC_ADV_SYNC_TRANSFER (0)
480488
#endif
481489

490+
#ifndef MYNEWT_VAL_BLE_PHY_2M
491+
#define MYNEWT_VAL_BLE_PHY_2M (0)
492+
#endif
493+
494+
#ifndef MYNEWT_VAL_BLE_PHY_CODED
495+
#define MYNEWT_VAL_BLE_PHY_CODED (0)
496+
#endif
497+
482498
#ifndef MYNEWT_VAL_BLE_POWER_CONTROL
483499
#define MYNEWT_VAL_BLE_POWER_CONTROL (0)
484500
#endif
@@ -712,6 +728,10 @@
712728
#define MYNEWT_VAL_BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT (0)
713729
#endif
714730

731+
#ifndef MYNEWT_VAL_BLE_HS_GAP_UNHANDLED_HCI_EVENT
732+
#define MYNEWT_VAL_BLE_HS_GAP_UNHANDLED_HCI_EVENT (0)
733+
#endif
734+
715735
#ifndef MYNEWT_VAL_BLE_HS_LOG_LVL
716736
#define MYNEWT_VAL_BLE_HS_LOG_LVL (1)
717737
#endif
@@ -772,6 +792,14 @@
772792
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
773793
#endif
774794

795+
#ifndef MYNEWT_VAL_BLE_MAX_BIG
796+
#define MYNEWT_VAL_BLE_MAX_BIG (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
797+
#endif
798+
799+
#ifndef MYNEWT_VAL_BLE_MAX_BIS
800+
#define MYNEWT_VAL_BLE_MAX_BIS (4)
801+
#endif
802+
775803
/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host) */
776804
#ifndef MYNEWT_VAL_BLE_MESH
777805
#define MYNEWT_VAL_BLE_MESH (1)
@@ -785,6 +813,10 @@
785813
#define MYNEWT_VAL_BLE_SM_BONDING (0)
786814
#endif
787815

816+
#ifndef MYNEWT_VAL_BLE_SM_CSIS_SIRK
817+
#define MYNEWT_VAL_BLE_SM_CSIS_SIRK (0)
818+
#endif
819+
788820
#ifndef MYNEWT_VAL_BLE_SM_IO_CAP
789821
#define MYNEWT_VAL_BLE_SM_IO_CAP (BLE_HS_IO_NO_INPUT_OUTPUT)
790822
#endif
@@ -1691,6 +1723,24 @@
16911723
#define MYNEWT_VAL_BLE_TRANSPORT_HS (1)
16921724
#endif
16931725

1726+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT
1727+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
1728+
#endif
1729+
1730+
/* Value copied from BLE_TRANSPORT_ISO_COUNT */
1731+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
1732+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
1733+
#endif
1734+
1735+
/* Value copied from BLE_TRANSPORT_ISO_COUNT */
1736+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
1737+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
1738+
#endif
1739+
1740+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE
1741+
#define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
1742+
#endif
1743+
16941744
/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport) */
16951745
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
16961746
#define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
@@ -1713,6 +1763,9 @@
17131763
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__socket
17141764
#define MYNEWT_VAL_BLE_TRANSPORT_LL__socket (1)
17151765
#endif
1766+
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__uart_ll
1767+
#define MYNEWT_VAL_BLE_TRANSPORT_LL__uart_ll (0)
1768+
#endif
17161769
#ifndef MYNEWT_VAL_BLE_TRANSPORT_LL
17171770
#define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
17181771
#endif
@@ -1841,4 +1894,11 @@
18411894
#define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
18421895
#define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_linux_blemesh 1
18431896

1897+
/*** Included APIs */
1898+
#define MYNEWT_API_TRNG_HW_IMPL 1
1899+
#define MYNEWT_API_ble_transport 1
1900+
#define MYNEWT_API_console 1
1901+
#define MYNEWT_API_log 1
1902+
#define MYNEWT_API_stats 1
1903+
18441904
#endif

‎porting/examples/linux_blemesh/include/sysflash/sysflash.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
/**
2-
* This file was generated by Apache newt version: 1.11.0-dev
2+
* This file was generated by Apache newt version: 1.12.0-dev
33
*/
44

55
#ifndef H_MYNEWT_SYSFLASH_
66
#define H_MYNEWT_SYSFLASH_
77

88
#include "flash_map/flash_map.h"
99

10+
#define FLASH_AREA_COUNT 6
11+
1012
/**
1113
* This flash map definition is used for two purposes:
1214
* 1. To locate the meta area, which contains the true flash map definition.
1315
* 2. As a fallback in case the meta area cannot be read from flash.
1416
*/
15-
extern const struct flash_area sysflash_map_dflt[6];
17+
extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
18+
19+
/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
1620

1721
#define FLASH_AREA_BOOTLOADER 0
1822
#define FLASH_AREA_BOOTLOADER_DEVICE 0

0 commit comments

Comments
 (0)