diff options
| m--------- | RS-232 | 0 | ||||
| -rw-r--r-- | kernel.c | 16 | ||||
| -rw-r--r-- | pipe_image.c | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/RS-232 b/RS-232 deleted file mode 160000 -Subproject 9016e7a369f9eab0525aaf9d7653a50de05011e @@ -20,16 +20,14 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags) // When we attach screen session after loading kernel with socat // we miss kernel's greeting... So we'll make the kernel wait for // one char we're going to send from within screen - uart_getc(); - - uart_puts("Hello, kernel World!\r\n"); +// uart_getc(); + uint32_t ID_MMFR0; + // get contents of coprocessor register to check for paging support + asm("mrc p15, 0, %0, c0, c1, 4" : "=r" (ID_MMFR0)); - uint32_t ID_MMFR0; - // get contents of coprocessor register to check for paging support - asm("mrc p15, 0, %0, c0, c1, 4" : "=r" (ID_MMFR0)); +// uart_puts("Hello, kernel World!\r\n"); char *paging; - switch(ID_MMFR0 & 0xf) /* lowest 4 bits indicate VMSA support */ { case 0 : paging = "no paging\n\r"; break; @@ -47,9 +45,9 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags) // get content of current program status register to check the current // processor mode asm("mrs %0, cpsr" : "=r" (CPSR) :: "memory"); - + char *mode_name; - + switch(read_processor_mode()) { case MODE_USER : mode_name = "User (PL0)\r\n"; break; diff --git a/pipe_image.c b/pipe_image.c index 01510a5..03d2c8f 100644 --- a/pipe_image.c +++ b/pipe_image.c @@ -15,7 +15,7 @@ int main(int argc, const char **argv) { const char *image_file_name = "kernel7.img"; _Bool stdout_instead_of_uart = 0; - + if (argc > 1) if (!strcmp(argv[1], "--stdout")) { @@ -90,7 +90,6 @@ int main(int argc, const char **argv) { bytes_left -= bytes_read; } - if (!stdout_instead_of_uart) RS232_CloseComport(comport); |