Skip to content

Commit 42b4882

Browse files
committed
Fix platform failing to build after rebase
1 parent 38df930 commit 42b4882

File tree

5 files changed

+14
-25
lines changed

5 files changed

+14
-25
lines changed

targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_GR_LYCHEE/device/os_tick_ostm.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
131131
}
132132

133133
/// Enable OS Tick.
134-
int32_t OS_Tick_Enable (void)
134+
void OS_Tick_Enable (void)
135135
{
136136

137137
if (OSTM_PendIRQ != 0U) {
@@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
141141

142142
// Start the OSTM counter
143143
OSTM.OSTMnTS = 0x01U;
144-
145-
return (0);
146144
}
147145

148146
/// Disable OS Tick.
149-
int32_t OS_Tick_Disable (void) {
147+
void OS_Tick_Disable (void) {
150148

151149
// Stop the OSTM counter
152150
OSTM.OSTMnTT = 0x01U;
@@ -155,14 +153,12 @@ int32_t OS_Tick_Disable (void) {
155153
IRQ_ClearPending (OSTM_IRQn);
156154
OSTM_PendIRQ = 1U;
157155
}
158-
159-
return (0);
160156
}
161157

162158
// Acknowledge OS Tick IRQ.
163-
int32_t OS_Tick_AcknowledgeIRQ (void)
159+
void OS_Tick_AcknowledgeIRQ (void)
164160
{
165-
return (IRQ_ClearPending (OSTM_IRQn));
161+
IRQ_ClearPending (OSTM_IRQn);
166162
}
167163

168164
// Get OS Tick IRQ number.

targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/device/os_tick_ostm.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
131131
}
132132

133133
/// Enable OS Tick.
134-
int32_t OS_Tick_Enable (void)
134+
void OS_Tick_Enable (void)
135135
{
136136

137137
if (OSTM_PendIRQ != 0U) {
@@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
141141

142142
// Start the OSTM counter
143143
OSTM.OSTMnTS = 0x01U;
144-
145-
return (0);
146144
}
147145

148146
/// Disable OS Tick.
149-
int32_t OS_Tick_Disable (void)
147+
void OS_Tick_Disable (void)
150148
{
151149

152150
// Stop the OSTM counter
@@ -156,14 +154,12 @@ int32_t OS_Tick_Disable (void)
156154
IRQ_ClearPending (OSTM_IRQn);
157155
OSTM_PendIRQ = 1U;
158156
}
159-
160-
return (0);
161157
}
162158

163159
// Acknowledge OS Tick IRQ.
164-
int32_t OS_Tick_AcknowledgeIRQ (void)
160+
void OS_Tick_AcknowledgeIRQ (void)
165161
{
166-
return (IRQ_ClearPending (OSTM_IRQn));
162+
IRQ_ClearPending (OSTM_IRQn);
167163
}
168164

169165
// Get OS Tick IRQ number.

targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_VK_RZ_A1H/device/os_tick_ostm.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler)
131131
}
132132

133133
/// Enable OS Tick.
134-
int32_t OS_Tick_Enable (void)
134+
void OS_Tick_Enable (void)
135135
{
136136

137137
if (OSTM_PendIRQ != 0U) {
@@ -141,12 +141,10 @@ int32_t OS_Tick_Enable (void)
141141

142142
// Start the OSTM counter
143143
OSTM.OSTMnTS = 0x01U;
144-
145-
return (0);
146144
}
147145

148146
/// Disable OS Tick.
149-
int32_t OS_Tick_Disable (void)
147+
void OS_Tick_Disable (void)
150148
{
151149

152150
// Stop the OSTM counter
@@ -156,14 +154,12 @@ int32_t OS_Tick_Disable (void)
156154
IRQ_ClearPending (OSTM_IRQn);
157155
OSTM_PendIRQ = 1U;
158156
}
159-
160-
return (0);
161157
}
162158

163159
// Acknowledge OS Tick IRQ.
164-
int32_t OS_Tick_AcknowledgeIRQ (void)
160+
void OS_Tick_AcknowledgeIRQ (void)
165161
{
166-
return (IRQ_ClearPending (OSTM_IRQn));
162+
IRQ_ClearPending (OSTM_IRQn);
167163
}
168164

169165
// Get OS Tick IRQ number.

targets/TARGET_RENESAS/mbed_rtx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <stdint.h>
2020

2121
#if defined(TARGET_RZ_A1H) || defined(TARGET_VK_RZ_A1H) || defined(TARGET_GR_LYCHEE)
22-
#define OS_IDLE_THREAD_STACK_SIZE 512
2322

2423
#if defined(__CC_ARM)
2524
extern char Image$$ARM_LIB_STACK$$Base[];

targets/TARGET_STM/mbed_rtx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#ifndef MBED_MBED_RTX_H
1818
#define MBED_MBED_RTX_H
1919

20+
#include <stdint.h>
21+
2022
#ifndef INITIAL_SP
2123

2224
#if (defined(TARGET_STM32L475VG) ||\

0 commit comments

Comments
 (0)