diff --git a/Ubiquitous/XiZi_AIoT/services/app/shell_port.c b/Ubiquitous/XiZi_AIoT/services/app/shell_port.c index 69164a88f..7f9c286c4 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/shell_port.c +++ b/Ubiquitous/XiZi_AIoT/services/app/shell_port.c @@ -49,7 +49,6 @@ int main(void) shell.read = userShellRead; shellInit(&shell, shellBuffer, 512); - printf("shell init\n"); while (connect_session(&session_fs, "MemFS", 0x10000) < 0) ; diff --git a/Ubiquitous/XiZi_AIoT/services/boards/jh7110/libserial.c b/Ubiquitous/XiZi_AIoT/services/boards/jh7110/libserial.c index 409ce5f13..716d81cc1 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/jh7110/libserial.c +++ b/Ubiquitous/XiZi_AIoT/services/boards/jh7110/libserial.c @@ -216,12 +216,12 @@ static inline int serial_in_shift(void* addr, int shift) bool init_uart_mmio() { - static int mapped = 0xff; - if (mapped != 0) { + static int mapped = 0; + if (mapped == 0) { if (-1 == mmap(UART_ADDR, UART_ADDR, 4096, true)) { return false; } - mapped = 0; + mapped = 1; } return true; } diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c index ec1ff011b..34b99616e 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c @@ -203,7 +203,6 @@ void shellInit(Shell* shell, char* buffer, unsigned short size) shellAdd(shell); shellSetUser(shell, shellSeekCommand(shell, SHELL_DEFAULT_USER, shell->commandList.base, 0)); - shellWritePrompt(shell, 1); } @@ -323,11 +322,9 @@ static void shellWritePrompt(Shell* shell, unsigned char newline) if (newline) { shellWriteString(shell, "\r\n"); } -#ifndef __riscv shellWriteString(shell, shell->info.user->data.user.name); shellWriteString(shell, ":"); shellWriteString(shell, shell->info.path ? shell->info.path : "/"); -#endif shellWriteString(shell, "$ "); } else { shellWriteString(shell, shellText[SHELL_TEXT_PASSWORD_HINT]);