Skip to content

Commit a7a53b7

Browse files
authored
Merge pull request #3046 from mmorenobarm/master
[BEETLE] Update BLE stack on Beetle board
2 parents 53cd23e + e7829cd commit a7a53b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1974
-1314
lines changed

features/FEATURE_BLE/targets/TARGET_ARM_SSG/TARGET_BEETLE/source/ArmGap.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,13 @@ ble_error_t ArmGap::startAdvertising(const GapAdvertisingParams &params)
7777
return BLE_ERROR_PARAM_OUT_OF_RANGE;
7878
}
7979

80+
/* Peer Addr Type 0 = Public */
81+
uint8_t peerAddrType = 0;
82+
uint8_t peerAddr[6];
83+
memset(peerAddr, 0, 6);
84+
8085
DmAdvSetInterval(params.getInterval(), params.getInterval());
81-
DmAdvStart(params.getAdvertisingType(), params.getTimeout());
86+
DmAdvStart(params.getAdvertisingType(), params.getTimeout(), peerAddrType, peerAddr);
8287

8388
state.advertising = 1;
8489

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/beetle/board/board.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief Board-specific include file for BT4 module board.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015-2016 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/beetle/board/main_board.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief Board services.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/beetle/chip/chip.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief Include file for SMD TC2.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015-2016 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/beetle/chip/chip_hw.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief Low-level chip defines for SMD TC2.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/ble_init.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief BLE initialization.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/cordio_bt4_defs.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
* $Date: 2015-09-28 16:07:14 -0400 (Mon, 28 Sep 2015) $
88
* $Revision: 4037 $
99
*
10-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
11-
* SPDX-License-Identifier: LicenseRef-PBL
10+
* Copyright (c) 2013 Wicentric, Inc., all rights reserved.
11+
* Wicentric confidential and proprietary.
1212
*
13-
* This file and the related binary are licensed under the
14-
* Permissive Binary License, Version 1.0 (the "License");
15-
* you may not use these files except in compliance with the License.
16-
*
17-
* You may obtain a copy of the License here:
18-
* LICENSE-permissive-binary-license-1.0.txt and at
19-
* https://www.mbed.com/licenses/PBL-1.0
20-
*
21-
* See the License for the specific language governing permissions and
22-
* limitations under the License.
13+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
14+
* ("Agreement") that must be accepted in order to download or otherwise receive a
15+
* copy of this file. You may not use or copy this file for any purpose other than
16+
* as described in the Agreement. If you do not agree to all of the terms of the
17+
* Agreement do not use this file and delete all copies in your possession or control;
18+
* if you do not have a copy of the Agreement, you must contact Wicentric, Inc. prior
19+
* to any use, copying or further distribution of this software.
2320
*/
2421
/*************************************************************************************************/
2522

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/cordio_sdk_version.h

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
* $Date: 2015-10-22 18:45:26 -0400 (Thu, 22 Oct 2015) $
88
* $Revision: 4273 $
99
*
10-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
11-
* SPDX-License-Identifier: LicenseRef-PBL
10+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
11+
* Wicentric confidential and proprietary.
1212
*
13-
* This file and the related binary are licensed under the
14-
* Permissive Binary License, Version 1.0 (the "License");
15-
* you may not use these files except in compliance with the License.
16-
*
17-
* You may obtain a copy of the License here:
18-
* LICENSE-permissive-binary-license-1.0.txt and at
19-
* https://www.mbed.com/licenses/PBL-1.0
20-
*
21-
* See the License for the specific language governing permissions and
22-
* limitations under the License.
13+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
14+
* ("Agreement") that must be accepted in order to download or otherwise receive a
15+
* copy of this file. You may not use or copy this file for any purpose other than
16+
* as described in the Agreement. If you do not agree to all of the terms of the
17+
* Agreement do not use this file and delete all copies in your possession or control;
18+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
19+
* to any use, copying or further distribution of this software.
2320
*/
2421
/*************************************************************************************************/
2522

@@ -31,7 +28,7 @@ extern "C" {
3128
#endif
3229

3330
/*! \brief Cordio SDK version string. */
34-
#define CORDIO_SDK_VERSION "20151023-r4279"
31+
#define CORDIO_SDK_VERSION "20160509-r7043"
3532

3633
/*! \brief Cordio SDK major version. */
3734
#define CORDIO_SDK_VERSION_MAJOR 1

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/driver/drv_console.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief Upper-layer UART driver.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/driver/drv_llcc.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief LLCC driver.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/driver/drv_uart.h

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
*
55
* \brief UART driver.
66
*
7-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
8-
* SPDX-License-Identifier: LicenseRef-PBL
7+
* Copyright (c) 2015 ARM, Ltd., all rights reserved.
8+
* ARM confidential and proprietary.
99
*
10-
* This file and the related binary are licensed under the
11-
* Permissive Binary License, Version 1.0 (the "License");
12-
* you may not use these files except in compliance with the License.
13-
*
14-
* You may obtain a copy of the License here:
15-
* LICENSE-permissive-binary-license-1.0.txt and at
16-
* https://www.mbed.com/licenses/PBL-1.0
17-
*
18-
* See the License for the specific language governing permissions and
19-
* limitations under the License.
10+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
11+
* ("Agreement") that must be accepted in order to download or otherwise receive a
12+
* copy of this file. You may not use or copy this file for any purpose other than
13+
* as described in the Agreement. If you do not agree to all of the terms of the
14+
* Agreement do not use this file and delete all copies in your possession or control;
15+
* if you do not have a copy of the Agreement, you must contact ARM, Ltd. prior
16+
* to any use, copying or further distribution of this software.
2017
*/
2118
/*************************************************************************************************/
2219

targets/TARGET_ARM_SSG/TARGET_BEETLE/cordio/include/hci/dual_chip/hci_core_ps.h

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@
44
*
55
* \brief HCI core platform-specific interfaces for dual-chip.
66
*
7-
* $Date: 2015-06-12 07:19:18 -0400 (Fri, 12 Jun 2015) $
7+
* $Date: 2015-06-12 04:19:18 -0700 (Fri, 12 Jun 2015) $
88
* $Revision: 3061 $
99
*
10-
* Copyright (c) 2009-2016, ARM Limited, All Rights Reserved
11-
* SPDX-License-Identifier: LicenseRef-PBL
10+
* Copyright (c) 2013 Wicentric, Inc., all rights reserved.
11+
* Wicentric confidential and proprietary.
1212
*
13-
* This file and the related binary are licensed under the
14-
* Permissive Binary License, Version 1.0 (the "License");
15-
* you may not use these files except in compliance with the License.
16-
*
17-
* You may obtain a copy of the License here:
18-
* LICENSE-permissive-binary-license-1.0.txt and at
19-
* https://www.mbed.com/licenses/PBL-1.0
20-
*
21-
* See the License for the specific language governing permissions and
22-
* limitations under the License.
13+
* IMPORTANT. Your use of this file is governed by a Software License Agreement
14+
* ("Agreement") that must be accepted in order to download or otherwise receive a
15+
* copy of this file. You may not use or copy this file for any purpose other than
16+
* as described in the Agreement. If you do not agree to all of the terms of the
17+
* Agreement do not use this file and delete all copies in your possession or control;
18+
* if you do not have a copy of the Agreement, you must contact Wicentric, Inc. prior
19+
* to any use, copying or further distribution of this software.
2320
*/
2421
/*************************************************************************************************/
2522
#ifndef HCI_CORE_PS_H

0 commit comments

Comments
 (0)