Skip to content

Commit fa4321a

Browse files
committed
Remove comments from interrupt handlers at startup code
(weak declaration is now being correctly replaced with strong implementation by linker)
1 parent 398b75b commit fa4321a

File tree

6 files changed

+160
-239
lines changed

6 files changed

+160
-239
lines changed

DeviceCode/Targets/Native/STM32F4xx/Int_Handlers.c

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -157,78 +157,4 @@ __weak void SysTick_Handler(void)
157157
HAL_SYSTICK_IRQHandler();
158158
}
159159

160-
#ifndef FEATURE_USB_DEBUG
161-
void OTG_FS_IRQHandler(void)
162-
{
163-
}
164-
#endif
165-
166-
167-
#ifndef FEATURE_GPIO
168-
void EXTI0_IRQHandler(void) // EXTI0
169-
{}
170-
171-
void EXTI1_IRQHandler(void) // EXTI1
172-
{}
173-
174-
void EXTI2_IRQHandler(void) // EXTI2
175-
{}
176-
177-
void EXTI3_IRQHandler(void) // EXTI3
178-
{}
179-
180-
void EXTI4_IRQHandler(void) // EXTI4
181-
{}
182-
183-
void EXTI9_5_IRQHandler(void) // EXTI5 - EXTI9
184-
{}
185-
186-
void EXTI15_10_IRQHandler(void) // EXTI10 - EXTI15
187-
{}
188-
#endif
189-
190-
#ifndef FEATURE_I2C
191-
/**
192-
* @brief This function handles I2C event interrupt request.
193-
* @param None
194-
* @retval None
195-
* @Note This function is redefined in "main.h" and related to I2C data transmission
196-
*/
197-
void I2C1_EV_IRQHandler(void)
198-
{}
199-
200-
/**
201-
* @brief This function handles I2C error interrupt request.
202-
* @param None
203-
* @retval None
204-
* @Note This function is redefined in "main.h" and related to I2C error
205-
*/
206-
void I2C1_ER_IRQHandler(void)
207-
{}
208-
#endif
209-
210-
#ifndef FEATURE_USART
211-
void USART1_IRQHandler(void)
212-
{}
213-
214-
void USART2_IRQHandler(void)
215-
{}
216-
217-
void USART3_IRQHandler(void)
218-
{}
219-
220-
void UART4_IRQHandler(void)
221-
{}
222-
223-
void USART6_IRQHandler(void)
224-
{}
225-
226-
void UART7_IRQHandler(void)
227-
{}
228-
229-
void UART8_IRQHandler(void)
230-
{}
231-
#endif
232-
233-
234160
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Solutions/MCBSTM32F400/TinyBooter/GNU_S/startup_tinyBooter.s

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,20 @@ ARM_Vectors:
304304
.weak RCC_IRQHandler
305305
.thumb_set RCC_IRQHandler,Default_Handler
306306

307-
/*.weak EXTI0_IRQHandler
308-
.thumb_set EXTI0_IRQHandler,Default_Handler*/
307+
.weak EXTI0_IRQHandler
308+
.thumb_set EXTI0_IRQHandler,Default_Handler
309309

310-
/*.weak EXTI1_IRQHandler
311-
.thumb_set EXTI1_IRQHandler,Default_Handler*/
310+
.weak EXTI1_IRQHandler
311+
.thumb_set EXTI1_IRQHandler,Default_Handler
312312

313-
/*.weak EXTI2_IRQHandler
314-
.thumb_set EXTI2_IRQHandler,Default_Handler*/
313+
.weak EXTI2_IRQHandler
314+
.thumb_set EXTI2_IRQHandler,Default_Handler
315315

316-
/*.weak EXTI3_IRQHandler
317-
.thumb_set EXTI3_IRQHandler,Default_Handler*/
316+
.weak EXTI3_IRQHandler
317+
.thumb_set EXTI3_IRQHandler,Default_Handler
318318

319-
/*.weak EXTI4_IRQHandler
320-
.thumb_set EXTI4_IRQHandler,Default_Handler*/
319+
.weak EXTI4_IRQHandler
320+
.thumb_set EXTI4_IRQHandler,Default_Handler
321321

322322
.weak DMA1_Stream0_IRQHandler
323323
.thumb_set DMA1_Stream0_IRQHandler,Default_Handler
@@ -355,8 +355,8 @@ ARM_Vectors:
355355
.weak CAN1_SCE_IRQHandler
356356
.thumb_set CAN1_SCE_IRQHandler,Default_Handler
357357

358-
/*.weak EXTI9_5_IRQHandler
359-
.thumb_set EXTI9_5_IRQHandler,Default_Handler*/
358+
.weak EXTI9_5_IRQHandler
359+
.thumb_set EXTI9_5_IRQHandler,Default_Handler
360360

361361
.weak TIM1_BRK_TIM9_IRQHandler
362362
.thumb_set TIM1_BRK_TIM9_IRQHandler,Default_Handler
@@ -370,21 +370,20 @@ ARM_Vectors:
370370
.weak TIM1_CC_IRQHandler
371371
.thumb_set TIM1_CC_IRQHandler,Default_Handler
372372

373-
/* implemented at Time_functions.cpp */
374-
/*.weak TIM2_IRQHandler
375-
.thumb_set TIM2_IRQHandler,Default_Handler*/
373+
.weak TIM2_IRQHandler
374+
.thumb_set TIM2_IRQHandler,Default_Handler
376375

377376
.weak TIM3_IRQHandler
378377
.thumb_set TIM3_IRQHandler,Default_Handler
379378

380379
.weak TIM4_IRQHandler
381380
.thumb_set TIM4_IRQHandler,Default_Handler
382381

383-
/*.weak I2C1_EV_IRQHandler
384-
.thumb_set I2C1_EV_IRQHandler,Default_Handler*/
382+
.weak I2C1_EV_IRQHandler
383+
.thumb_set I2C1_EV_IRQHandler,Default_Handler
385384

386-
/*.weak I2C1_ER_IRQHandler
387-
.thumb_set I2C1_ER_IRQHandler,Default_Handler*/
385+
.weak I2C1_ER_IRQHandler
386+
.thumb_set I2C1_ER_IRQHandler,Default_Handler
388387

389388
.weak I2C2_EV_IRQHandler
390389
.thumb_set I2C2_EV_IRQHandler,Default_Handler
@@ -398,17 +397,17 @@ ARM_Vectors:
398397
.weak SPI2_IRQHandler
399398
.thumb_set SPI2_IRQHandler,Default_Handler
400399

401-
/*.weak USART1_IRQHandler
402-
.thumb_set USART1_IRQHandler,Default_Handler*/
400+
.weak USART1_IRQHandler
401+
.thumb_set USART1_IRQHandler,Default_Handler
403402

404-
/*.weak USART2_IRQHandler
405-
.thumb_set USART2_IRQHandler,Default_Handler*/
403+
.weak USART2_IRQHandler
404+
.thumb_set USART2_IRQHandler,Default_Handler
406405

407-
/*.weak USART3_IRQHandler
408-
.thumb_set USART3_IRQHandler,Default_Handler*/
406+
.weak USART3_IRQHandler
407+
.thumb_set USART3_IRQHandler,Default_Handler
409408

410-
/*.weak EXTI15_10_IRQHandler
411-
.thumb_set EXTI15_10_IRQHandler,Default_Handler*/
409+
.weak EXTI15_10_IRQHandler
410+
.thumb_set EXTI15_10_IRQHandler,Default_Handler
412411

413412
.weak RTC_Alarm_IRQHandler
414413
.thumb_set RTC_Alarm_IRQHandler,Default_Handler
@@ -443,8 +442,8 @@ ARM_Vectors:
443442
.weak SPI3_IRQHandler
444443
.thumb_set SPI3_IRQHandler,Default_Handler
445444

446-
/*.weak UART4_IRQHandler
447-
.thumb_set UART4_IRQHandler,Default_Handler*/
445+
.weak UART4_IRQHandler
446+
.thumb_set UART4_IRQHandler,Default_Handler
448447

449448
.weak UART5_IRQHandler
450449
.thumb_set UART5_IRQHandler,Default_Handler
@@ -488,8 +487,8 @@ ARM_Vectors:
488487
.weak CAN2_SCE_IRQHandler
489488
.thumb_set CAN2_SCE_IRQHandler,Default_Handler
490489

491-
/*.weak OTG_FS_IRQHandler
492-
.thumb_set OTG_FS_IRQHandler,Default_Handler*/
490+
.weak OTG_FS_IRQHandler
491+
.thumb_set OTG_FS_IRQHandler,Default_Handler
493492

494493
.weak DMA2_Stream5_IRQHandler
495494
.thumb_set DMA2_Stream5_IRQHandler,Default_Handler
@@ -500,8 +499,8 @@ ARM_Vectors:
500499
.weak DMA2_Stream7_IRQHandler
501500
.thumb_set DMA2_Stream7_IRQHandler,Default_Handler
502501

503-
/*.weak USART6_IRQHandler
504-
.thumb_set USART6_IRQHandler,Default_Handler*/
502+
.weak USART6_IRQHandler
503+
.thumb_set USART6_IRQHandler,Default_Handler
505504

506505
.weak I2C3_EV_IRQHandler
507506
.thumb_set I2C3_EV_IRQHandler,Default_Handler

Solutions/MCBSTM32F400/TinyCLR/GNU_S/startup_tinyCLR.s

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -321,20 +321,20 @@ ARM_Vectors:
321321
.weak RCC_IRQHandler
322322
.thumb_set RCC_IRQHandler,Default_Handler
323323

324-
/*.weak EXTI0_IRQHandler
325-
.thumb_set EXTI0_IRQHandler,Default_Handler*/
324+
.weak EXTI0_IRQHandler
325+
.thumb_set EXTI0_IRQHandler,Default_Handler
326326

327-
/*.weak EXTI1_IRQHandler
328-
.thumb_set EXTI1_IRQHandler,Default_Handler*/
327+
.weak EXTI1_IRQHandler
328+
.thumb_set EXTI1_IRQHandler,Default_Handler
329329

330-
/*.weak EXTI2_IRQHandler
331-
.thumb_set EXTI2_IRQHandler,Default_Handler*/
330+
.weak EXTI2_IRQHandler
331+
.thumb_set EXTI2_IRQHandler,Default_Handler
332332

333-
/*.weak EXTI3_IRQHandler
334-
.thumb_set EXTI3_IRQHandler,Default_Handler*/
333+
.weak EXTI3_IRQHandler
334+
.thumb_set EXTI3_IRQHandler,Default_Handler
335335

336-
/*.weak EXTI4_IRQHandler
337-
.thumb_set EXTI4_IRQHandler,Default_Handler*/
336+
.weak EXTI4_IRQHandler
337+
.thumb_set EXTI4_IRQHandler,Default_Handler
338338

339339
.weak DMA1_Stream0_IRQHandler
340340
.thumb_set DMA1_Stream0_IRQHandler,Default_Handler
@@ -372,8 +372,8 @@ ARM_Vectors:
372372
.weak CAN1_SCE_IRQHandler
373373
.thumb_set CAN1_SCE_IRQHandler,Default_Handler
374374

375-
/*.weak EXTI9_5_IRQHandler
376-
.thumb_set EXTI9_5_IRQHandler,Default_Handler*/
375+
.weak EXTI9_5_IRQHandler
376+
.thumb_set EXTI9_5_IRQHandler,Default_Handler
377377

378378
.weak TIM1_BRK_TIM9_IRQHandler
379379
.thumb_set TIM1_BRK_TIM9_IRQHandler,Default_Handler
@@ -387,21 +387,20 @@ ARM_Vectors:
387387
.weak TIM1_CC_IRQHandler
388388
.thumb_set TIM1_CC_IRQHandler,Default_Handler
389389

390-
/* implemented at Time_functions.cpp */
391-
/*.weak TIM2_IRQHandler
392-
.thumb_set TIM2_IRQHandler,Default_Handler*/
390+
.weak TIM2_IRQHandler
391+
.thumb_set TIM2_IRQHandler,Default_Handler
393392

394393
.weak TIM3_IRQHandler
395394
.thumb_set TIM3_IRQHandler,Default_Handler
396395

397396
.weak TIM4_IRQHandler
398397
.thumb_set TIM4_IRQHandler,Default_Handler
399398

400-
/*.weak I2C1_EV_IRQHandler
401-
.thumb_set I2C1_EV_IRQHandler,Default_Handler*/
399+
.weak I2C1_EV_IRQHandler
400+
.thumb_set I2C1_EV_IRQHandler,Default_Handler
402401

403-
/*.weak I2C1_ER_IRQHandler
404-
.thumb_set I2C1_ER_IRQHandler,Default_Handler*/
402+
.weak I2C1_ER_IRQHandler
403+
.thumb_set I2C1_ER_IRQHandler,Default_Handler
405404

406405
.weak I2C2_EV_IRQHandler
407406
.thumb_set I2C2_EV_IRQHandler,Default_Handler
@@ -415,17 +414,17 @@ ARM_Vectors:
415414
.weak SPI2_IRQHandler
416415
.thumb_set SPI2_IRQHandler,Default_Handler
417416

418-
/*.weak USART1_IRQHandler
419-
.thumb_set USART1_IRQHandler,Default_Handler*/
417+
.weak USART1_IRQHandler
418+
.thumb_set USART1_IRQHandler,Default_Handler
420419

421-
/*.weak USART2_IRQHandler
422-
.thumb_set USART2_IRQHandler,Default_Handler*/
420+
.weak USART2_IRQHandler
421+
.thumb_set USART2_IRQHandler,Default_Handler
423422

424-
/*.weak USART3_IRQHandler
425-
.thumb_set USART3_IRQHandler,Default_Handler*/
423+
.weak USART3_IRQHandler
424+
.thumb_set USART3_IRQHandler,Default_Handler
426425

427-
/*.weak EXTI15_10_IRQHandler
428-
.thumb_set EXTI15_10_IRQHandler,Default_Handler*/
426+
.weak EXTI15_10_IRQHandler
427+
.thumb_set EXTI15_10_IRQHandler,Default_Handler
429428

430429
.weak RTC_Alarm_IRQHandler
431430
.thumb_set RTC_Alarm_IRQHandler,Default_Handler
@@ -460,8 +459,8 @@ ARM_Vectors:
460459
.weak SPI3_IRQHandler
461460
.thumb_set SPI3_IRQHandler,Default_Handler
462461

463-
/*.weak UART4_IRQHandler
464-
.thumb_set UART4_IRQHandler,Default_Handler*/
462+
.weak UART4_IRQHandler
463+
.thumb_set UART4_IRQHandler,Default_Handler
465464

466465
.weak UART5_IRQHandler
467466
.thumb_set UART5_IRQHandler,Default_Handler
@@ -505,8 +504,8 @@ ARM_Vectors:
505504
.weak CAN2_SCE_IRQHandler
506505
.thumb_set CAN2_SCE_IRQHandler,Default_Handler
507506

508-
/*.weak OTG_FS_IRQHandler
509-
.thumb_set OTG_FS_IRQHandler,Default_Handler*/
507+
.weak OTG_FS_IRQHandler
508+
.thumb_set OTG_FS_IRQHandler,Default_Handler
510509

511510
.weak DMA2_Stream5_IRQHandler
512511
.thumb_set DMA2_Stream5_IRQHandler,Default_Handler
@@ -517,8 +516,8 @@ ARM_Vectors:
517516
.weak DMA2_Stream7_IRQHandler
518517
.thumb_set DMA2_Stream7_IRQHandler,Default_Handler
519518

520-
/*.weak USART6_IRQHandler
521-
.thumb_set USART6_IRQHandler,Default_Handler*/
519+
.weak USART6_IRQHandler
520+
.thumb_set USART6_IRQHandler,Default_Handler
522521

523522
.weak I2C3_EV_IRQHandler
524523
.thumb_set I2C3_EV_IRQHandler,Default_Handler

0 commit comments

Comments
 (0)