Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup PR: Docs + small fixes #8663

Merged
merged 24 commits into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ad88218
Kernel.h doxygen update
SenRamakri Oct 15, 2018
4cdcdc1
Updated attach_thread_terminate_hook doxygen comments
SenRamakri Oct 29, 2018
2418d9c
Edit Kernel.h
Oct 30, 2018
c7afb91
Fix compile warning about initializing and variable order
KariHaapalehto Nov 5, 2018
09ee5f9
readme: add license section
0xc0170 Oct 25, 2018
8ec69e6
readme: add note about 3rd party code licenses
0xc0170 Oct 25, 2018
f8fc0b3
contributing: update the text
0xc0170 Oct 25, 2018
97cb833
Readme: add license guide doc page
0xc0170 Oct 25, 2018
4aaf013
Fix memory leak
KariHaapalehto Nov 5, 2018
dfadcda
readme: fix apache license
0xc0170 Nov 5, 2018
36f1fa0
Remove extra _deselect to prevent possible hard fault
Oct 30, 2018
1ea2897
TOOLS : Add missing M33 and M33F in python scripts
jeromecoutant Oct 16, 2018
ba86a53
Update tools/toolchains/gcc.py
Nov 5, 2018
8060a53
Comma, editorial changes
Nov 6, 2018
86153dd
Commas and other small editorial changes
Nov 6, 2018
64ef110
Edits in README.md
Nov 6, 2018
819f002
Remove comma in CONTRIBUTING.md
Nov 6, 2018
44aaad4
Remove comma in CONTRIBUTING.md
Nov 6, 2018
ddd82a9
Merge branch 'fix_possible_memory_leak' of ssh://github.com/KariHaapa…
Nov 7, 2018
f7eb135
Merge branch 'fix_licensing' of ssh://github.com/0xc0170/mbed-os into…
Nov 7, 2018
7536876
Merge branch 'fix_compile_warning' of ssh://github.com/KariHaapalehto…
Nov 7, 2018
fd744e7
Merge branch 'sdblockdevice_deselect' of ssh://github.com/jarlamsa/mb…
Nov 7, 2018
edb6d9d
Merge branch 'PR_M33' of ssh://github.com/jeromecoutant/mbed into rollup
Nov 7, 2018
0a8f5e0
Merge branch 'sen_KernelDoxyUpdate' of ssh://github.com/SenRamakri/mb…
Nov 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Mbed OS is an open-source, device software platform for the Internet of Things. Contributions are an important part of the platform, and our goal is to make it as simple as possible to become a contributor.

To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set ofguidelines for contributing toMbed OS. Please see: [contributing guidelines](https://os.mbed.com/docs/latest/reference/contributing.html).
To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/latest/reference/contributing.html).
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,20 @@
Arm Mbed OS is an open source embedded operating system designed specifically for the "things" in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices.

Mbed OS provides a platform that includes:
* Security foundations.
* Cloud management services.
* Drivers for sensors, I/O devices and connectivity.

- Security foundations.
- Cloud management services.
- Drivers for sensors, I/O devices and connectivity.

## Release notes
The [release notes](https://os.mbed.com/releases) detail the current release. You can also find information about previous versions.

## License and contributions

The software is provided under [Apache-2.0 license](LICENSE). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info.

This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html)

## Getting started for developers

We have a [developer website](https://os.mbed.com) for asking questions, engaging with others, finding information on boards and components, using an online IDE and compiler, reading the documentation and learning about what's new and what's coming next in Mbed OS.
Expand All @@ -36,6 +43,7 @@ We also have a [contributing and publishing guide](https://os.mbed.com/contribut

## Documentation

For more information about Mbed OS, please see [our published documentation](https://os.mbed.com/docs/latest). It includes published Doxygen for our APIs, step-by-step tutorials, porting information and background reference materials about our architecture and tools.
For more information about Mbed OS, please see [our published documentation](https://os.mbed.com/docs/latest). It includes Doxygen for our APIs, step-by-step tutorials, porting information and background reference materials about our architecture and tools.

To contribute to this documentation, please see the [mbed-os-5-docs repository](https://github.com/ARMmbed/mbed-os-5-docs).

To contribute to this documentation, please see the [mbed-os-5-docs repo](https://github.com/ARMmbed/mbed-os-5-docs).
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,6 @@ int SDBlockDevice::_read(uint8_t *buffer, uint32_t length)
// read until start byte (0xFE)
if (false == _wait_token(SPI_START_BLOCK)) {
debug_if(SD_DBG, "Read timeout\n");
_deselect();
return SD_BLOCK_DEVICE_ERROR_NO_RESPONSE;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void Nanostack::Interface::attach(
}

Nanostack::Interface::Interface(NanostackPhy &phy) : interface_phy(phy), interface_id(-1), _device_id(-1),
_connect_status(NSAPI_STATUS_DISCONNECTED), _blocking(true), _previous_connection_status(NSAPI_STATUS_DISCONNECTED)
_connect_status(NSAPI_STATUS_DISCONNECTED), _previous_connection_status(NSAPI_STATUS_DISCONNECTED), _blocking(true)
{
mesh_system_init();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, Nan

nsapi_error_t err = interface->initialize();
if (err) {
delete interface;
return err;
}

Expand Down
16 changes: 8 additions & 8 deletions rtos/Kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ namespace rtos {
namespace Kernel {

/** Read the current RTOS kernel millisecond tick count.
The tick count corresponds to the tick count used by the RTOS for timing
purposes. It increments monotonically from 0 at boot, hence effectively
The tick count corresponds to the tick count the RTOS uses for timing
purposes. It increments monotonically from 0 at boot, so it effectively
never wraps. If the underlying RTOS only provides a 32-bit tick count,
this method expands it to 64 bits.
@return RTOS kernel current tick count
@note mbed OS always uses millisecond RTOS ticks, and this could only wrap
after half a billion years
@note Mbed OS always uses millisecond RTOS ticks, and this could only wrap
after half a billion years.
@note You cannot call this function from ISR context.
*/
uint64_t get_ms_count();

/** Attach a function to be called by the RTOS idle task
@param fptr pointer to the function to be called
/** Attach a function to be called by the RTOS idle task.
@param fptr pointer to the function to be called

@note You may call this function from ISR context.
*/
void attach_idle_hook(void (*fptr)(void));

/** Attach a function to be called when a task is killed
@param fptr pointer to the function to be called
/** Attach a function to be called when a thread terminates.
@param fptr pointer to the function to be called

@note You may call this function from ISR context.
*/
Expand Down
6 changes: 5 additions & 1 deletion tools/targets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
"Cortex-M23": ["M23", "CORTEX_M", "LIKE_CORTEX_M23", "CORTEX"],
"Cortex-M23-NS": ["M23", "M23_NS", "CORTEX_M", "LIKE_CORTEX_M23", "CORTEX"],
"Cortex-M33": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
"Cortex-M33-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"]
"Cortex-M33-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
"Cortex-M33F": ["M33", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"],
"Cortex-M33F-NS": ["M33", "M33_NS", "CORTEX_M", "LIKE_CORTEX_M33", "CORTEX"]
}

CORE_ARCH = {
Expand All @@ -66,7 +68,9 @@
"Cortex-M23": 8,
"Cortex-M23-NS": 8,
"Cortex-M33": 8,
"Cortex-M33F": 8,
"Cortex-M33-NS": 8,
"Cortex-M33F-NS": 8,
}

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion tools/test/toolchains/arm_support_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ARMC5_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4",
"Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD"]
ARMC6_CORES = ARMC5_CORES + ["Cortex-M23", "Cortex-M23-NS",
"Cortex-M33", "CortexM33-NS"]
"Cortex-M33", "Cortex-M33-NS", "Cortex-M33F", "Cortex-M33F-NS"]

CORE_SUF_ALPHA = ["MDFNS02347-+"]

Expand Down
4 changes: 2 additions & 2 deletions tools/toolchains/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ class mbedToolchain:
"Cortex-M23": ["__CORTEX_M23", "ARM_MATH_ARMV8MBL", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33F-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__FPU_PRESENT", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33F": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__FPU_PRESENT", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33F-NS": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "DOMAIN_NS=1", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
"Cortex-M33F": ["__CORTEX_M33", "ARM_MATH_ARMV8MML", "__FPU_PRESENT=1U", "__CMSIS_RTOS", "__MBED_CMSIS_RTOS_CM"],
}

MBED_CONFIG_FILE_NAME="mbed_config.h"
Expand Down
7 changes: 5 additions & 2 deletions tools/toolchains/arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ class ARMC6(ARM_STD):
SHEBANG = "#! armclang -E --target=arm-arm-none-eabi -x c"
SUPPORTED_CORES = ["Cortex-M0", "Cortex-M0+", "Cortex-M3", "Cortex-M4",
"Cortex-M4F", "Cortex-M7", "Cortex-M7F", "Cortex-M7FD",
"Cortex-M23", "Cortex-M23-NS", "Cortex-M33",
"Cortex-M33-NS", "Cortex-A9"]
"Cortex-M23", "Cortex-M23-NS", "Cortex-M33", "Cortex-M33F",
"Cortex-M33-NS", "Cortex-M33F-NS", "Cortex-A9"]
ARMCC_RANGE = (LooseVersion("6.10"), LooseVersion("7.0"))

@staticmethod
Expand Down Expand Up @@ -416,6 +416,9 @@ def __init__(self, target, *args, **kwargs):
self.flags['common'].append("-mfloat-abi=softfp")
elif target.core.startswith("Cortex-M23"):
self.flags['common'].append("-march=armv8-m.base")
elif target.core.startswith("Cortex-M33F"):
self.flags['common'].append("-mfpu=fpv5-sp-d16")
self.flags['common'].append("-mfloat-abi=softfp")

if target.core == "Cortex-M23" or target.core == "Cortex-M33":
self.flags['cxx'].append("-mcmse")
Expand Down
6 changes: 3 additions & 3 deletions tools/toolchains/gcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
elif target.core.startswith("Cortex-M23"):
self.cpu = ["-mcpu=cortex-m23"]
elif target.core.startswith("Cortex-M33F"):
self.cpu = ["-mcpu=cortex-m33"]
self.cpu = ["-mcpu=cortex-m33+nodsp"]
elif target.core.startswith("Cortex-M33"):
self.cpu = ["-march=armv8-m.main"]
self.cpu = ["-mcpu=cortex-m33+nodsp+nofp"]
else:
self.cpu = ["-mcpu={}".format(target.core.lower())]

Expand Down Expand Up @@ -97,7 +97,7 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
"-Wl,--cmse-implib",
"-Wl,--out-implib=%s" % join(build_dir, "cmse_lib.o")
])
elif target.core == "Cortex-M23-NS" or target.core == "Cortex-M33-NS":
elif target.core == "Cortex-M23-NS" or target.core == "Cortex-M33-NS" or target.core == "Cortex-M33F-NS":
self.flags["ld"].append("-DDOMAIN_NS=1")

self.flags["common"] += self.cpu
Expand Down
4 changes: 2 additions & 2 deletions tools/toolchains/iar.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
elif target.core == "Cortex-M7F":
asm_flags_cmd += ["--fpu", "VFPv5_sp"]
c_flags_cmd.append("--fpu=VFPv5_sp")
elif target.core == "Cortex-M23" or target.core == "Cortex-M33":
elif target.core == "Cortex-M23" or target.core == "Cortex-M33" or target.core == "Cortex-M33F":
self.flags["asm"] += ["--cmse"]
self.flags["common"] += ["--cmse"]

# Create Secure library
if target.core == "Cortex-M23" or self.target.core == "Cortex-M33":
if target.core == "Cortex-M23" or self.target.core == "Cortex-M33" or self.target.core == "Cortex-M33F":
secure_file = join(build_dir, "cmse_lib.o")
self.flags["ld"] += ["--import_cmse_lib_out=%s" % secure_file]

Expand Down