Skip to content

Commit ea7efb2

Browse files
committed
Merge pull request #3 from mbedmicro/master
Pull in upstream changes
2 parents 2c55311 + ddca955 commit ea7efb2

File tree

134 files changed

+15926
-8649
lines changed

Some content is hidden

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

134 files changed

+15926
-8649
lines changed

docs/BUILDING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Build successes:
236236
Above command will build mbed SDK for [LPC1768](http://developer.mbed.org/platforms/mbed-LPC1768/) platform using ARM compiler.
237237

238238
Let's have a look at directory structure under ```mbed/build/```. We can see for ```LPC1768``` new directory ```TARGET_LPC1768``` was created. This directory contains all build primitives.
239-
Directory ```mbed/TARGET_LPC1768/TOOLCHAIN_ARM_STD/``` conteins mbed SDK library ```mbed.ar```. This directory structure also stores all needed headers which you should use with ```mbed.ar``` when building your own software.
239+
Directory ```mbed/TARGET_LPC1768/TOOLCHAIN_ARM_STD/``` contains mbed SDK library ```mbed.ar```. This directory structure also stores all needed headers which you should use with ```mbed.ar``` when building your own software.
240240
```
241241
$ tree ./mbed/build/
242242
Folder PATH listing
@@ -406,14 +406,14 @@ C:\Work\mbed\libraries\mbed\targets\cmsis\TARGET_NXP\TARGET_LPC176X\TOOLCHAIN_GC
406406
...
407407
```
408408

409-
## CppUCheck analysis
409+
## CppCheck analysis
410410
[Cppcheck](http://cppcheck.sourceforge.net/) is a static analysis tool for C/C++ code. Unlike C/C++ compilers and many other analysis tools it does not detect syntax errors in the code. Cppcheck primarily detects the types of bugs that the compilers normally do not detect. The goal is to detect only real errors in the code (i.e. have zero false positives).
411411

412412
Prerequisites:
413413
* Please install ```CppCheck``` on your system before you want to use it with build scripts.
414414
* You should also add Cppcheck to your system path.
415415

416-
```build.py``` script supports switching between compilation and building and just static code analysis testing. You can use switch ```--cppcheck``` to perform CppCheck static code analysis.
416+
```build.py``` script supports switching between compilation, building and just static code analysis testing. You can use switch ```--cppcheck``` to perform CppCheck static code analysis.
417417

418418
* When you are using --cppcheck switch all macros, toolchain dependencies etc. are preserved so you are sure you are checking exactly the same code you would compile for your application.
419419

@@ -427,8 +427,8 @@ $ python build.py -t uARM -m NUCLEO_F334R8 --cppcheck
427427
```
428428

429429
# make.py script
430-
```make.pt``` is a ```mbed/workspace_tools/``` script used to build tests (we call them sometimes 'programs') one by one manually. Script allows you to flash board with test and execute it. This is deprecated functionality and will not be described here. Instead please use ```singletest.py``` file to build mbed SDK, tests and run automation for test cases included in ```mbedmicro/mbed```.
431-
Note: ```make.py``` script depends on existing already built mked SDK and library sources so you need to pre-build mbed SDK and for example RTOS library to link 'program' (test) with mebd SDK and RTOS library. To pre-build mbed SDK please use ```build.py``` script.
430+
```make.py``` is a ```mbed/workspace_tools/``` script used to build tests (we call them sometimes 'programs') one by one manually. This script allows you to flash board, execute and test it. However, this script is deprecated and will not be described here. Instead please use ```singletest.py``` file to build mbed SDK, tests and run automation for test cases included in ```mbedmicro/mbed```.
431+
Note: ```make.py``` script depends on existing already built mbed SDK and library sources so you need to pre-build mbed SDK and other libraries (such as RTOS library) to link 'program' (test) with mbed SDK and RTOS library. To pre-build mbed SDK please use ```build.py``` script.
432432

433433
Just for sake of example please see few ways to use ```make.py``` together with Freedom K64F board.
434434

libraries/USBDevice/USBDevice/USBEndpoints_Maxim.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@
8585
#define EPINT_IN (EP4IN)
8686
#define EPINT_OUT_callback EP3_OUT_callback
8787
#define EPINT_IN_callback EP4_IN_callback
88+
/* Isochronous endpoints */
89+
/* NOT SUPPORTED - use invalid endpoint number to prevent built errors */
90+
#define EPISO_OUT (EP0OUT)
91+
#define EPISO_IN (EP0IN)
8892

8993
#define MAX_PACKET_SIZE_EPBULK (64)
9094
#define MAX_PACKET_SIZE_EPINT (64)

libraries/USBDevice/USBDevice/USBHAL_STM32F4.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ USBHAL::USBHAL(void) {
4848
// Enable power and clocking
4949
RCC->AHB1ENR |= RCC_AHB1ENR_GPIOAEN;
5050

51-
#if defined(TARGET_STM32F407VG) || defined(TARGET_STM32F401RE) || defined(TARGET_STM32F411RE)
51+
#if defined(TARGET_STM32F407VG) || defined(TARGET_STM32F401RE) || defined(TARGET_STM32F411RE) || defined(TARGET_STM32F429ZI)
5252
pin_function(PA_8, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OTG_FS));
5353
pin_function(PA_9, STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLDOWN, GPIO_AF10_OTG_FS));
5454
pin_function(PA_10, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS));

libraries/mbed/api/Ticker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Ticker : public TimerEvent {
6060
Ticker() : TimerEvent() {
6161
}
6262

63-
Ticker(const ticker_data_t *const data) : TimerEvent(data) {
63+
Ticker(const ticker_data_t *data) : TimerEvent(data) {
6464
}
6565

6666
/** Attach a function to be called by the Ticker, specifiying the interval in seconds

libraries/mbed/api/Timer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Timer {
4646

4747
public:
4848
Timer();
49-
Timer(const ticker_data_t *const data);
49+
Timer(const ticker_data_t *data);
5050

5151
/** Start the timer
5252
*/
@@ -83,7 +83,7 @@ class Timer {
8383
int _running; // whether the timer is running
8484
unsigned int _start; // the start time of the latest slice
8585
int _time; // any accumulated time from previous slices
86-
const ticker_data_t *const _ticker_data;
86+
const ticker_data_t *_ticker_data;
8787
};
8888

8989
} // namespace mbed

libraries/mbed/api/TimerEvent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TimerEvent {
4747

4848
ticker_event_t event;
4949

50-
const ticker_data_t *const _ticker_data;
50+
const ticker_data_t *_ticker_data;
5151
};
5252

5353
} // namespace mbed

libraries/mbed/api/mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef MBED_H
1717
#define MBED_H
1818

19-
#define MBED_LIBRARY_VERSION 98
19+
#define MBED_LIBRARY_VERSION 99
2020

2121
#include "platform.h"
2222

libraries/mbed/common/Timer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Timer::Timer() : _running(), _start(), _time(), _ticker_data(get_us_ticker_data(
2323
reset();
2424
}
2525

26-
Timer::Timer(const ticker_data_t *const data) : _running(), _start(), _time(), _ticker_data(data) {
26+
Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker_data(data) {
2727
reset();
2828
}
2929

libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefines/lvds_iodefine.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* File Name : lvds_iodefine.h
2525
* $Rev: $
2626
* $Date:: $
27-
* Description : Definition of I/O Register (V1.00a)
27+
* Description : Definition of I/O Register (V1.01a)
2828
******************************************************************************/
2929
#ifndef LVDS_IODEFINE_H
3030
#define LVDS_IODEFINE_H
@@ -37,7 +37,8 @@ struct st_lvds
3737
volatile uint8_t dummy608[24]; /* */
3838
volatile uint32_t LCLKSELR; /* LCLKSELR */
3939
volatile uint32_t LPLLSETR; /* LPLLSETR */
40-
volatile uint32_t LPLLMONR; /* LPLLMONR */
40+
volatile uint8_t dummy609[4]; /* */
41+
volatile uint32_t LPHYACC; /* LPHYACC */
4142
};
4243

4344

@@ -48,6 +49,6 @@ struct st_lvds
4849
#define LVDSLVDSFCL LVDS.LVDSFCL
4950
#define LVDSLCLKSELR LVDS.LCLKSELR
5051
#define LVDSLPLLSETR LVDS.LPLLSETR
51-
#define LVDSLPLLMONR LVDS.LPLLMONR
52+
#define LVDSLPHYACC LVDS.LPHYACC
5253
/* <-SEC M1.10.1 */
5354
#endif

0 commit comments

Comments
 (0)