Skip to content

Commit 3666479

Browse files
committed
cosmetic changes to bootloader source code
1 parent d3802b5 commit 3666479

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

bootloaders/zero/main.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ static volatile bool main_b_cdc_enable = false;
9393
*/
9494
static void check_start_application(void)
9595
{
96-
volatile PortGroup *led_port = (volatile PortGroup *)&PORT->Group[1];
97-
led_port->DIRSET.reg = (1<<30);
98-
led_port->OUTCLR.reg = (1<<30);
99-
96+
volatile PortGroup *led_port = (volatile PortGroup *)&PORT->Group[1];
97+
led_port->DIRSET.reg = (1<<30);
98+
led_port->OUTCLR.reg = (1<<30);
99+
100100
#if defined(BOOT_DOUBLE_TAP_ADDRESS)
101101
if (PM->RCAUSE.bit.POR)
102102
{
@@ -154,8 +154,8 @@ static void check_start_application(void)
154154
return;
155155
}
156156

157-
led_port->OUTSET.reg = (1<<30);
158-
157+
led_port->OUTSET.reg = (1<<30);
158+
159159
/* Rebase the Stack Pointer */
160160
__set_MSP(*(uint32_t *) APP_START_ADDRESS);
161161

@@ -255,7 +255,7 @@ void system_init()
255255
int main(void)
256256
{
257257
#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
258-
P_USB_CDC pCdc;
258+
P_USB_CDC pCdc;
259259
#endif
260260
DEBUG_PIN_HIGH;
261261

@@ -272,13 +272,13 @@ int main(void)
272272
usart_open();
273273
#endif
274274

275-
#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
275+
#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
276276
pCdc = (P_USB_CDC)usb_init();
277277
#endif
278278
DEBUG_PIN_LOW;
279279
/* Wait for a complete enum on usb or a '#' char on serial line */
280280
while (1) {
281-
#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
281+
#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
282282
if (pCdc->IsConfigured(pCdc) != 0) {
283283
main_b_cdc_enable = true;
284284
}
@@ -293,7 +293,7 @@ int main(void)
293293
}
294294
}
295295
#endif
296-
#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
296+
#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY || SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
297297
/* Check if a '#' has been received */
298298
if (!main_b_cdc_enable && usart_sharp_received()) {
299299
sam_ba_monitor_init(SAM_BA_INTERFACE_USART);

bootloaders/zero/main.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
* ----------------------------------------------------------------------------
2828
*/
2929

30-
#ifndef _MAIN_H_
31-
#define _MAIN_H_
32-
30+
#pragma once
3331

3432
#define CPU_FREQUENCY 8000000
3533

@@ -59,5 +57,3 @@
5957
#define BOOT_USART_PAD1 PINMUX_UNUSED
6058
#define BOOT_USART_PAD0 PINMUX_UNUSED
6159

62-
63-
#endif // _MAIN_H_

0 commit comments

Comments
 (0)