Skip to content

Commit ae816c1

Browse files
authored
Fix 15_6 violations (commaai#231)
1 parent 00e45d3 commit ae816c1

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

board/main.c

+29-10
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ int usb_cb_ep1_in(uint8_t *usbdata, int len, bool hardwired) {
143143
UNUSED(hardwired);
144144
CAN_FIFOMailBox_TypeDef *reply = (CAN_FIFOMailBox_TypeDef *)usbdata;
145145
int ilen = 0;
146-
while (ilen < MIN(len/0x10, 4) && can_pop(&can_rx_q, &reply[ilen])) ilen++;
146+
while (ilen < MIN(len/0x10, 4) && can_pop(&can_rx_q, &reply[ilen])) {
147+
ilen++;
148+
}
147149
return ilen*0x10;
148150
}
149151

@@ -153,7 +155,11 @@ void usb_cb_ep2_out(uint8_t *usbdata, int len, bool hardwired) {
153155
uart_ring *ur = get_ring_by_number(usbdata[0]);
154156
if ((len != 0) && (ur != NULL)) {
155157
if ((usbdata[0] < 2) || safety_tx_lin_hook(usbdata[0]-2, usbdata+1, len-1)) {
156-
for (int i = 1; i < len; i++) while (!putc(ur, usbdata[i]));
158+
for (int i = 1; i < len; i++) {
159+
while (!putc(ur, usbdata[i])) {
160+
// wait
161+
}
162+
}
157163
}
158164
}
159165
}
@@ -340,8 +346,12 @@ int usb_cb_control_msg(USB_Setup_TypeDef *setup, uint8_t *resp, bool hardwired)
340346
// **** 0xe0: uart read
341347
case 0xe0:
342348
ur = get_ring_by_number(setup->b.wValue.w);
343-
if (!ur) break;
344-
if (ur == &esp_ring) uart_dma_drain();
349+
if (!ur) {
350+
break;
351+
}
352+
if (ur == &esp_ring) {
353+
uart_dma_drain();
354+
}
345355
// read
346356
while ((resp_len < MIN(setup->b.wLength.w, MAX_RESP_LEN)) &&
347357
getc(ur, (char*)&resp[resp_len])) {
@@ -351,13 +361,17 @@ int usb_cb_control_msg(USB_Setup_TypeDef *setup, uint8_t *resp, bool hardwired)
351361
// **** 0xe1: uart set baud rate
352362
case 0xe1:
353363
ur = get_ring_by_number(setup->b.wValue.w);
354-
if (!ur) break;
364+
if (!ur) {
365+
break;
366+
}
355367
uart_set_baud(ur->uart, setup->b.wIndex.w);
356368
break;
357369
// **** 0xe2: uart set parity
358370
case 0xe2:
359371
ur = get_ring_by_number(setup->b.wValue.w);
360-
if (!ur) break;
372+
if (!ur) {
373+
break;
374+
}
361375
switch (setup->b.wIndex.w) {
362376
case 0:
363377
// disable parity, 8-bit
@@ -380,7 +394,9 @@ int usb_cb_control_msg(USB_Setup_TypeDef *setup, uint8_t *resp, bool hardwired)
380394
// **** 0xe4: uart set baud rate extended
381395
case 0xe4:
382396
ur = get_ring_by_number(setup->b.wValue.w);
383-
if (!ur) break;
397+
if (!ur) {
398+
break;
399+
}
384400
uart_set_baud(ur->uart, (int)setup->b.wIndex.w*300);
385401
break;
386402
// **** 0xe5: set CAN loopback (for testing)
@@ -578,8 +594,9 @@ void TIM3_IRQHandler(void) {
578594
puts("\n");*/
579595

580596
// reset this every 16th pass
581-
if ((tcnt&0xF) == 0) pending_can_live = 0;
582-
597+
if ((tcnt&0xF) == 0) {
598+
pending_can_live = 0;
599+
}
583600
#ifdef DEBUG
584601
puts("** blink ");
585602
puth(can_rx_q.r_ptr); puts(" "); puth(can_rx_q.w_ptr); puts(" ");
@@ -621,7 +638,9 @@ int main(void) {
621638
puts(is_entering_bootmode ? " ESP wants bootmode\n" : " no bootmode\n");
622639

623640
// non rev c panda are no longer supported
624-
while (revision != PANDA_REV_C);
641+
while (revision != PANDA_REV_C) {
642+
// hang
643+
}
625644

626645
gpio_init();
627646

0 commit comments

Comments
 (0)