| 49,6 → 49,7 |
|---|
| #include <align.h> |
| #include <ddi.h> |
| |
| #include "serial_console.h" |
| #include "msim.h" |
| |
| #define WIDTH 80 |
| 66,57 → 67,6 |
|---|
| *virt_addr = c; |
| } |
| |
| static void msim_puts(char *str) |
| { |
| while (*str) |
| *virt_addr = *(str++); |
| } |
| |
| static void msim_clrscr(void) |
| { |
| msim_puts("\033[2J"); |
| } |
| |
| static void msim_goto(const unsigned int row, const unsigned int col) |
| { |
| if ((row > HEIGHT) || (col > WIDTH)) |
| return; |
| |
| char control[MAX_CONTROL]; |
| snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1); |
| msim_puts(control); |
| } |
| |
| static void msim_set_style(const unsigned int mode) |
| { |
| char control[MAX_CONTROL]; |
| snprintf(control, MAX_CONTROL, "\033[%um", mode); |
| msim_puts(control); |
| } |
| |
| static void msim_cursor_disable(void) |
| { |
| msim_puts("\033[?25l"); |
| } |
| |
| static void msim_cursor_enable(void) |
| { |
| msim_puts("\033[?25h"); |
| } |
| |
| static void msim_scroll(int i) |
| { |
| if (i > 0) { |
| msim_goto(HEIGHT - 1, 0); |
| while (i--) |
| msim_puts("\033D"); |
| } else if (i < 0) { |
| msim_goto(0, 0); |
| while (i++) |
| msim_puts("\033M"); |
| } |
| } |
| |
| static void msim_client_connection(ipc_callid_t iid, ipc_call_t *icall) |
| { |
| int retval; |
| 141,9 → 91,9 |
|---|
| |
| /* Clear the terminal, set scrolling region |
| to 0 - 25 lines */ |
| msim_clrscr(); |
| msim_goto(0, 0); |
| msim_puts("\033[0;25r"); |
| serial_clrscr(); |
| serial_goto(0, 0); |
| serial_puts("\033[0;25r"); |
| |
| while (true) { |
| callid = async_get_call(&call); |
| 157,7 → 107,7 |
|---|
| newrow = IPC_GET_ARG2(call); |
| newcol = IPC_GET_ARG3(call); |
| if ((lastcol != newcol) || (lastrow != newrow)) |
| msim_goto(newrow, newcol); |
| serial_goto(newrow, newcol); |
| lastcol = newcol + 1; |
| lastrow = newrow; |
| msim_putc(c); |
| 166,7 → 116,7 |
|---|
| case FB_CURSOR_GOTO: |
| newrow = IPC_GET_ARG1(call); |
| newcol = IPC_GET_ARG2(call); |
| msim_goto(newrow, newcol); |
| serial_goto(newrow, newcol); |
| lastrow = newrow; |
| lastcol = newcol; |
| retval = 0; |
| 175,7 → 125,7 |
|---|
| ipc_answer_2(callid, EOK, HEIGHT, WIDTH); |
| continue; |
| case FB_CLEAR: |
| msim_clrscr(); |
| serial_clrscr(); |
| retval = 0; |
| break; |
| case FB_SET_STYLE: |
| 182,9 → 132,9 |
|---|
| fgcolor = IPC_GET_ARG1(call); |
| bgcolor = IPC_GET_ARG2(call); |
| if (fgcolor < bgcolor) |
| msim_set_style(0); |
| serial_set_style(0); |
| else |
| msim_set_style(7); |
| serial_set_style(7); |
| retval = 0; |
| break; |
| case FB_SCROLL: |
| 193,15 → 143,15 |
|---|
| retval = EINVAL; |
| break; |
| } |
| msim_scroll(i); |
| msim_goto(lastrow, lastcol); |
| serial_scroll(i); |
| serial_goto(lastrow, lastcol); |
| retval = 0; |
| break; |
| case FB_CURSOR_VISIBILITY: |
| if(IPC_GET_ARG1(call)) |
| msim_cursor_enable(); |
| serial_cursor_enable(); |
| else |
| msim_cursor_disable(); |
| serial_cursor_disable(); |
| retval = 0; |
| break; |
| default: |
| 218,6 → 168,8 |
|---|
| |
| physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE); |
| |
| serial_console_init(msim_putc, WIDTH, HEIGHT); |
| |
| async_set_client_connection(msim_client_connection); |
| return 0; |
| } |