Skip to content

Commit 6ccf724

Browse files
facchinmfacchinm
committed
Rebuild core on mbed 6.9.0 + local patches
1 parent ac19528 commit 6ccf724

File tree

37 files changed

+391
-714
lines changed

37 files changed

+391
-714
lines changed

‎cores/arduino/mbed/connectivity/lorawan/system/LoRaWANTimer.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ class LoRaWANTimeHandler {
7676
*/
7777
void stop(timer_event_t &obj);
7878

79+
/** Clear timer state so it is not inadvertently canceled. This function
80+
* must be called by the callback registered in init.
81+
*
82+
* @param [in] obj The structure containing the timer object parameters.
83+
*/
84+
void clear(timer_event_t &obj);
85+
7986
private:
8087
events::EventQueue *_queue;
8188
};

‎cores/arduino/mbed/connectivity/lwipstack/lwip/src/include/lwip/dns.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
extern "C" {
5151
#endif
5252

53-
struct dns_server_interface {
54-
char interface_name [INTERFACE_NAME_MAX_SIZE];
55-
ip_addr_t dns_servers[DNS_MAX_SERVERS];
56-
struct dns_server_interface *next;
57-
};
58-
5953
/** DNS timer period */
6054
#define DNS_TMR_INTERVAL 1000
6155

‎cores/arduino/mbed/events/include/events/equeue.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ extern "C" {
4242
// Internal event structure
4343
struct equeue_event {
4444
unsigned size;
45+
uint16_t generation;
4546
uint8_t id;
46-
uint8_t generation;
4747

4848
struct equeue_event *next;
4949
struct equeue_event *sibling;
@@ -61,8 +61,9 @@ struct equeue_event {
6161
typedef struct equeue {
6262
struct equeue_event *queue;
6363
unsigned tick;
64+
65+
uint16_t generation;
6466
bool break_requested;
65-
uint8_t generation;
6667

6768
unsigned char *buffer;
6869
unsigned npw2;

‎cores/arduino/mbed/platform/include/platform/mbed_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
* @note 99 is default value for development version (master branch)
4040
*/
41-
#define MBED_MINOR_VERSION 8
41+
#define MBED_MINOR_VERSION 9
4242

4343
/** MBED_PATCH_VERSION
4444
* Mbed OS patch version

‎cores/arduino/mbed/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_ARDUINO_EDGE_CONTROL/PinNames.h renamed to ‎cores/arduino/mbed/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EDGE_CONTROL/PinNames.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ typedef enum {
143143
// mBed interface Pins
144144
CONSOLE_TX = TX_PIN_NUMBER,
145145
CONSOLE_RX = RX_PIN_NUMBER,
146+
USBTX = TX_PIN_NUMBER,
147+
USBRX = RX_PIN_NUMBER,
146148
STDIO_UART_TX = TX_PIN_NUMBER,
147149
STDIO_UART_RX = RX_PIN_NUMBER,
148150

‎cores/arduino/mbed/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_ARDUINO_EDGE_CONTROL/device.h renamed to ‎cores/arduino/mbed/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EDGE_CONTROL/device.h

File renamed without changes.

‎cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32F4/can_device.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
/* mbed Microcontroller Library
2-
* Copyright (c) 2006-2017 ARM Limited
3-
* SPDX-License-Identifier: Apache-2.0
2+
* SPDX-License-Identifier: BSD-3-Clause
3+
******************************************************************************
44
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
5+
* Copyright (c) 2015-2021 STMicroelectronics.
6+
* All rights reserved.
87
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* This software component is licensed by ST under BSD 3-Clause license,
9+
* the "License"; You may not use this file except in compliance with the
10+
* License. You may obtain a copy of the License at:
11+
* opensource.org/licenses/BSD-3-Clause
1012
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
13+
******************************************************************************
1614
*/
15+
1716
#ifndef MBED_CAN_DEVICE_H
1817
#define MBED_CAN_DEVICE_H
1918

‎cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32F4/cmsis.h

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
11
/* mbed Microcontroller Library
2-
* A generic CMSIS include header
3-
*******************************************************************************
4-
* Copyright (c) 2014, STMicroelectronics
5-
* All rights reserved.
2+
* SPDX-License-Identifier: BSD-3-Clause
3+
******************************************************************************
64
*
7-
* Redistribution and use in source and binary forms, with or without
8-
* modification, are permitted provided that the following conditions are met:
5+
* Copyright (c) 2015-2021 STMicroelectronics.
6+
* All rights reserved.
97
*
10-
* 1. Redistributions of source code must retain the above copyright notice,
11-
* this list of conditions and the following disclaimer.
12-
* 2. Redistributions in binary form must reproduce the above copyright notice,
13-
* this list of conditions and the following disclaimer in the documentation
14-
* and/or other materials provided with the distribution.
15-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
16-
* may be used to endorse or promote products derived from this software
17-
* without specific prior written permission.
8+
* This software component is licensed by ST under BSD 3-Clause license,
9+
* the "License"; You may not use this file except in compliance with the
10+
* License. You may obtain a copy of the License at:
11+
* opensource.org/licenses/BSD-3-Clause
1812
*
19-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29-
*******************************************************************************
13+
******************************************************************************
3014
*/
3115

3216
#ifndef MBED_CMSIS_H

‎cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32F4/common_objects.h

Lines changed: 0 additions & 169 deletions
This file was deleted.

‎cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32F4/gpio_irq_device.h

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
/* mbed Microcontroller Library
2-
*******************************************************************************
3-
* Copyright (c) 2017, STMicroelectronics
4-
* All rights reserved.
2+
* SPDX-License-Identifier: BSD-3-Clause
3+
******************************************************************************
54
*
6-
* Redistribution and use in source and binary forms, with or without
7-
* modification, are permitted provided that the following conditions are met:
5+
* Copyright (c) 2015-2021 STMicroelectronics.
6+
* All rights reserved.
87
*
9-
* 1. Redistributions of source code must retain the above copyright notice,
10-
* this list of conditions and the following disclaimer.
11-
* 2. Redistributions in binary form must reproduce the above copyright notice,
12-
* this list of conditions and the following disclaimer in the documentation
13-
* and/or other materials provided with the distribution.
14-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
15-
* may be used to endorse or promote products derived from this software
16-
* without specific prior written permission.
8+
* This software component is licensed by ST under BSD 3-Clause license,
9+
* the "License"; You may not use this file except in compliance with the
10+
* License. You may obtain a copy of the License at:
11+
* opensource.org/licenses/BSD-3-Clause
1712
*
18-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28-
*******************************************************************************
13+
******************************************************************************
2914
*/
15+
3016
#ifndef MBED_GPIO_IRQ_DEVICE_H
3117
#define MBED_GPIO_IRQ_DEVICE_H
3218

0 commit comments

Comments
 (0)