Skip to content

Commit 697b04d

Browse files
cppcheck: replace bool 0/1 assignments with false/true (#2409)
* cppcheck: replace bool 0/1 assignments with false/true * revert pyproject * update table * handle 17.3 in a follow up * lil more * supress --------- Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
1 parent 7ffc916 commit 697b04d

8 files changed

Lines changed: 35 additions & 276 deletions

File tree

board/drivers/can_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ can_ring *can_queues[PANDA_CAN_CNT] = {&can_tx1_q, &can_tx2_q, &can_tx3_q};
3838

3939
// ********************* interrupt safe queue *********************
4040
bool can_pop(can_ring *q, CANPacket_t *elem) {
41-
bool ret = 0;
41+
bool ret = false;
4242

4343
ENTER_CRITICAL();
4444
if (q->w_ptr != q->r_ptr) {
@@ -48,7 +48,7 @@ bool can_pop(can_ring *q, CANPacket_t *elem) {
4848
} else {
4949
q->r_ptr += 1U;
5050
}
51-
ret = 1;
51+
ret = true;
5252
}
5353
EXIT_CRITICAL();
5454

board/drivers/fdcan.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ void can_rx(uint8_t can_number) {
170170

171171
uint32_t RxFIFO0SA = FDCAN_START_ADDRESS + (can_number * FDCAN_OFFSET);
172172
CANPacket_t to_push;
173-
canfd_fifo *fifo;
173+
const canfd_fifo *fifo;
174174

175175
// getting address
176-
fifo = (canfd_fifo *)(RxFIFO0SA + (rx_fifo_idx * FDCAN_RX_FIFO_0_EL_SIZE));
176+
fifo = (const canfd_fifo *)(RxFIFO0SA + (rx_fifo_idx * FDCAN_RX_FIFO_0_EL_SIZE));
177177

178178
bool canfd_frame = ((fifo->header[1] >> 21) & 0x1U);
179179
bool brs_frame = ((fifo->header[1] >> 20) & 0x1U);

board/drivers/gpio.h

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99

1010
#define OUTPUT_TYPE_PUSH_PULL 0U
1111
#define OUTPUT_TYPE_OPEN_DRAIN 1U
12+
#define GPIO_PIN_COUNT 16U
1213

1314
void set_gpio_mode(GPIO_TypeDef *GPIO, unsigned int pin, unsigned int mode) {
14-
ENTER_CRITICAL();
15-
uint32_t tmp = GPIO->MODER;
16-
tmp &= ~(3U << (pin * 2U));
17-
tmp |= (mode << (pin * 2U));
18-
register_set(&(GPIO->MODER), tmp, 0xFFFFFFFFU);
19-
EXIT_CRITICAL();
15+
if (pin < GPIO_PIN_COUNT) {
16+
ENTER_CRITICAL();
17+
uint32_t shift = pin * 2U;
18+
uint32_t tmp = GPIO->MODER;
19+
tmp &= ~(3UL << shift);
20+
tmp |= (mode << shift);
21+
register_set(&(GPIO->MODER), tmp, 0xFFFFFFFFU);
22+
EXIT_CRITICAL();
23+
}
2024
}
2125

2226
void set_gpio_output(GPIO_TypeDef *GPIO, unsigned int pin, bool enabled) {
@@ -51,12 +55,15 @@ void set_gpio_alternate(GPIO_TypeDef *GPIO, unsigned int pin, unsigned int mode)
5155
}
5256

5357
void set_gpio_pullup(GPIO_TypeDef *GPIO, unsigned int pin, unsigned int mode) {
54-
ENTER_CRITICAL();
55-
uint32_t tmp = GPIO->PUPDR;
56-
tmp &= ~(3U << (pin * 2U));
57-
tmp |= (mode << (pin * 2U));
58-
register_set(&(GPIO->PUPDR), tmp, 0xFFFFFFFFU);
59-
EXIT_CRITICAL();
58+
if (pin < GPIO_PIN_COUNT) {
59+
ENTER_CRITICAL();
60+
uint32_t shift = pin * 2U;
61+
uint32_t tmp = GPIO->PUPDR;
62+
tmp &= ~(3UL << shift);
63+
tmp |= (mode << shift);
64+
register_set(&(GPIO->PUPDR), tmp, 0xFFFFFFFFU);
65+
EXIT_CRITICAL();
66+
}
6067
}
6168

6269
int get_gpio_input(const GPIO_TypeDef *GPIO, unsigned int pin) {

board/drivers/spi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ uint16_t spi_error_count = 0;
3434
// low level SPI prototypes
3535
void llspi_init(void);
3636
void llspi_mosi_dma(uint8_t *addr, int len);
37-
void llspi_miso_dma(uint8_t *addr, int len);
37+
void llspi_miso_dma(const uint8_t *addr, int len);
3838

3939
static uint8_t spi_state = SPI_STATE_HEADER;
4040
static uint16_t spi_data_len_mosi;

board/stm32h7/llspi.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// master -> panda DMA start
2+
// cppcheck-suppress constParameterPointer ; RX DMA writes through addr after return
23
void llspi_mosi_dma(uint8_t *addr, int len) {
34
// disable DMA + SPI
45
register_clear_bits(&(SPI4->CFG1), SPI_CFG1_RXDMAEN);
@@ -26,7 +27,7 @@ void llspi_mosi_dma(uint8_t *addr, int len) {
2627
}
2728

2829
// panda -> master DMA start
29-
void llspi_miso_dma(uint8_t *addr, int len) {
30+
void llspi_miso_dma(const uint8_t *addr, int len) {
3031
// disable DMA + SPI
3132
DMA2_Stream3->CR &= ~DMA_SxCR_EN;
3233
register_clear_bits(&(SPI4->CFG1), SPI_CFG1_TXDMAEN);

0 commit comments

Comments
 (0)