From 599967fe26bb361e122619fbfc7b2f53bce1964e Mon Sep 17 00:00:00 2001 From: Firas Hamdi Date: Thu, 18 Apr 2024 14:45:48 +0200 Subject: [PATCH] cpu/samd5x: reword & correct debug output --- cpu/samd5x/periph/can.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/cpu/samd5x/periph/can.c b/cpu/samd5x/periph/can.c index acf201bac3..64b8c325e4 100644 --- a/cpu/samd5x/periph/can.c +++ b/cpu/samd5x/periph/can.c @@ -307,19 +307,19 @@ void can_init(can_t *dev, const can_conf_t *conf) static void _dump_msg_ram_section(can_t *dev) { puts("start address|\tsize of section"); - printf("Standard filters|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.std_filter), + printf("Standard filters|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.std_filter), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.std_filter))); - printf("Extended filters|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.ext_filter), + printf("Extended filters|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.ext_filter), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.ext_filter))); - printf("Rx FIFO 0|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_fifo_0), + printf("Rx FIFO 0|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_fifo_0), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.rx_fifo_0))); - printf("Rx FIFO 1|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_fifo_1), + printf("Rx FIFO 1|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_fifo_1), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.rx_fifo_1))); - printf("Rx buffer|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_buffer), + printf("Rx buffer|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.rx_buffer), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.rx_buffer))); - printf("Tx event FIFO|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.tx_event_fifo), + printf("Tx event FIFO|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.tx_event_fifo), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.tx_event_fifo))); - printf("Tx buffer|\t0x%02lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.tx_fifo_queue), + printf("Tx buffer|\t0x%08lx|\t%lu\n", (uint32_t)(dev->msg_ram_conf.tx_fifo_queue), (uint32_t)(ARRAY_SIZE(dev->msg_ram_conf.tx_fifo_queue))); } @@ -529,8 +529,9 @@ static int _set_filter(candev_t *candev, const struct can_filter *filter) dev->msg_ram_conf.ext_filter[idx].XIDFE_1.bit.EFT = CANDEV_SAMD5X_CLASSIC_FILTER; dev->msg_ram_conf.ext_filter[idx].XIDFE_0.bit.EFID1 = filter->can_id; dev->msg_ram_conf.ext_filter[idx].XIDFE_1.bit.EFID2 = filter->can_mask & CAN_EFF_MASK; - DEBUG("Extended message ID filter element N°%d = 0x%02lx\n", idx, - (uint32_t)(dev->msg_ram_conf.std_filter[idx].SIDFE_0.reg)); + DEBUG("Extended filter element N°%d: F0 = 0x%08lx, F1 = 0x%08lx\n", idx, + (uint32_t)(dev->msg_ram_conf.ext_filter[idx].XIDFE_0.reg), + (uint32_t)(dev->msg_ram_conf.ext_filter[idx].XIDFE_1.reg)); _set_mode(dev->conf->can, MODE_INIT); /* Reject all extended frames that are not matching the filters applied */ dev->conf->can->GFC.reg |= CAN_GFC_ANFE((uint32_t)CAN_REJECT); @@ -564,7 +565,7 @@ static int _set_filter(candev_t *candev, const struct can_filter *filter) dev->msg_ram_conf.std_filter[idx].SIDFE_0.bit.SFT = CANDEV_SAMD5X_CLASSIC_FILTER; dev->msg_ram_conf.std_filter[idx].SIDFE_0.bit.SFID1 = filter->can_id & CAN_SFF_MASK; dev->msg_ram_conf.std_filter[idx].SIDFE_0.bit.SFID2 = filter->can_mask & CAN_SFF_MASK; - DEBUG("Standard message ID filter element N°%d = 0x%02lx\n", idx, + DEBUG("Standard filter element N°%d: S0 = 0x%08lx\n", idx, (uint32_t)(dev->msg_ram_conf.std_filter[idx].SIDFE_0.reg)); _set_mode(dev->conf->can, MODE_INIT); /* Reject all standard frames that are not matching the filters applied */ @@ -692,7 +693,7 @@ static void _isr(candev_t *candev) can_t *dev = container_of(candev, can_t, candev); uint32_t irq_reg = dev->conf->can->IR.reg; - DEBUG("isr: IR reg = 0x%02lx\n", irq_reg); + DEBUG("isr: IR reg = 0x%08lx\n", irq_reg); /* Interrupt triggered due to reception of CAN frame on Rx_FIFO_0 */ if (irq_reg & CAN_IR_RF0N) {