Skip to content

Commit cb3456d

Browse files
dpgeorgedpgeorge
committed
stm32: Don't use %lu or %lx for formatting, use just %u or %x.
On this 32-bit arch there's no need to use the long version of the format specifier. It's only there to appease the compiler which checks the type of the args passed to printf. Removing the "l" saves a bit of code space.
1 parent b614dc7 commit cb3456d

7 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎ports/stm32/adc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
310310
pyb_obj_adc_t *self = self_in;
311311
mp_print_str(print, "<ADC on ");
312312
mp_obj_print_helper(print, self->pin_name, PRINT_STR);
313-
mp_printf(print, " channel=%lu>", self->channel);
313+
mp_printf(print, " channel=%u>", self->channel);
314314
}
315315

316316
/// \classmethod \constructor(pin)

‎ports/stm32/extint.c‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -387,44 +387,44 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj, extint_obj_swint);
387387
/// Dump the values of the EXTI registers.
388388
STATIC mp_obj_t extint_regs(void) {
389389
#if defined(STM32L4)
390-
printf("EXTI_IMR1 %08lx\n", EXTI->IMR1);
391-
printf("EXTI_IMR2 %08lx\n", EXTI->IMR2);
392-
printf("EXTI_EMR1 %08lx\n", EXTI->EMR1);
393-
printf("EXTI_EMR2 %08lx\n", EXTI->EMR2);
394-
printf("EXTI_RTSR1 %08lx\n", EXTI->RTSR1);
395-
printf("EXTI_RTSR2 %08lx\n", EXTI->RTSR2);
396-
printf("EXTI_FTSR1 %08lx\n", EXTI->FTSR1);
397-
printf("EXTI_FTSR2 %08lx\n", EXTI->FTSR2);
398-
printf("EXTI_SWIER1 %08lx\n", EXTI->SWIER1);
399-
printf("EXTI_SWIER2 %08lx\n", EXTI->SWIER2);
400-
printf("EXTI_PR1 %08lx\n", EXTI->PR1);
401-
printf("EXTI_PR2 %08lx\n", EXTI->PR2);
390+
printf("EXTI_IMR1 %08x\n", (unsigned int)EXTI->IMR1);
391+
printf("EXTI_IMR2 %08x\n", (unsigned int)EXTI->IMR2);
392+
printf("EXTI_EMR1 %08x\n", (unsigned int)EXTI->EMR1);
393+
printf("EXTI_EMR2 %08x\n", (unsigned int)EXTI->EMR2);
394+
printf("EXTI_RTSR1 %08x\n", (unsigned int)EXTI->RTSR1);
395+
printf("EXTI_RTSR2 %08x\n", (unsigned int)EXTI->RTSR2);
396+
printf("EXTI_FTSR1 %08x\n", (unsigned int)EXTI->FTSR1);
397+
printf("EXTI_FTSR2 %08x\n", (unsigned int)EXTI->FTSR2);
398+
printf("EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
399+
printf("EXTI_SWIER2 %08x\n", (unsigned int)EXTI->SWIER2);
400+
printf("EXTI_PR1 %08x\n", (unsigned int)EXTI->PR1);
401+
printf("EXTI_PR2 %08x\n", (unsigned int)EXTI->PR2);
402402
#elif defined(STM32H7)
403-
printf("EXTI_IMR1 %08lx\n", EXTI_D1->IMR1);
404-
printf("EXTI_IMR2 %08lx\n", EXTI_D1->IMR2);
405-
printf("EXTI_IMR3 %08lx\n", EXTI_D1->IMR3);
406-
printf("EXTI_EMR1 %08lx\n", EXTI_D1->EMR1);
407-
printf("EXTI_EMR2 %08lx\n", EXTI_D1->EMR2);
408-
printf("EXTI_EMR3 %08lx\n", EXTI_D1->EMR3);
409-
printf("EXTI_RTSR1 %08lx\n", EXTI->RTSR1);
410-
printf("EXTI_RTSR2 %08lx\n", EXTI->RTSR2);
411-
printf("EXTI_RTSR3 %08lx\n", EXTI->RTSR3);
412-
printf("EXTI_FTSR1 %08lx\n", EXTI->FTSR1);
413-
printf("EXTI_FTSR2 %08lx\n", EXTI->FTSR2);
414-
printf("EXTI_FTSR3 %08lx\n", EXTI->FTSR3);
415-
printf("EXTI_SWIER1 %08lx\n", EXTI->SWIER1);
416-
printf("EXTI_SWIER2 %08lx\n", EXTI->SWIER2);
417-
printf("EXTI_SWIER3 %08lx\n", EXTI->SWIER3);
418-
printf("EXTI_PR1 %08lx\n", EXTI_D1->PR1);
419-
printf("EXTI_PR2 %08lx\n", EXTI_D1->PR2);
420-
printf("EXTI_PR3 %08lx\n", EXTI_D1->PR3);
403+
printf("EXTI_IMR1 %08x\n", (unsigned int)EXTI_D1->IMR1);
404+
printf("EXTI_IMR2 %08x\n", (unsigned int)EXTI_D1->IMR2);
405+
printf("EXTI_IMR3 %08x\n", (unsigned int)EXTI_D1->IMR3);
406+
printf("EXTI_EMR1 %08x\n", (unsigned int)EXTI_D1->EMR1);
407+
printf("EXTI_EMR2 %08x\n", (unsigned int)EXTI_D1->EMR2);
408+
printf("EXTI_EMR3 %08x\n", (unsigned int)EXTI_D1->EMR3);
409+
printf("EXTI_RTSR1 %08x\n", (unsigned int)EXTI->RTSR1);
410+
printf("EXTI_RTSR2 %08x\n", (unsigned int)EXTI->RTSR2);
411+
printf("EXTI_RTSR3 %08x\n", (unsigned int)EXTI->RTSR3);
412+
printf("EXTI_FTSR1 %08x\n", (unsigned int)EXTI->FTSR1);
413+
printf("EXTI_FTSR2 %08x\n", (unsigned int)EXTI->FTSR2);
414+
printf("EXTI_FTSR3 %08x\n", (unsigned int)EXTI->FTSR3);
415+
printf("EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
416+
printf("EXTI_SWIER2 %08x\n", (unsigned int)EXTI->SWIER2);
417+
printf("EXTI_SWIER3 %08x\n", (unsigned int)EXTI->SWIER3);
418+
printf("EXTI_PR1 %08x\n", (unsigned int)EXTI_D1->PR1);
419+
printf("EXTI_PR2 %08x\n", (unsigned int)EXTI_D1->PR2);
420+
printf("EXTI_PR3 %08x\n", (unsigned int)EXTI_D1->PR3);
421421
#else
422-
printf("EXTI_IMR %08lx\n", EXTI->IMR);
423-
printf("EXTI_EMR %08lx\n", EXTI->EMR);
424-
printf("EXTI_RTSR %08lx\n", EXTI->RTSR);
425-
printf("EXTI_FTSR %08lx\n", EXTI->FTSR);
426-
printf("EXTI_SWIER %08lx\n", EXTI->SWIER);
427-
printf("EXTI_PR %08lx\n", EXTI->PR);
422+
printf("EXTI_IMR %08x\n", (unsigned int)EXTI->IMR);
423+
printf("EXTI_EMR %08x\n", (unsigned int)EXTI->EMR);
424+
printf("EXTI_RTSR %08x\n", (unsigned int)EXTI->RTSR);
425+
printf("EXTI_FTSR %08x\n", (unsigned int)EXTI->FTSR);
426+
printf("EXTI_SWIER %08x\n", (unsigned int)EXTI->SWIER);
427+
printf("EXTI_PR %08x\n", (unsigned int)EXTI->PR);
428428
#endif
429429
return mp_const_none;
430430
}
@@ -534,7 +534,7 @@ void Handle_EXTI_Irq(uint32_t line) {
534534
// Uncaught exception; disable the callback so it doesn't run again.
535535
*cb = mp_const_none;
536536
extint_disable(line);
537-
printf("Uncaught exception in ExtInt interrupt handler line %lu\n", line);
537+
printf("Uncaught exception in ExtInt interrupt handler line %u\n", (unsigned int)line);
538538
mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
539539
}
540540
gc_unlock();

‎ports/stm32/led.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void led_debug(int n, int delay) {
281281

282282
void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
283283
pyb_led_obj_t *self = self_in;
284-
mp_printf(print, "LED(%lu)", self->led_id);
284+
mp_printf(print, "LED(%u)", self->led_id);
285285
}
286286

287287
/// \classmethod \constructor(id)

‎ports/stm32/modmachine.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
140140
// get and print clock speeds
141141
// SYSCLK=168MHz, HCLK=168MHz, PCLK1=42MHz, PCLK2=84MHz
142142
{
143-
printf("S=%lu\nH=%lu\nP1=%lu\nP2=%lu\n",
144-
HAL_RCC_GetSysClockFreq(),
145-
HAL_RCC_GetHCLKFreq(),
146-
HAL_RCC_GetPCLK1Freq(),
147-
HAL_RCC_GetPCLK2Freq());
143+
printf("S=%u\nH=%u\nP1=%u\nP2=%u\n",
144+
(unsigned int)HAL_RCC_GetSysClockFreq(),
145+
(unsigned int)HAL_RCC_GetHCLKFreq(),
146+
(unsigned int)HAL_RCC_GetPCLK1Freq(),
147+
(unsigned int)HAL_RCC_GetPCLK2Freq());
148148
}
149149

150150
// to print info about memory

‎ports/stm32/pyb_i2c.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ STATIC void i2c_set_baudrate(I2C_InitTypeDef *init, uint32_t baudrate) {
198198
}
199199
}
200200
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
201-
"Unsupported I2C baudrate: %lu", baudrate));
201+
"Unsupported I2C baudrate: %u", baudrate));
202202
}
203203

204204
uint32_t pyb_i2c_get_baudrate(I2C_HandleTypeDef *i2c) {

‎ports/stm32/servo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(pyb_pwm_set_obj, pyb_pwm_set);
176176

177177
STATIC void pyb_servo_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
178178
pyb_servo_obj_t *self = self_in;
179-
mp_printf(print, "<Servo %lu at %luus>", self - &pyb_servo_obj[0] + 1, 10 * self->pulse_cur);
179+
mp_printf(print, "<Servo %u at %uus>", self - &pyb_servo_obj[0] + 1, 10 * self->pulse_cur);
180180
}
181181

182182
/// \classmethod \constructor(id)

‎ports/stm32/timer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ void timer_irq_handler(uint tim_id) {
14591459
if (unhandled != 0) {
14601460
__HAL_TIM_DISABLE_IT(&tim->tim, unhandled);
14611461
__HAL_TIM_CLEAR_IT(&tim->tim, unhandled);
1462-
printf("Unhandled interrupt SR=0x%02lx (now disabled)\n", unhandled);
1462+
printf("Unhandled interrupt SR=0x%02x (now disabled)\n", (unsigned int)unhandled);
14631463
}
14641464
}
14651465
}

0 commit comments

Comments
 (0)