| /trunk/kernel/arch/sparc64/src/drivers/sgcn.c |
|---|
| 295,16 → 295,17 |
| * feed character is written ('\n'), the carriage return character ('\r') is |
| * written straight away. |
| */ |
| static void sgcn_putchar(struct chardev * cd, const char c) |
| static void sgcn_putchar(struct chardev * cd, const char c, bool silent) |
| { |
| spinlock_lock(&sgcn_output_lock); |
| sgcn_do_putchar(c); |
| if (c == '\n') { |
| sgcn_do_putchar('\r'); |
| if (!silent) { |
| spinlock_lock(&sgcn_output_lock); |
| sgcn_do_putchar(c); |
| if (c == '\n') |
| sgcn_do_putchar('\r'); |
| spinlock_unlock(&sgcn_output_lock); |
| } |
| spinlock_unlock(&sgcn_output_lock); |
| } |
| /** |
| /trunk/kernel/arch/ia64/src/ia64.c |
|---|
| 254,8 → 254,8 |
| ns16550_grab(); |
| #else |
| i8042_grab(); |
| #endif |
| #endif |
| #endif |
| #endif |
| } |
| /** Return console to userspace |
| /trunk/kernel/arch/ia64/src/ski/ski.c |
|---|
| 56,9 → 56,6 |
| static bool kbd_disabled; |
| static void ski_putchar(chardev_t *d, const char ch); |
| static int32_t ski_getchar(void); |
| /** Display character on debug console |
| * |
| * Use SSC (Simulator System Call) to |
| 67,19 → 64,21 |
| * @param d Character device. |
| * @param ch Character to be printed. |
| */ |
| void ski_putchar(chardev_t *d, const char ch) |
| static void ski_putchar(chardev_t *d, const char ch, bool silent) |
| { |
| asm volatile ( |
| "mov r15 = %0\n" |
| "mov r32 = %1\n" /* r32 is in0 */ |
| "break 0x80000\n" /* modifies r8 */ |
| : |
| : "i" (SKI_PUTCHAR), "r" (ch) |
| : "r15", "in0", "r8" |
| ); |
| if (ch == '\n') |
| ski_putchar(d, '\r'); |
| if (!silent) { |
| asm volatile ( |
| "mov r15 = %0\n" |
| "mov r32 = %1\n" /* r32 is in0 */ |
| "break 0x80000\n" /* modifies r8 */ |
| : |
| : "i" (SKI_PUTCHAR), "r" (ch) |
| : "r15", "in0", "r8" |
| ); |
| if (ch == '\n') |
| ski_putchar(d, '\r'); |
| } |
| } |
| /** Ask debug console if a key was pressed. |
| 91,7 → 90,7 |
| * |
| * @return ASCII code of pressed key or 0 if no key pressed. |
| */ |
| int32_t ski_getchar(void) |
| static int32_t ski_getchar(void) |
| { |
| uint64_t ch; |
| /trunk/kernel/arch/arm32/include/machine.h |
|---|
| 102,18 → 102,17 |
| extern uintptr_t machine_get_fb_address(void); |
| #ifdef MACHINE_GXEMUL_TESTARM |
| #define machine_console_init(devno) gxemul_console_init(devno) |
| #define machine_grab_console gxemul_grab_console |
| #define machine_release_console gxemul_release_console |
| #define machine_hw_map_init gxemul_hw_map_init |
| #define machine_timer_irq_start gxemul_timer_irq_start |
| #define machine_cpu_halt gxemul_cpu_halt |
| #define machine_get_memory_size gxemul_get_memory_size |
| #define machine_debug_putc(ch) gxemul_debug_putc(ch) |
| #define machine_irq_exception(exc_no, istate) \ |
| gxemul_irq_exception(exc_no, istate) |
| #define machine_get_fb_address gxemul_get_fb_address |
| #ifdef MACHINE_GXEMUL_TESTARM |
| #define machine_console_init(devno) gxemul_console_init(devno) |
| #define machine_grab_console gxemul_grab_console |
| #define machine_release_console gxemul_release_console |
| #define machine_hw_map_init gxemul_hw_map_init |
| #define machine_timer_irq_start gxemul_timer_irq_start |
| #define machine_cpu_halt gxemul_cpu_halt |
| #define machine_get_memory_size gxemul_get_memory_size |
| #define machine_debug_putc(ch) gxemul_debug_putc(ch) |
| #define machine_irq_exception(exc_no, istate) gxemul_irq_exception(exc_no, istate) |
| #define machine_get_fb_address gxemul_get_fb_address |
| #endif |
| #endif |
| /trunk/kernel/arch/arm32/src/drivers/gxemul.c |
|---|
| 133,9 → 133,10 |
| * @param dev Not used. |
| * @param ch Characted to be printed. |
| */ |
| static void gxemul_write(chardev_t *dev, const char ch) |
| static void gxemul_write(chardev_t *dev, const char ch, bool silent) |
| { |
| *((char *) gxemul_hw_map.videoram) = ch; |
| if (!silent) |
| *((char *) gxemul_hw_map.videoram) = ch; |
| } |
| /** Enables gxemul keyboard (interrupt unmasked). |
| /trunk/kernel/arch/ppc32/src/ppc32.c |
|---|
| 147,8 → 147,7 |
| (uintptr_t) kernel_uarg->uspace_entry); |
| /* Unreachable */ |
| for (;;) |
| ; |
| while (true); |
| } |
| /** Acquire console back for kernel |
| /trunk/kernel/arch/ia32xen/src/drivers/xconsole.c |
|---|
| 55,28 → 55,30 |
| stdout = &xen_console; |
| } |
| void xen_putchar(chardev_t *d, const char ch) |
| void xen_putchar(chardev_t *d, const char ch, bool silent) |
| { |
| if (start_info.console.domU.evtchn != 0) { |
| uint32_t cons = console_page.out_cons; |
| uint32_t prod = console_page.out_prod; |
| memory_barrier(); |
| if ((prod - cons) > sizeof(console_page.out)) |
| return; |
| if (ch == '\n') |
| console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r'; |
| console_page.out[MASK_INDEX(prod++, console_page.out)] = ch; |
| write_barrier(); |
| console_page.out_prod = prod; |
| xen_notify_remote(start_info.console.domU.evtchn); |
| } else |
| xen_console_io(CONSOLE_IO_WRITE, 1, &ch); |
| if (!silent) { |
| if (start_info.console.domU.evtchn != 0) { |
| uint32_t cons = console_page.out_cons; |
| uint32_t prod = console_page.out_prod; |
| memory_barrier(); |
| if ((prod - cons) > sizeof(console_page.out)) |
| return; |
| if (ch == '\n') |
| console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r'; |
| console_page.out[MASK_INDEX(prod++, console_page.out)] = ch; |
| write_barrier(); |
| console_page.out_prod = prod; |
| xen_notify_remote(start_info.console.domU.evtchn); |
| } else |
| xen_console_io(CONSOLE_IO_WRITE, 1, &ch); |
| } |
| } |
| /** @} |
| /trunk/kernel/arch/mips32/src/drivers/serial.c |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32 |
| /** @addtogroup mips32 |
| * @{ |
| */ |
| /** @file |
| 46,16 → 46,18 |
| static serial_t sconf[SERIAL_MAX]; |
| static bool kb_enabled; |
| static void serial_write(chardev_t *d, const char ch) |
| static void serial_write(chardev_t *d, const char ch, bool silent) |
| { |
| serial_t *sd = (serial_t *)d->data; |
| if (ch == '\n') |
| serial_write(d, '\r'); |
| /* Wait until transmit buffer empty */ |
| while (! (SERIAL_READ_LSR(sd->port) & (1<<TRANSMIT_EMPTY_BIT))) |
| ; |
| SERIAL_WRITE(sd->port, ch); |
| if (!silent) { |
| serial_t *sd = (serial_t *)d->data; |
| if (ch == '\n') |
| serial_write(d, '\r'); |
| /* Wait until transmit buffer empty */ |
| while (!(SERIAL_READ_LSR(sd->port) & (1 << TRANSMIT_EMPTY_BIT))); |
| SERIAL_WRITE(sd->port, ch); |
| } |
| } |
| static void serial_enable(chardev_t *d) |
| 133,8 → 135,7 |
| void serial_console(devno_t devno) |
| { |
| serial_t *sd = &sconf[0]; |
| chardev_initialize("serial_console", &console, &serial_ops); |
| console.data = sd; |
| kb_enabled = true; |
| 145,10 → 146,9 |
| serial_irq.claim = serial_claim; |
| serial_irq.handler = serial_irq_handler; |
| irq_register(&serial_irq); |
| /* I don't know why, but the serial interrupts simply |
| * don't work on simics |
| */ |
| don't work on simics */ |
| virtual_timer_fnc = &serial_handler; |
| stdin = &console; |
| /trunk/kernel/arch/mips32/src/drivers/msim.c |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup mips32 |
| /** @addtogroup mips32 |
| * @{ |
| */ |
| /** @file |
| 58,9 → 58,10 |
| }; |
| /** Putchar that works with MSIM & gxemul */ |
| void msim_write(chardev_t *dev, const char ch) |
| void msim_write(chardev_t *dev, const char ch, bool silent) |
| { |
| *((char *) MSIM_VIDEORAM) = ch; |
| if (!silent) |
| *((char *) MSIM_VIDEORAM) = ch; |
| } |
| /* Called from getc(). */ |
| 80,7 → 81,7 |
| static char msim_do_read(chardev_t *dev) |
| { |
| char ch; |
| while (1) { |
| ch = *((volatile char *) MSIM_KBD_ADDRESS); |
| if (ch) { |
| 101,12 → 102,12 |
| else { |
| char ch = 0; |
| ch = *((char *) MSIM_KBD_ADDRESS); |
| if (ch =='\r') |
| ch = '\n'; |
| if (ch == 0x7f) |
| ch = '\b'; |
| chardev_push_character(&console, ch); |
| ch = *((char *) MSIM_KBD_ADDRESS); |
| if (ch =='\r') |
| ch = '\n'; |
| if (ch == 0x7f) |
| ch = '\b'; |
| chardev_push_character(&console, ch); |
| } |
| } |