Skip to content

Commit ec72ac0

Browse files
authored
Merge branch 'master' into STM_sha256_F439ZI
2 parents a27498c + e3e54e5 commit ec72ac0

File tree

326 files changed

+45959
-1435
lines changed

Some content is hidden

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

326 files changed

+45959
-1435
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ script:
1313
# not start with lib
1414
- |
1515
find "(" -name "*.a" -or -name "*.ar" ")" -and -not -name "lib*" | tee BUILD/badlibs | sed -e "s/^/Bad library name found: /" && [ ! -s BUILD/badlibs ]
16+
# Assert that all assebler files are named correctly
17+
# The strange command below asserts that there are exactly 0 libraries that do
18+
# end with .s
19+
- |
20+
find -name "*.s" | tee BUILD/badasm | sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
1621
- make -C events/equeue test clean
1722
- PYTHONPATH=. python tools/test/config_test/config_test.py
1823
- PYTHONPATH=. python tools/test/build_api/build_api_test.py

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All changes in code base should originate from GitHub Issues and take advantage
55
Guidelines from this document are created to help new and existing contributors understand process workflow and align to project rules before pull request is submitted. It explains how a participant should do things like format code, test fixes, and submit patches.
66

77
## Where to get more information?
8-
You can read more on our [documentation page](https://docs.mbed.com/).
8+
You can read more on our [documentation page](https://docs.mbed.com/docs/mbed-os-handbook/en/latest/cont/contributing/).
99

1010
# How to contribute
1111
We really appreciate your contributions! We are Open Source project and we need your help. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.

cmsis/TOOLCHAIN_IAR/cmain.S

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
EXTERN exit
4747
EXTERN __iar_dynamic_initialization
4848
EXTERN mbed_sdk_init
49+
EXTERN mbed_main
4950
EXTERN SystemInit
5051

5152
THUMB
@@ -87,6 +88,10 @@ _call_main:
8788
FUNCALL __cmain, __iar_argc_argv
8889
BL __iar_argc_argv ; Maybe setup command line
8990

91+
MOVS r0,#0 ; No parameters
92+
FUNCALL __cmain, mbed_main
93+
BL mbed_main
94+
9095
FUNCALL __cmain, main
9196
BL main
9297
_main:

drivers/BusIn.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "platform/platform.h"
2020
#include "drivers/DigitalIn.h"
2121
#include "platform/PlatformMutex.h"
22+
#include "platform/NonCopyable.h"
2223

2324
namespace mbed {
2425
/** \addtogroup drivers */
@@ -28,7 +29,7 @@ namespace mbed {
2829
* @note Synchronization level: Thread safe
2930
* @ingroup drivers
3031
*/
31-
class BusIn {
32+
class BusIn : private NonCopyable<BusIn> {
3233

3334
public:
3435
/* Group: Configuration Methods */
@@ -115,12 +116,9 @@ class BusIn {
115116

116117
PlatformMutex _mutex;
117118

118-
/* disallow copy constructor and assignment operators */
119119
private:
120120
virtual void lock();
121121
virtual void unlock();
122-
BusIn(const BusIn&);
123-
BusIn & operator = (const BusIn&);
124122
};
125123

126124
} // namespace mbed

drivers/BusInOut.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "drivers/DigitalInOut.h"
2020
#include "platform/PlatformMutex.h"
21+
#include "platform/NonCopyable.h"
2122

2223
namespace mbed {
2324
/** \addtogroup drivers */
@@ -27,7 +28,7 @@ namespace mbed {
2728
* @note Synchronization level: Thread safe
2829
* @ingroup drivers
2930
*/
30-
class BusInOut {
31+
class BusInOut : private NonCopyable<BusInOut> {
3132

3233
public:
3334

@@ -135,11 +136,6 @@ class BusInOut {
135136
int _nc_mask;
136137

137138
PlatformMutex _mutex;
138-
139-
/* disallow copy constructor and assignment operators */
140-
private:
141-
BusInOut(const BusInOut&);
142-
BusInOut & operator = (const BusInOut&);
143139
};
144140

145141
} // namespace mbed

drivers/BusOut.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
#include "drivers/DigitalOut.h"
2020
#include "platform/PlatformMutex.h"
21+
#include "platform/NonCopyable.h"
2122

2223
namespace mbed {
2324
/** \addtogroup drivers */
2425

2526
/** A digital output bus, used for setting the state of a collection of pins
2627
* @ingroup drivers
2728
*/
28-
class BusOut {
29+
class BusOut : private NonCopyable<BusOut> {
2930

3031
public:
3132

@@ -119,11 +120,6 @@ class BusOut {
119120
int _nc_mask;
120121

121122
PlatformMutex _mutex;
122-
123-
/* disallow copy constructor and assignment operators */
124-
private:
125-
BusOut(const BusOut&);
126-
BusOut & operator = (const BusOut&);
127123
};
128124

129125
} // namespace mbed

drivers/CAN.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "hal/can_api.h"
2424
#include "platform/Callback.h"
2525
#include "platform/PlatformMutex.h"
26+
#include "platform/NonCopyable.h"
2627

2728
namespace mbed {
2829
/** \addtogroup drivers */
@@ -78,7 +79,7 @@ class CANMessage : public CAN_Message {
7879
/** A can bus client, used for communicating with can devices
7980
* @ingroup drivers
8081
*/
81-
class CAN {
82+
class CAN : private NonCopyable<CAN> {
8283

8384
public:
8485
/** Creates an CAN interface connected to specific pins.

drivers/Ethernet.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#define MBED_ETHERNET_H
1818

1919
#include "platform/platform.h"
20+
#include "platform/NonCopyable.h"
2021

2122
#if defined (DEVICE_ETHERNET) || defined(DOXYGEN_ONLY)
2223

@@ -54,7 +55,7 @@ namespace mbed {
5455
* @endcode
5556
* @ingroup drivers
5657
*/
57-
class Ethernet {
58+
class Ethernet : private NonCopyable<Ethernet> {
5859

5960
public:
6061

drivers/FlashIAP.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "flash_api.h"
2828
#include "platform/SingletonPtr.h"
2929
#include "platform/PlatformMutex.h"
30+
#include "platform/NonCopyable.h"
3031

3132
namespace mbed {
3233

@@ -37,7 +38,7 @@ namespace mbed {
3738
* @note Synchronization level: Thread safe
3839
* @ingroup drivers
3940
*/
40-
class FlashIAP {
41+
class FlashIAP : private NonCopyable<FlashIAP> {
4142
public:
4243
FlashIAP();
4344
~FlashIAP();

drivers/I2C.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "hal/i2c_api.h"
2424
#include "platform/SingletonPtr.h"
2525
#include "platform/PlatformMutex.h"
26+
#include "platform/NonCopyable.h"
2627

2728
#if DEVICE_I2C_ASYNCH
2829
#include "platform/CThunk.h"
@@ -53,7 +54,7 @@ namespace mbed {
5354
* @endcode
5455
* @ingroup drivers
5556
*/
56-
class I2C {
57+
class I2C : private NonCopyable<I2C> {
5758

5859
public:
5960
enum RxStatus {

0 commit comments

Comments
 (0)