Skip to content

Commit

Permalink
rename puts to avoid conflict with stdio.h (commaai#1174)
Browse files Browse the repository at this point in the history
* rename puts to avoid conflict with stdio.h

* better name
  • Loading branch information
adeebshihadeh committed Nov 30, 2022
1 parent 2baa0ff commit e6f62a6
Show file tree
Hide file tree
Showing 37 changed files with 191 additions and 191 deletions.
6 changes: 3 additions & 3 deletions board/boards/black.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void black_enable_can_transceiver(uint8_t transceiver, bool enabled) {
set_gpio_output(GPIOB, 10, !enabled);
break;
default:
puts("Invalid CAN transceiver ("); puth(transceiver); puts("): enabling failed\n");
print("Invalid CAN transceiver ("); puth(transceiver); print("): enabling failed\n");
break;
}
}
Expand Down Expand Up @@ -74,7 +74,7 @@ void black_set_gps_mode(uint8_t mode) {
set_gpio_output(GPIOC, 5, 0);
break;
default:
puts("Invalid GPS mode\n");
print("Invalid GPS mode\n");
break;
}
}
Expand Down Expand Up @@ -102,7 +102,7 @@ void black_set_can_mode(uint8_t mode){
}
break;
default:
puts("Tried to set unsupported CAN mode: "); puth(mode); puts("\n");
print("Tried to set unsupported CAN mode: "); puth(mode); print("\n");
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions board/boards/dos.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void dos_enable_can_transceiver(uint8_t transceiver, bool enabled) {
set_gpio_output(GPIOB, 10, !enabled);
break;
default:
puts("Invalid CAN transceiver ("); puth(transceiver); puts("): enabling failed\n");
print("Invalid CAN transceiver ("); puth(transceiver); print("): enabling failed\n");
break;
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@ void dos_set_can_mode(uint8_t mode){
}
break;
default:
puts("Tried to set unsupported CAN mode: "); puth(mode); puts("\n");
print("Tried to set unsupported CAN mode: "); puth(mode); print("\n");
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion board/boards/grey.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void grey_set_gps_mode(uint8_t mode) {
set_gpio_output(GPIOC, 5, 0);
break;
default:
puts("Invalid ESP/GPS mode\n");
print("Invalid ESP/GPS mode\n");
break;
}
}
Expand Down
6 changes: 3 additions & 3 deletions board/boards/pedal.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ void pedal_enable_can_transceiver(uint8_t transceiver, bool enabled) {
set_gpio_output(GPIOB, 3, !enabled);
break;
default:
puts("Invalid CAN transceiver ("); puth(transceiver); puts("): enabling failed\n");
print("Invalid CAN transceiver ("); puth(transceiver); print("): enabling failed\n");
break;
}
}
Expand All @@ -32,15 +32,15 @@ void pedal_set_led(uint8_t color, bool enabled) {

void pedal_set_gps_mode(uint8_t mode) {
UNUSED(mode);
puts("Trying to set ESP/GPS mode on pedal. This is not supported.\n");
print("Trying to set ESP/GPS mode on pedal. This is not supported.\n");
}

void pedal_set_can_mode(uint8_t mode){
switch (mode) {
case CAN_MODE_NORMAL:
break;
default:
puts("Tried to set unsupported CAN mode: "); puth(mode); puts("\n");
print("Tried to set unsupported CAN mode: "); puth(mode); print("\n");
break;
}
}
Expand Down
6 changes: 3 additions & 3 deletions board/boards/uno.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void uno_enable_can_transceiver(uint8_t transceiver, bool enabled) {
set_gpio_output(GPIOB, 10, !enabled);
break;
default:
puts("Invalid CAN transceiver ("); puth(transceiver); puts("): enabling failed\n");
print("Invalid CAN transceiver ("); puth(transceiver); print("): enabling failed\n");
break;
}
}
Expand Down Expand Up @@ -93,7 +93,7 @@ void uno_set_gps_mode(uint8_t mode) {
uno_set_gps_load_switch(true);
break;
default:
puts("Invalid ESP/GPS mode\n");
print("Invalid ESP/GPS mode\n");
break;
}
}
Expand Down Expand Up @@ -121,7 +121,7 @@ void uno_set_can_mode(uint8_t mode){
}
break;
default:
puts("Tried to set unsupported CAN mode: "); puth(mode); puts("\n");
print("Tried to set unsupported CAN mode: "); puth(mode); print("\n");
break;
}
}
Expand Down
8 changes: 4 additions & 4 deletions board/boards/white.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void white_enable_can_transceiver(uint8_t transceiver, bool enabled) {
set_gpio_output(GPIOA, 0, !enabled);
break;
default:
puts("Invalid CAN transceiver ("); puth(transceiver); puts("): enabling failed\n");
print("Invalid CAN transceiver ("); puth(transceiver); print("): enabling failed\n");
break;
}
}
Expand Down Expand Up @@ -60,7 +60,7 @@ void white_set_usb_power_mode(uint8_t mode){
set_gpio_output(GPIOA, 13, 0);
break;
default:
puts("Invalid usb power mode\n");
print("Invalid usb power mode\n");
break;
}
}
Expand All @@ -77,7 +77,7 @@ void white_set_gps_mode(uint8_t mode) {
set_gpio_output(GPIOC, 5, 0);
break;
default:
puts("Invalid ESP/GPS mode\n");
print("Invalid ESP/GPS mode\n");
break;
}
}
Expand Down Expand Up @@ -136,7 +136,7 @@ void white_set_can_mode(uint8_t mode){
set_gpio_alternate(GPIOB, 6, GPIO_AF9_CAN2);
break;
default:
puts("Tried to set unsupported CAN mode: "); puth(mode); puts("\n");
print("Tried to set unsupported CAN mode: "); puth(mode); print("\n");
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion board/bootstub_declarations.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ******************** Prototypes ********************
void puts(const char *a){ UNUSED(a); }
void print(const char *a){ UNUSED(a); }
void puth(uint8_t i){ UNUSED(i); }
void puth2(uint8_t i){ UNUSED(i); }
void puth4(uint8_t i){ UNUSED(i); }
Expand Down
12 changes: 6 additions & 6 deletions board/drivers/bxcan.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ void can_set_gmlan(uint8_t bus) {
switch (prev_bus) {
case 1:
case 2:
puts("Disable GMLAN on CAN");
print("Disable GMLAN on CAN");
puth(prev_bus + 1U);
puts("\n");
print("\n");
current_board->set_can_mode(CAN_MODE_NORMAL);
bus_config[prev_bus].bus_lookup = prev_bus;
bus_config[prev_bus].can_num_lookup = prev_bus;
Expand All @@ -47,9 +47,9 @@ void can_set_gmlan(uint8_t bus) {
switch (bus) {
case 1:
case 2:
puts("Enable GMLAN on CAN");
print("Enable GMLAN on CAN");
puth(bus + 1U);
puts("\n");
print("\n");
current_board->set_can_mode((bus == 1U) ? CAN_MODE_GMLAN_CAN2 : CAN_MODE_GMLAN_CAN3);
bus_config[bus].bus_lookup = 3;
bus_config[bus].can_num_lookup = -1;
Expand All @@ -60,11 +60,11 @@ void can_set_gmlan(uint8_t bus) {
case 0xFF: //-1 unsigned
break;
default:
puts("GMLAN can only be set on CAN2 or CAN3\n");
print("GMLAN can only be set on CAN2 or CAN3\n");
break;
}
} else {
puts("GMLAN not available on black panda\n");
print("GMLAN not available on black panda\n");
}
}

Expand Down
16 changes: 8 additions & 8 deletions board/drivers/can_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,21 @@ bool can_push(can_ring *q, CANPacket_t *elem) {
EXIT_CRITICAL();
if (!ret) {
#ifdef DEBUG
puts("can_push to ");
print("can_push to ");
if (q == &can_rx_q) {
puts("can_rx_q");
print("can_rx_q");
} else if (q == &can_tx1_q) {
puts("can_tx1_q");
print("can_tx1_q");
} else if (q == &can_tx2_q) {
puts("can_tx2_q");
print("can_tx2_q");
} else if (q == &can_tx3_q) {
puts("can_tx3_q");
print("can_tx3_q");
} else if (q == &can_txgmlan_q) {
puts("can_txgmlan_q");
print("can_txgmlan_q");
} else {
puts("unknown");
print("unknown");
}
puts(" failed!\n");
print(" failed!\n");
#endif
}
return ret;
Expand Down
2 changes: 1 addition & 1 deletion board/drivers/fdcan.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bool can_set_speed(uint8_t can_number) {

void can_set_gmlan(uint8_t bus) {
UNUSED(bus);
puts("GMLAN not available on red panda\n");
print("GMLAN not available on red panda\n");
}

// ***************************** CAN *****************************
Expand Down
12 changes: 6 additions & 6 deletions board/drivers/gmlan_alt.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ void gmlan_switch_init(int timeout_enable) {
void set_gmlan_digital_output(int to_set) {
inverted_bit_to_send = to_set;
/*
puts("Writing ");
print("Writing ");
puth(inverted_bit_to_send);
puts("\n");
print("\n");
*/
}

Expand Down Expand Up @@ -207,12 +207,12 @@ void TIM12_IRQ_Handler(void) {
if ((gmlan_sending > 0) && // not first bit
((read == 0) && (pkt_stuffed[gmlan_sending-1] == 1)) && // bus wrongly dominant
(gmlan_sending != (gmlan_sendmax - 11))) { //not ack bit
puts("GMLAN ERR: bus driven at ");
print("GMLAN ERR: bus driven at ");
puth(gmlan_sending);
puts("\n");
print("\n");
retry = 1;
} else if ((read == 1) && (gmlan_sending == (gmlan_sendmax - 11))) { // recessive during ACK
puts("GMLAN ERR: didn't recv ACK\n");
print("GMLAN ERR: didn't recv ACK\n");
retry = 1;
} else {
// do not retry
Expand All @@ -224,7 +224,7 @@ void TIM12_IRQ_Handler(void) {
gmlan_sending = 0;
gmlan_fail_count++;
if (gmlan_fail_count == MAX_FAIL_COUNT) {
puts("GMLAN ERR: giving up send\n");
print("GMLAN ERR: giving up send\n");
gmlan_send_ok = false;
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions board/drivers/harness.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ struct harness_configuration {
void set_intercept_relay(bool intercept) {
if (car_harness_status != HARNESS_STATUS_NC) {
if (intercept) {
puts("switching harness to intercept (relay on)\n");
print("switching harness to intercept (relay on)\n");
} else {
puts("switching harness to passthrough (relay off)\n");
print("switching harness to passthrough (relay off)\n");
}

if(car_harness_status == HARNESS_STATUS_NORMAL){
Expand Down Expand Up @@ -80,7 +80,7 @@ void harness_init(void) {
// try to detect orientation
uint8_t ret = harness_detect_orientation();
if (ret != HARNESS_STATUS_NC) {
puts("detected car harness with orientation "); puth2(ret); puts("\n");
print("detected car harness with orientation "); puth2(ret); print("\n");
car_harness_status = ret;

// set the SBU lines to be inputs before using the relay. The lines are not 5V tolerant in ADC mode!
Expand All @@ -90,6 +90,6 @@ void harness_init(void) {
// keep busses connected by default
set_intercept_relay(false);
} else {
puts("failed to detect car harness!\n");
print("failed to detect car harness!\n");
}
}
4 changes: 2 additions & 2 deletions board/drivers/interrupts.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ uint32_t microsecond_timer_get(void);

void unused_interrupt_handler(void) {
// Something is wrong if this handler is called!
puts("Unused interrupt handler called!\n");
print("Unused interrupt handler called!\n");
fault_occurred(FAULT_UNUSED_INTERRUPT_HANDLED);
}

Expand Down Expand Up @@ -47,7 +47,7 @@ void handle_interrupt(IRQn_Type irq_type){

// Check that the interrupts don't fire too often
if(check_interrupt_rate && (interrupts[irq_type].call_counter > interrupts[irq_type].max_call_rate)){
puts("Interrupt 0x"); puth(irq_type); puts(" fired too often (0x"); puth(interrupts[irq_type].call_counter); puts("/s)!\n");
print("Interrupt 0x"); puth(irq_type); print(" fired too often (0x"); puth(interrupts[irq_type].call_counter); print("/s)!\n");
fault_occurred(interrupts[irq_type].call_rate_fault);
}

Expand Down
12 changes: 6 additions & 6 deletions board/drivers/registers.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void register_set(volatile uint32_t *addr, uint32_t val, uint32_t mask){
register_map[hash].check_mask |= mask;
} else {
#ifdef DEBUG_FAULTS
puts("Hash collision: address 0x"); puth((uint32_t) addr); puts("!\n");
print("Hash collision: address 0x"); puth((uint32_t) addr); print("!\n");
#endif
}
EXIT_CRITICAL()
Expand All @@ -60,11 +60,11 @@ void check_registers(void){
ENTER_CRITICAL()
if((*(register_map[i].address) & register_map[i].check_mask) != (register_map[i].value & register_map[i].check_mask)){
#ifdef DEBUG_FAULTS
puts("Register at address 0x"); puth((uint32_t) register_map[i].address); puts(" is divergent!");
puts(" Map: 0x"); puth(register_map[i].value);
puts(" Register: 0x"); puth(*(register_map[i].address));
puts(" Mask: 0x"); puth(register_map[i].check_mask);
puts("\n");
print("Register at address 0x"); puth((uint32_t) register_map[i].address); print(" is divergent!");
print(" Map: 0x"); puth(register_map[i].value);
print(" Register: 0x"); puth(*(register_map[i].address));
print(" Mask: 0x"); puth(register_map[i].check_mask);
print("\n");
#endif
fault_occurred(FAULT_REGISTER_DIVERGENT);
}
Expand Down
4 changes: 2 additions & 2 deletions board/drivers/rtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void rtc_init(void){

// Initialize RTC module and clock if not done already.
if((RCC->BDCR & bdcr_mask) != bdcr_opts){
puts("Initializing RTC\n");
print("Initializing RTC\n");
// Reset backup domain
register_set_bits(&(RCC->BDCR), RCC_BDCR_BDRST);

Expand All @@ -55,7 +55,7 @@ void rtc_init(void){
}

void rtc_set_time(timestamp_t time){
puts("Setting RTC time\n");
print("Setting RTC time\n");

// Disable write protection
disable_bdomain_protection();
Expand Down
Loading

0 comments on commit e6f62a6

Please sign in to comment.