Skip to content

Commit 5e03d61

Browse files
wdx04wdx04
committed
do not use semaphore when RTOS is not available
1 parent c2d2302 commit 5e03d61

File tree

10 files changed

+84
-0
lines changed

10 files changed

+84
-0
lines changed

‎targets/TARGET_STM/TARGET_STM32F4/objects.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
#include "stm32f4xx_ll_rcc.h"
3030

3131
#include "stm_dma_info.h"
32+
#if MBED_CONF_RTOS_PRESENT
3233
#include "cmsis_os.h"
3334
#include "cmsis_os2.h"
35+
#endif
3436

3537
#ifdef __cplusplus
3638
extern "C" {
@@ -155,8 +157,10 @@ struct qspi_s {
155157
PinName sclk;
156158
PinName ssel;
157159
bool dmaInitialized;
160+
#if MBED_CONF_RTOS_PRESENT
158161
osSemaphoreId_t semaphoreId;
159162
osRtxSemaphore_t semaphoreMem;
163+
#endif
160164
};
161165
#endif
162166

‎targets/TARGET_STM/TARGET_STM32F7/objects.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@
4343
#include "stm32f7xx_ll_rcc.h"
4444

4545
#include "stm_dma_info.h"
46+
#if MBED_CONF_RTOS_PRESENT
4647
#include "cmsis_os.h"
4748
#include "cmsis_os2.h"
49+
#endif
4850

4951
#ifdef __cplusplus
5052
extern "C" {
@@ -129,8 +131,10 @@ struct qspi_s {
129131
PinName sclk;
130132
PinName ssel;
131133
bool dmaInitialized;
134+
#if MBED_CONF_RTOS_PRESENT
132135
osSemaphoreId_t semaphoreId;
133136
osRtxSemaphore_t semaphoreMem;
137+
#endif
134138
};
135139
#endif
136140

‎targets/TARGET_STM/TARGET_STM32G4/objects.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
#include "stm32g4xx_ll_rcc.h"
2828

2929
#include "stm_dma_info.h"
30+
#if MBED_CONF_RTOS_PRESENT
3031
#include "cmsis_os.h"
3132
#include "cmsis_os2.h"
33+
#endif
3234

3335
#ifdef __cplusplus
3436
extern "C" {
@@ -111,8 +113,10 @@ struct qspi_s {
111113
PinName sclk;
112114
PinName ssel;
113115
bool dmaInitialized;
116+
#if MBED_CONF_RTOS_PRESENT
114117
osSemaphoreId_t semaphoreId;
115118
osRtxSemaphore_t semaphoreMem;
119+
#endif
116120
};
117121
#endif
118122

‎targets/TARGET_STM/TARGET_STM32H7/objects.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@
3232
#include "stm32h7xx_ll_system.h"
3333

3434
#include "stm_dma_info.h"
35+
#if MBED_CONF_RTOS_PRESENT
3536
#include "cmsis_os.h"
3637
#include "cmsis_os2.h"
38+
#endif
3739

3840
#ifdef __cplusplus
3941
extern "C" {
@@ -100,8 +102,10 @@ struct qspi_s {
100102
PinName sclk;
101103
PinName ssel;
102104
bool dmaInitialized;
105+
#if MBED_CONF_RTOS_PRESENT
103106
osSemaphoreId_t semaphoreId;
104107
osRtxSemaphore_t semaphoreMem;
108+
#endif
105109
};
106110
#endif
107111

@@ -122,8 +126,10 @@ struct ospi_s {
122126
PinName ssel;
123127
PinName dqs;
124128
bool dmaInitialized;
129+
#if MBED_CONF_RTOS_PRESENT
125130
osSemaphoreId_t semaphoreId;
126131
osRtxSemaphore_t semaphoreMem;
132+
#endif
127133
};
128134
#endif
129135

‎targets/TARGET_STM/TARGET_STM32L4/objects.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@
3232
#include "stm32l4xx_ll_rcc.h"
3333

3434
#include "stm_dma_utils.h"
35+
#if MBED_CONF_RTOS_PRESENT
3536
#include "cmsis_os.h"
3637
#include "cmsis_os2.h"
38+
#endif
3739

3840
#ifdef __cplusplus
3941
extern "C" {
@@ -122,8 +124,10 @@ struct qspi_s {
122124
PinName sclk;
123125
PinName ssel;
124126
bool dmaInitialized;
127+
#if MBED_CONF_RTOS_PRESENT
125128
osSemaphoreId_t semaphoreId;
126129
osRtxSemaphore_t semaphoreMem;
130+
#endif
127131
};
128132
#endif
129133

@@ -144,8 +148,10 @@ struct ospi_s {
144148
PinName ssel;
145149
PinName dqs;
146150
bool dmaInitialized;
151+
#if MBED_CONF_RTOS_PRESENT
147152
osSemaphoreId_t semaphoreId;
148153
osRtxSemaphore_t semaphoreMem;
154+
#endif
149155
};
150156
#endif
151157

‎targets/TARGET_STM/TARGET_STM32L5/objects.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828
#include "stm32l5xx_ll_rcc.h"
2929

3030
#include "stm_dma_info.h"
31+
#if MBED_CONF_RTOS_PRESENT
3132
#include "cmsis_os.h"
3233
#include "cmsis_os2.h"
34+
#endif
3335

3436
#ifdef __cplusplus
3537
extern "C" {
@@ -118,8 +120,10 @@ struct qspi_s {
118120
PinName sclk;
119121
PinName ssel;
120122
bool dmaInitialized;
123+
#if MBED_CONF_RTOS_PRESENT
121124
osSemaphoreId_t semaphoreId;
122125
osRtxSemaphore_t semaphoreMem;
126+
#endif
123127
};
124128

125129
struct ospi_s {
@@ -138,8 +142,10 @@ struct ospi_s {
138142
PinName ssel;
139143
PinName dqs;
140144
bool dmaInitialized;
145+
#if MBED_CONF_RTOS_PRESENT
141146
osSemaphoreId_t semaphoreId;
142147
osRtxSemaphore_t semaphoreMem;
148+
#endif
143149
};
144150

145151
#ifdef __cplusplus

‎targets/TARGET_STM/TARGET_STM32U5/objects.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828
#include "stm32u5xx_ll_rcc.h"
2929

3030
#include "stm_dma_info.h"
31+
#if MBED_CONF_RTOS_PRESENT
3132
#include "cmsis_os.h"
3233
#include "cmsis_os2.h"
34+
#endif
3335

3436
#ifdef __cplusplus
3537
extern "C" {
@@ -118,8 +120,10 @@ struct qspi_s {
118120
PinName sclk;
119121
PinName ssel;
120122
bool dmaInitialized;
123+
#if MBED_CONF_RTOS_PRESENT
121124
osSemaphoreId_t semaphoreId;
122125
osRtxSemaphore_t semaphoreMem;
126+
#endif
123127
};
124128

125129
struct ospi_s {
@@ -138,8 +142,10 @@ struct ospi_s {
138142
PinName ssel;
139143
PinName dqs;
140144
bool dmaInitialized;
145+
#if MBED_CONF_RTOS_PRESENT
141146
osSemaphoreId_t semaphoreId;
142147
osRtxSemaphore_t semaphoreMem;
148+
#endif
143149
};
144150

145151
#ifdef __cplusplus

‎targets/TARGET_STM/TARGET_STM32U5/stm_dma_info.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ static const DMALinkInfo SPIRxDMALinks[] = {
4141
/// Mapping from OSPI index to DMA link info
4242
static const DMALinkInfo OSPIDMALinks[] = {
4343
{1, 6, GPDMA1_REQUEST_OCTOSPI1},
44+
#if defined(OCTOSPI2)
4445
{1, 7, GPDMA1_REQUEST_OCTOSPI2}
46+
#endif
4547
};
4648

4749
#endif //MBED_OS_STM_DMA_INFO_H

‎targets/TARGET_STM/TARGET_STM32WB/objects.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
#endif
3535

3636
#include "stm_dma_info.h"
37+
#if MBED_CONF_RTOS_PRESENT
3738
#include "cmsis_os.h"
3839
#include "cmsis_os2.h"
40+
#endif
3941

4042
#ifdef __cplusplus
4143
extern "C" {
@@ -103,8 +105,10 @@ struct qspi_s {
103105
PinName sclk;
104106
PinName ssel;
105107
bool dmaInitialized;
108+
#if MBED_CONF_RTOS_PRESENT
106109
osSemaphoreId_t semaphoreId;
107110
osRtxSemaphore_t semaphoreMem;
111+
#endif
108112
};
109113
#endif
110114

0 commit comments

Comments
 (0)