kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

Handle \r\n on serial properly

Browse source
This commit is contained in:
bzt 2021-08-15 13:31:30 +02:00
parent befefb00a2
commit 6977799528
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aarch64-rpi/bootboot.c
View file

@ -232,13 +232,13 @@ void uart_send(uint32_t c) {
do{asm volatile("nop");}while(*UART0_FR&0x20); *UART0_DR=c; do{asm volatile("nop");}while(*UART0_FR&0x20); *UART0_DR=c;
#endif #endif
} }
char uart_getc() {char r; char uart_getc() {char r = 0;
#if CONSOLE == UART1 #if CONSOLE == UART1
do{asm volatile("nop");}while(!(*AUX_MU_LSR&0x01));r=(char)(*AUX_MU_IO); do{asm volatile("nop");}while(!(*AUX_MU_LSR&0x01));r=(char)(*AUX_MU_IO);
#else #else
do{asm volatile("nop");}while(*UART0_FR&0x10);r=(char)(*UART0_DR); do{asm volatile("nop");}while(*UART0_FR&0x10);r=(char)(*UART0_DR);
#endif #endif
return r=='\r'?'\n':r; return r;
} }
void uart_hex(uint64_t d,int c) { uint32_t n;c<<=3;c-=4;for(;c>=0;c-=4){n=(d>>c)&0xF;n+=n>9?0x37:0x30;uart_send(n);} } void uart_hex(uint64_t d,int c) { uint32_t n;c<<=3;c-=4;for(;c>=0;c-=4){n=(d>>c)&0xF;n+=n>9?0x37:0x30;uart_send(n);} }
void uart_putc(char c) { if(c=='\n') uart_send((uint32_t)'\r'); uart_send((uint32_t)c); } void uart_putc(char c) { if(c=='\n') uart_send((uint32_t)'\r'); uart_send((uint32_t)c); }
@ -289,7 +289,7 @@ void uart_exc(uint64_t idx, uint64_t esr, uint64_t elr, uint64_t spsr, uint64_t
uart_puts(" TCR_EL1 "); uart_puts(" TCR_EL1 ");
uart_hex(tcr,8); uart_hex(tcr,8);
uart_putc('\n'); uart_putc('\n');
r=0; while(r!='\n' && r!=' ') r=uart_getc(); r=0; while(r!='\n' && r != '\r' && r!=' ') r=uart_getc();
asm volatile("dsb sy; isb"); asm volatile("dsb sy; isb");
*PM_WATCHDOG = PM_WDOG_MAGIC | 1; *PM_WATCHDOG = PM_WDOG_MAGIC | 1;
*PM_RTSC = PM_WDOG_MAGIC | PM_RTSC_FULLRST; *PM_RTSC = PM_WDOG_MAGIC | PM_RTSC_FULLRST;
@ -1844,7 +1844,7 @@ viderr:
// Wait until Enter or Space pressed, then reboot // Wait until Enter or Space pressed, then reboot
error: error:
while(r!='\n' && r!=' ') r=uart_getc(); while(r!='\n' && r!='\r' && r!=' ') r=uart_getc();
uart_puts("\n\n"); uart_puts("\n\n");
// reset // reset