Skip to content

Commit c9ee49e

Browse files
fpistmfpistm
committed
feat: allow USE_HAL_PPP_REGISTER_CALLBACKS redefinition
Fixes stm32duino#2079 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 96d8c93 commit c9ee49e

19 files changed

+1028
-0
lines changed

Diff for: ‎system/STM32C0xx/stm32c0xx_hal_conf_default.h

+26
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,45 @@ extern "C" {
7272
* for possible callback identifiers defined in HAL_PPP_CallbackIDTypeDef
7373
* for each PPP peripheral).
7474
*/
75+
#if !defined(USE_HAL_ADC_REGISTER_CALLBACKS)
7576
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
77+
#endif
78+
#if !defined(USE_HAL_I2C_REGISTER_CALLBACKS)
7679
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
80+
#endif
81+
#if !defined(USE_HAL_IRDA_REGISTER_CALLBACKS)
7782
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
83+
#endif
84+
#if !defined(USE_HAL_I2S_REGISTER_CALLBACKS)
7885
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
86+
#endif
87+
#if !defined(USE_HAL_IWDG_REGISTER_CALLBACKS)
7988
#define USE_HAL_IWDG_REGISTER_CALLBACKS 0U /* IWDG register callback disabled */
89+
#endif
90+
#if !defined(USE_HAL_RTC_REGISTER_CALLBACKS)
8091
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
92+
#endif
93+
#if !defined(USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
8194
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
95+
#endif
96+
#if !defined(USE_HAL_SMBUS_REGISTER_CALLBACKS)
8297
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
98+
#endif
99+
#if !defined(USE_HAL_SPI_REGISTER_CALLBACKS)
83100
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
101+
#endif
102+
#if !defined(USE_HAL_TIM_REGISTER_CALLBACKS)
84103
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
104+
#endif
105+
#if !defined(USE_HAL_UART_REGISTER_CALLBACKS)
85106
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
107+
#endif
108+
#if !defined(USE_HAL_USART_REGISTER_CALLBACKS)
86109
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
110+
#endif
111+
#if !defined(USE_HAL_WWDG_REGISTER_CALLBACKS)
87112
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
113+
#endif
88114

89115
/* ########################## Oscillator Values adaptation ####################*/
90116
/**

Diff for: ‎system/STM32F0xx/stm32f0xx_hal_conf_default.h

+36
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,60 @@ in voltage and temperature. */
173173
#define USE_SPI_CRC 0U
174174
#endif
175175

176+
#if !defined(USE_HAL_ADC_REGISTER_CALLBACKS)
176177
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
178+
#endif
179+
#if !defined(USE_HAL_CAN_REGISTER_CALLBACKS)
177180
#define USE_HAL_CAN_REGISTER_CALLBACKS 0U /* CAN register callback disabled */
181+
#endif
182+
#if !defined(USE_HAL_COMP_REGISTER_CALLBACKS)
178183
#define USE_HAL_COMP_REGISTER_CALLBACKS 0U /* COMP register callback disabled */
184+
#endif
185+
#if !defined(USE_HAL_CEC_REGISTER_CALLBACKS)
179186
#define USE_HAL_CEC_REGISTER_CALLBACKS 0U /* CEC register callback disabled */
187+
#endif
188+
#if !defined(USE_HAL_DAC_REGISTER_CALLBACKS)
180189
#define USE_HAL_DAC_REGISTER_CALLBACKS 0U /* DAC register callback disabled */
190+
#endif
191+
#if !defined(USE_HAL_I2C_REGISTER_CALLBACKS)
181192
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
193+
#endif
194+
#if !defined(USE_HAL_SMBUS_REGISTER_CALLBACKS)
182195
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
196+
#endif
197+
#if !defined(USE_HAL_UART_REGISTER_CALLBACKS)
183198
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
199+
#endif
200+
#if !defined(USE_HAL_USART_REGISTER_CALLBACKS)
184201
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
202+
#endif
203+
#if !defined(USE_HAL_IRDA_REGISTER_CALLBACKS)
185204
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
205+
#endif
206+
#if !defined(USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
186207
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
208+
#endif
209+
#if !defined(USE_HAL_WWDG_REGISTER_CALLBACKS)
187210
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
211+
#endif
212+
#if !defined(USE_HAL_RTC_REGISTER_CALLBACKS)
188213
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
214+
#endif
215+
#if !defined(USE_HAL_SPI_REGISTER_CALLBACKS)
189216
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
217+
#endif
218+
#if !defined(USE_HAL_I2S_REGISTER_CALLBACKS)
190219
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
220+
#endif
221+
#if !defined(USE_HAL_TIM_REGISTER_CALLBACKS)
191222
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
223+
#endif
224+
#if !defined(USE_HAL_TSC_REGISTER_CALLBACKS)
192225
#define USE_HAL_TSC_REGISTER_CALLBACKS 0U /* TSC register callback disabled */
226+
#endif
227+
#if !defined(USE_HAL_PCD_REGISTER_CALLBACKS)
193228
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
229+
#endif
194230

195231
/* ########################## Assert Selection ############################## */
196232
/**

Diff for: ‎system/STM32F1xx/stm32f1xx_hal_conf_default.h

+46
Original file line numberDiff line numberDiff line change
@@ -140,29 +140,75 @@ extern "C" {
140140
#define PREFETCH_ENABLE 1U
141141
#endif
142142

143+
#if !defined(USE_HAL_ADC_REGISTER_CALLBACKS)
143144
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
145+
#endif
146+
#if !defined(USE_HAL_CAN_REGISTER_CALLBACKS)
144147
#define USE_HAL_CAN_REGISTER_CALLBACKS 0U /* CAN register callback disabled */
148+
#endif
149+
#if !defined(USE_HAL_CEC_REGISTER_CALLBACKS)
145150
#define USE_HAL_CEC_REGISTER_CALLBACKS 0U /* CEC register callback disabled */
151+
#endif
152+
#if !defined(USE_HAL_DAC_REGISTER_CALLBACKS)
146153
#define USE_HAL_DAC_REGISTER_CALLBACKS 0U /* DAC register callback disabled */
154+
#endif
155+
#if !defined(USE_HAL_ETH_REGISTER_CALLBACKS)
147156
#define USE_HAL_ETH_REGISTER_CALLBACKS 0U /* ETH register callback disabled */
157+
#endif
158+
#if !defined(USE_HAL_HCD_REGISTER_CALLBACKS)
148159
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
160+
#endif
161+
#if !defined(USE_HAL_I2C_REGISTER_CALLBACKS)
149162
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
163+
#endif
164+
#if !defined(USE_HAL_I2S_REGISTER_CALLBACKS)
150165
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
166+
#endif
167+
#if !defined(USE_HAL_MMC_REGISTER_CALLBACKS)
151168
#define USE_HAL_MMC_REGISTER_CALLBACKS 0U /* MMC register callback disabled */
169+
#endif
170+
#if !defined(USE_HAL_NAND_REGISTER_CALLBACKS)
152171
#define USE_HAL_NAND_REGISTER_CALLBACKS 0U /* NAND register callback disabled */
172+
#endif
173+
#if !defined(USE_HAL_NOR_REGISTER_CALLBACKS)
153174
#define USE_HAL_NOR_REGISTER_CALLBACKS 0U /* NOR register callback disabled */
175+
#endif
176+
#if !defined(USE_HAL_PCCARD_REGISTER_CALLBACKS)
154177
#define USE_HAL_PCCARD_REGISTER_CALLBACKS 0U /* PCCARD register callback disabled */
178+
#endif
179+
#if !defined(USE_HAL_PCD_REGISTER_CALLBACKS)
155180
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
181+
#endif
182+
#if !defined(USE_HAL_RTC_REGISTER_CALLBACKS)
156183
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
184+
#endif
185+
#if !defined(USE_HAL_SD_REGISTER_CALLBACKS)
157186
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
187+
#endif
188+
#if !defined(USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
158189
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
190+
#endif
191+
#if !defined(USE_HAL_IRDA_REGISTER_CALLBACKS)
159192
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
193+
#endif
194+
#if !defined(USE_HAL_SRAM_REGISTER_CALLBACKS)
160195
#define USE_HAL_SRAM_REGISTER_CALLBACKS 0U /* SRAM register callback disabled */
196+
#endif
197+
#if !defined(USE_HAL_SPI_REGISTER_CALLBACKS)
161198
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
199+
#endif
200+
#if !defined(USE_HAL_TIM_REGISTER_CALLBACKS)
162201
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
202+
#endif
203+
#if !defined(USE_HAL_UART_REGISTER_CALLBACKS)
163204
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
205+
#endif
206+
#if !defined(USE_HAL_USART_REGISTER_CALLBACKS)
164207
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
208+
#endif
209+
#if !defined(USE_HAL_WWDG_REGISTER_CALLBACKS)
165210
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
211+
#endif
166212

167213
/* ########################## Assert Selection ############################## */
168214
/**

Diff for: ‎system/STM32F2xx/stm32f2xx_hal_conf_default.h

+52
Original file line numberDiff line numberDiff line change
@@ -152,32 +152,84 @@ in voltage and temperature.*/
152152
#define DATA_CACHE_ENABLE 1U
153153
#endif
154154

155+
#if !defined(USE_HAL_ADC_REGISTER_CALLBACKS)
155156
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
157+
#endif
158+
#if !defined(USE_HAL_CAN_REGISTER_CALLBACKS)
156159
#define USE_HAL_CAN_REGISTER_CALLBACKS 0U /* CAN register callback disabled */
160+
#endif
161+
#if !defined(USE_HAL_CRYP_REGISTER_CALLBACKS)
157162
#define USE_HAL_CRYP_REGISTER_CALLBACKS 0U /* CRYP register callback disabled */
163+
#endif
164+
#if !defined(USE_HAL_DAC_REGISTER_CALLBACKS)
158165
#define USE_HAL_DAC_REGISTER_CALLBACKS 0U /* DAC register callback disabled */
166+
#endif
167+
#if !defined(USE_HAL_DCMI_REGISTER_CALLBACKS)
159168
#define USE_HAL_DCMI_REGISTER_CALLBACKS 0U /* DCMI register callback disabled */
169+
#endif
170+
#if !defined(USE_HAL_ETH_REGISTER_CALLBACKS)
160171
#define USE_HAL_ETH_REGISTER_CALLBACKS 0U /* ETH register callback disabled */
172+
#endif
173+
#if !defined(USE_HAL_HASH_REGISTER_CALLBACKS)
161174
#define USE_HAL_HASH_REGISTER_CALLBACKS 0U /* HASH register callback disabled */
175+
#endif
176+
#if !defined(USE_HAL_HCD_REGISTER_CALLBACKS)
162177
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
178+
#endif
179+
#if !defined(USE_HAL_I2C_REGISTER_CALLBACKS)
163180
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
181+
#endif
182+
#if !defined(USE_HAL_I2S_REGISTER_CALLBACKS)
164183
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
184+
#endif
185+
#if !defined(USE_HAL_MMC_REGISTER_CALLBACKS)
165186
#define USE_HAL_MMC_REGISTER_CALLBACKS 0U /* MMC register callback disabled */
187+
#endif
188+
#if !defined(USE_HAL_NAND_REGISTER_CALLBACKS)
166189
#define USE_HAL_NAND_REGISTER_CALLBACKS 0U /* NAND register callback disabled */
190+
#endif
191+
#if !defined(USE_HAL_NOR_REGISTER_CALLBACKS)
167192
#define USE_HAL_NOR_REGISTER_CALLBACKS 0U /* NOR register callback disabled */
193+
#endif
194+
#if !defined(USE_HAL_PCCARD_REGISTER_CALLBACKS)
168195
#define USE_HAL_PCCARD_REGISTER_CALLBACKS 0U /* PCCARD register callback disabled */
196+
#endif
197+
#if !defined(USE_HAL_PCD_REGISTER_CALLBACKS)
169198
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
199+
#endif
200+
#if !defined(USE_HAL_RTC_REGISTER_CALLBACKS)
170201
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
202+
#endif
203+
#if !defined(USE_HAL_RNG_REGISTER_CALLBACKS)
171204
#define USE_HAL_RNG_REGISTER_CALLBACKS 0U /* RNG register callback disabled */
205+
#endif
206+
#if !defined(USE_HAL_SD_REGISTER_CALLBACKS)
172207
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
208+
#endif
209+
#if !defined(USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
173210
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
211+
#endif
212+
#if !defined(USE_HAL_IRDA_REGISTER_CALLBACKS)
174213
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
214+
#endif
215+
#if !defined(USE_HAL_SRAM_REGISTER_CALLBACKS)
175216
#define USE_HAL_SRAM_REGISTER_CALLBACKS 0U /* SRAM register callback disabled */
217+
#endif
218+
#if !defined(USE_HAL_SPI_REGISTER_CALLBACKS)
176219
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
220+
#endif
221+
#if !defined(USE_HAL_TIM_REGISTER_CALLBACKS)
177222
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
223+
#endif
224+
#if !defined(USE_HAL_UART_REGISTER_CALLBACKS)
178225
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
226+
#endif
227+
#if !defined(USE_HAL_USART_REGISTER_CALLBACKS)
179228
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
229+
#endif
230+
#if !defined(USE_HAL_WWDG_REGISTER_CALLBACKS)
180231
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
232+
#endif
181233

182234
/* ########################## Assert Selection ############################## */
183235
/**

Diff for: ‎system/STM32F3xx/stm32f3xx_hal_conf_default.h

+50
Original file line numberDiff line numberDiff line change
@@ -172,31 +172,81 @@ in voltage and temperature. */
172172
#define USE_SPI_CRC 0U
173173
#endif
174174

175+
#if !defined(USE_HAL_ADC_REGISTER_CALLBACKS)
175176
#define USE_HAL_ADC_REGISTER_CALLBACKS 0U /* ADC register callback disabled */
177+
#endif
178+
#if !defined(USE_HAL_CAN_REGISTER_CALLBACKS)
176179
#define USE_HAL_CAN_REGISTER_CALLBACKS 0U /* CAN register callback disabled */
180+
#endif
181+
#if !defined(USE_HAL_COMP_REGISTER_CALLBACKS)
177182
#define USE_HAL_COMP_REGISTER_CALLBACKS 0U /* COMP register callback disabled */
183+
#endif
184+
#if !defined(USE_HAL_CEC_REGISTER_CALLBACKS)
178185
#define USE_HAL_CEC_REGISTER_CALLBACKS 0U /* CEC register callback disabled */
186+
#endif
187+
#if !defined(USE_HAL_DAC_REGISTER_CALLBACKS)
179188
#define USE_HAL_DAC_REGISTER_CALLBACKS 0U /* DAC register callback disabled */
189+
#endif
190+
#if !defined(USE_HAL_SRAM_REGISTER_CALLBACKS)
180191
#define USE_HAL_SRAM_REGISTER_CALLBACKS 0U /* SRAM register callback disabled */
192+
#endif
193+
#if !defined(USE_HAL_SMBUS_REGISTER_CALLBACKS)
181194
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
195+
#endif
196+
#if !defined(USE_HAL_SDADC_REGISTER_CALLBACKS)
182197
#define USE_HAL_SDADC_REGISTER_CALLBACKS 0U /* SDADC register callback disabled */
198+
#endif
199+
#if !defined(USE_HAL_NAND_REGISTER_CALLBACKS)
183200
#define USE_HAL_NAND_REGISTER_CALLBACKS 0U /* NAND register callback disabled */
201+
#endif
202+
#if !defined(USE_HAL_NOR_REGISTER_CALLBACKS)
184203
#define USE_HAL_NOR_REGISTER_CALLBACKS 0U /* NOR register callback disabled */
204+
#endif
205+
#if !defined(USE_HAL_PCCARD_REGISTER_CALLBACKS)
185206
#define USE_HAL_PCCARD_REGISTER_CALLBACKS 0U /* PCCARD register callback disabled */
207+
#endif
208+
#if !defined(USE_HAL_HRTIM_REGISTER_CALLBACKS)
186209
#define USE_HAL_HRTIM_REGISTER_CALLBACKS 0U /* HRTIM register callback disabled */
210+
#endif
211+
#if !defined(USE_HAL_I2C_REGISTER_CALLBACKS)
187212
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
213+
#endif
214+
#if !defined(USE_HAL_UART_REGISTER_CALLBACKS)
188215
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
216+
#endif
217+
#if !defined(USE_HAL_USART_REGISTER_CALLBACKS)
189218
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
219+
#endif
220+
#if !defined(USE_HAL_IRDA_REGISTER_CALLBACKS)
190221
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
222+
#endif
223+
#if !defined(USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
191224
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
225+
#endif
226+
#if !defined(USE_HAL_WWDG_REGISTER_CALLBACKS)
192227
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
228+
#endif
229+
#if !defined(USE_HAL_OPAMP_REGISTER_CALLBACKS)
193230
#define USE_HAL_OPAMP_REGISTER_CALLBACKS 0U /* OPAMP register callback disabled */
231+
#endif
232+
#if !defined(USE_HAL_RTC_REGISTER_CALLBACKS)
194233
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
234+
#endif
235+
#if !defined(USE_HAL_SPI_REGISTER_CALLBACKS)
195236
#define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */
237+
#endif
238+
#if !defined(USE_HAL_I2S_REGISTER_CALLBACKS)
196239
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
240+
#endif
241+
#if !defined(USE_HAL_TIM_REGISTER_CALLBACKS)
197242
#define USE_HAL_TIM_REGISTER_CALLBACKS 0U /* TIM register callback disabled */
243+
#endif
244+
#if !defined(USE_HAL_TSC_REGISTER_CALLBACKS)
198245
#define USE_HAL_TSC_REGISTER_CALLBACKS 0U /* TSC register callback disabled */
246+
#endif
247+
#if !defined(USE_HAL_PCD_REGISTER_CALLBACKS)
199248
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
249+
#endif
200250

201251
/* ########################## Assert Selection ############################## */
202252
/**

0 commit comments

Comments
 (0)