ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix platform failing to build after rebase

pull/6273/head
Bartek Szatkowski 2018-05-11 11:12:24 +02:00
parent 38df9306d7
commit 42b48821eb
5 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/os_tick_ostm.c
View File

@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
}
/// Enable OS Tick.
int32_t OS_Tick_Enable (void)
void OS_Tick_Enable (void)
{
if (OSTM_PendIRQ != 0U) {
@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
// Start the OSTM counter
OSTM.OSTMnTS = 0x01U;
return (0);
}
/// Disable OS Tick.
int32_t OS_Tick_Disable (void) {
void OS_Tick_Disable (void) {
// Stop the OSTM counter
OSTM.OSTMnTT = 0x01U;
@ -155,14 +153,12 @@ int32_t OS_Tick_Disable (void) {
IRQ_ClearPending (OSTM_IRQn);
OSTM_PendIRQ = 1U;
}
return (0);
}
// Acknowledge OS Tick IRQ.
int32_t OS_Tick_AcknowledgeIRQ (void)
void OS_Tick_AcknowledgeIRQ (void)
{
return (IRQ_ClearPending (OSTM_IRQn));
IRQ_ClearPending (OSTM_IRQn);
}
// Get OS Tick IRQ number.

12
targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/os_tick_ostm.c
View File

@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
}
/// Enable OS Tick.
int32_t OS_Tick_Enable (void)
void OS_Tick_Enable (void)
{
if (OSTM_PendIRQ != 0U) {
@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
// Start the OSTM counter
OSTM.OSTMnTS = 0x01U;
return (0);
}
/// Disable OS Tick.
int32_t OS_Tick_Disable (void)
void OS_Tick_Disable (void)
{
// Stop the OSTM counter
@ -156,14 +154,12 @@ int32_t OS_Tick_Disable (void)
IRQ_ClearPending (OSTM_IRQn);
OSTM_PendIRQ = 1U;
}
return (0);
}
// Acknowledge OS Tick IRQ.
int32_t OS_Tick_AcknowledgeIRQ (void)
void OS_Tick_AcknowledgeIRQ (void)
{
return (IRQ_ClearPending (OSTM_IRQn));
IRQ_ClearPending (OSTM_IRQn);
}
// Get OS Tick IRQ number.

12
targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_VK_RZ_A1H/device/os_tick_ostm.c
View File

@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
}
/// Enable OS Tick.
int32_t OS_Tick_Enable (void)
void OS_Tick_Enable (void)
{
if (OSTM_PendIRQ != 0U) {
@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
// Start the OSTM counter
OSTM.OSTMnTS = 0x01U;
return (0);
}
/// Disable OS Tick.
int32_t OS_Tick_Disable (void)
void OS_Tick_Disable (void)
{
// Stop the OSTM counter
@ -156,14 +154,12 @@ int32_t OS_Tick_Disable (void)
IRQ_ClearPending (OSTM_IRQn);
OSTM_PendIRQ = 1U;
}
return (0);
}
// Acknowledge OS Tick IRQ.
int32_t OS_Tick_AcknowledgeIRQ (void)
void OS_Tick_AcknowledgeIRQ (void)
{
return (IRQ_ClearPending (OSTM_IRQn));
IRQ_ClearPending (OSTM_IRQn);
}
// Get OS Tick IRQ number.

1
targets/TARGET_RENESAS/mbed_rtx.h
View File

@ -19,7 +19,6 @@
#include <stdint.h>
#if defined(TARGET_RZ_A1H) || defined(TARGET_VK_RZ_A1H) || defined(TARGET_GR_LYCHEE)
#define OS_IDLE_THREAD_STACK_SIZE 512
#if defined(__CC_ARM)
extern char Image$$ARM_LIB_STACK$$Base[];

2
targets/TARGET_STM/mbed_rtx.h
View File

@ -17,6 +17,8 @@
#ifndef MBED_MBED_RTX_H
#define MBED_MBED_RTX_H
#include <stdint.h>
#ifndef INITIAL_SP
#if (defined(TARGET_STM32L475VG) ||\