| /trunk/uspace/lib/libc/generic/io/console.c |
|---|
| 69,17 → 69,6 |
| async_msg_1(phone, CONSOLE_CURSOR_VISIBILITY, show != false); |
| } |
| int console_get_color_cap(int phone, int *ccap) |
| { |
| ipcarg_t ccap_tmp; |
| int rc; |
| rc = async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, &ccap_tmp); |
| *ccap = ccap_tmp; |
| return rc; |
| } |
| void console_kcon_enable(int phone) |
| { |
| async_msg_0(phone, CONSOLE_KCON_ENABLE); |
| /trunk/uspace/lib/libc/include/ipc/console.h |
|---|
| 40,7 → 40,6 |
| typedef enum { |
| CONSOLE_GET_SIZE = VFS_OUT_LAST, |
| CONSOLE_GET_COLOR_CAP, |
| CONSOLE_GET_EVENT, |
| CONSOLE_GOTO, |
| CONSOLE_CLEAR, |
| /trunk/uspace/lib/libc/include/ipc/fb.h |
|---|
| 41,7 → 41,6 |
| FB_PUTCHAR = IPC_FIRST_USER_METHOD, |
| FB_CLEAR, |
| FB_GET_CSIZE, |
| FB_GET_COLOR_CAP, |
| FB_CURSOR_VISIBILITY, |
| FB_CURSOR_GOTO, |
| FB_SCROLL, |
| 72,13 → 71,6 |
| FB_SCREEN_RECLAIM |
| } fb_request_t; |
| enum { |
| FB_CCAP_NONE = 0, |
| FB_CCAP_STYLE, |
| FB_CCAP_INDEXED, |
| FB_CCAP_RGB |
| }; |
| #endif |
| /** @} |
| /trunk/uspace/lib/libc/include/io/console.h |
|---|
| 43,13 → 43,6 |
| KEY_RELEASE |
| } console_ev_type_t; |
| enum { |
| CONSOLE_CCAP_NONE = 0, |
| CONSOLE_CCAP_STYLE, |
| CONSOLE_CCAP_INDEXED, |
| CONSOLE_CCAP_RGB |
| }; |
| /** Console event structure. */ |
| typedef struct { |
| /** Press or release event. */ |
| 75,7 → 68,6 |
| extern void console_set_rgb_color(int phone, int fg_color, int bg_color); |
| extern void console_cursor_visibility(int phone, bool show); |
| extern int console_get_color_cap(int phone, int *ccap); |
| extern void console_kcon_enable(int phone); |
| extern bool console_get_event(int phone, console_event_t *event); |
| /trunk/uspace/srv/fb/fb.c |
|---|
| 1647,9 → 1647,6 |
| case FB_GET_CSIZE: |
| ipc_answer_2(callid, EOK, vport->cols, vport->rows); |
| continue; |
| case FB_GET_COLOR_CAP: |
| ipc_answer_1(callid, EOK, FB_CCAP_RGB); |
| continue; |
| case FB_SCROLL: |
| scroll = IPC_GET_ARG1(call); |
| if ((scroll > (int) vport->rows) || (scroll < (-(int) vport->rows))) { |
| /trunk/uspace/srv/fb/ega.c |
|---|
| 319,9 → 319,6 |
| case FB_GET_CSIZE: |
| ipc_answer_2(callid, EOK, scr_width, scr_height); |
| continue; |
| case FB_GET_COLOR_CAP: |
| ipc_answer_1(callid, EOK, FB_CCAP_INDEXED); |
| continue; |
| case FB_CLEAR: |
| clrscr(); |
| retval = 0; |
| /trunk/uspace/srv/fb/serial_console.c |
|---|
| 388,10 → 388,6 |
| case FB_GET_CSIZE: |
| ipc_answer_2(callid, EOK, scr_width, scr_height); |
| continue; |
| case FB_GET_COLOR_CAP: |
| ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED : |
| FB_CCAP_STYLE); |
| continue; |
| case FB_CLEAR: |
| serial_clrscr(); |
| retval = 0; |
| /trunk/uspace/srv/console/console.c |
|---|
| 69,7 → 69,6 |
| int phone; /**< Framebuffer phone */ |
| ipcarg_t cols; /**< Framebuffer columns */ |
| ipcarg_t rows; /**< Framebuffer rows */ |
| int color_cap; /**< Color capabilities (FB_CCAP_xxx) */ |
| } fb_info; |
| typedef struct { |
| 173,19 → 172,6 |
| } |
| } |
| int ccap_fb_to_con(int ccap_fb, int *ccap_con) |
| { |
| switch (ccap_fb) { |
| case FB_CCAP_NONE: *ccap_con = CONSOLE_CCAP_NONE; break; |
| case FB_CCAP_STYLE: *ccap_con = CONSOLE_CCAP_STYLE; break; |
| case FB_CCAP_INDEXED: *ccap_con = CONSOLE_CCAP_INDEXED; break; |
| case FB_CCAP_RGB: *ccap_con = CONSOLE_CCAP_RGB; break; |
| default: return EINVAL; |
| } |
| return EOK; |
| } |
| /** Send an area of screenbuffer to the FB driver. */ |
| static void fb_update_area(console_t *cons, ipcarg_t x0, ipcarg_t y0, ipcarg_t width, ipcarg_t height) |
| { |
| 540,9 → 526,6 |
| ipcarg_t arg1; |
| ipcarg_t arg2; |
| ipcarg_t arg3; |
| int cons_ccap; |
| int rc; |
| async_serialize_start(); |
| if (cons->refcount == 0) |
| 605,14 → 588,6 |
| arg1 = fb_info.cols; |
| arg2 = fb_info.rows; |
| break; |
| case CONSOLE_GET_COLOR_CAP: |
| rc = ccap_fb_to_con(fb_info.color_cap, &cons_ccap); |
| if (rc != EOK) { |
| ipc_answer_0(callid, rc); |
| continue; |
| } |
| arg1 = cons_ccap; |
| break; |
| case CONSOLE_SET_STYLE: |
| fb_pending_flush(); |
| arg1 = IPC_GET_ARG1(call); |
| 664,8 → 639,6 |
| static bool console_init(void) |
| { |
| ipcarg_t color_cap; |
| /* Connect to keyboard driver */ |
| kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0); |
| if (kbd_phone < 0) { |
| 701,8 → 674,6 |
| /* Synchronize, the gcons could put something in queue */ |
| async_req_0_0(fb_info.phone, FB_FLUSH); |
| async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows); |
| async_req_0_1(fb_info.phone, FB_GET_COLOR_CAP, &color_cap); |
| fb_info.color_cap = color_cap; |
| /* Set up shared memory buffer. */ |
| size_t ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows; |
| /trunk/uspace/app/tetris/screen.c |
|---|
| 62,8 → 62,6 |
| static int curscore; |
| static int isset; /* true => terminal is in game mode */ |
| static int use_color; /* true => use colors */ |
| static const struct shape *lastshape; |
| 80,8 → 78,7 |
| static void start_standout(uint32_t color) |
| { |
| fflush(stdout); |
| console_set_rgb_color(fphone(stdout), 0xf0f0f0, |
| use_color ? color : 0x000000); |
| console_set_rgb_color(fphone(stdout), 0xf0f0f0, color); |
| } |
| static void resume_normal(void) |
| 130,18 → 127,6 |
| return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row); |
| } |
| static int get_display_color_sup(void) |
| { |
| int rc; |
| int ccap; |
| rc = console_get_color_cap(fphone(stdout), &ccap); |
| if (rc != 0) |
| return 0; |
| return (ccap >= CONSOLE_CCAP_RGB); |
| } |
| /* |
| * Set up screen mode. |
| */ |
| 156,8 → 141,6 |
| Rows = ws.ws_row; |
| Cols = ws.ws_col; |
| } |
| use_color = get_display_color_sup(); |
| if ((Rows < MINROWS) || (Cols < MINCOLS)) { |
| char smallscr[55]; |
| /trunk/contrib/conf/mips32-gx.sh |
|---|
| 7,4 → 7,4 |
| tools/mkfat.py uspace/dist/data "$DISK_IMG" |
| fi |
| gxemul $@ -E testmips -C R4000 -X image.boot -M 32 -d d0:"$DISK_IMG" |
| gxemul $@ -E testmips -C R4000 -X image.boot -d d0:"$DISK_IMG" |