| /branches/dynload/uspace/lib/libc/Makefile.toolchain |
|---|
| 27,7 → 27,7 |
| # |
| DEFS = -DARCH=$(ARCH) |
| CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe |
| CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g |
| LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a |
| AFLAGS = |
| #-Werror |
| /branches/dynload/uspace/lib/libc/arch/mips32/include/atomic.h |
|---|
| 59,13 → 59,14 |
| asm volatile ( |
| "1:\n" |
| " ll %0, %1\n" |
| " addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */ |
| " addu %0, %0, %3\n" /* same as add, but never traps on overflow */ |
| " move %2, %0\n" |
| " sc %0, %1\n" |
| " beq %0, %4, 1b\n" /* if the atomic operation failed, try again */ |
| /* nop */ /* nop is inserted automatically by compiler */ |
| " nop\n" |
| : "=&r" (tmp), "+m" (val->count), "=&r" (v) |
| : "i" (i), "i" (0) |
| : "r" (i), "i" (0) |
| ); |
| return v; |
| /branches/dynload/uspace/srv/console/console.c |
|---|
| 494,6 → 494,7 |
| ipcarg_t phonehash; |
| int kbd_phone; |
| size_t ib_size; |
| int i; |
| async_set_client_connection(client_connection); |
| 544,15 → 545,20 |
| } |
| } |
| connections[KERNEL_CONSOLE].used = 1; |
| interbuffer = mmap(NULL, |
| sizeof(keyfield_t) * fb_info.cols * fb_info.rows, |
| PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); |
| if (!interbuffer) { |
| /* Set up shared memory buffer. */ |
| ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows; |
| interbuffer = as_get_mappable_page(ib_size); |
| if (as_area_create(interbuffer, ib_size, AS_AREA_READ | |
| AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) { |
| interbuffer = NULL; |
| } |
| if (interbuffer) { |
| if (ipc_share_out_start(fb_info.phone, interbuffer, |
| AS_AREA_READ) != EOK) { |
| munmap(interbuffer, |
| sizeof(keyfield_t) * fb_info.cols * fb_info.rows); |
| as_area_destroy(interbuffer); |
| interbuffer = NULL; |
| } |
| } |
| /branches/dynload/uspace/srv/fb/fb.c |
|---|
| 185,6 → 185,7 |
| [8 + COLOR_WHITE] = 0xffffff, |
| }; |
| static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a); |
| static int rgb_from_style(attr_rgb_t *rgb, int style); |
| static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color, |
| ipcarg_t bg_color, ipcarg_t flags); |
| 877,28 → 878,14 |
| bbp = &vport->backbuf[BB_POS(vport, col, row)]; |
| uint8_t glyph = bbp->glyph; |
| if (glyph != data[i].character) { |
| bbp->glyph = data[i].character; |
| a = &data[i].attrs; |
| a = &data[i].attrs; |
| rgb_from_attr(&rgb, a); |
| switch (a->t) { |
| case at_style: |
| rgb_from_style(&rgb, a->a.s.style); |
| break; |
| case at_idx: |
| rgb_from_idx(&rgb, a->a.i.fg_color, |
| a->a.i.bg_color, a->a.i.flags); |
| break; |
| case at_rgb: |
| rgb = a->a.r; |
| break; |
| } |
| bbp->glyph = data[i].character; |
| bbp->fg_color = rgb.fg_color; |
| bbp->bg_color = rgb.bg_color; |
| bbp->fg_color = rgb.fg_color; |
| bbp->bg_color = rgb.bg_color; |
| draw_vp_glyph(vport, false, col, row); |
| } |
| draw_vp_glyph(vport, false, col, row); |
| } |
| cursor_show(vport); |
| } |
| 1444,6 → 1431,27 |
| return EOK; |
| } |
| static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a) |
| { |
| int rc; |
| switch (a->t) { |
| case at_style: |
| rc = rgb_from_style(rgb, a->a.s.style); |
| break; |
| case at_idx: |
| rc = rgb_from_idx(rgb, a->a.i.fg_color, |
| a->a.i.bg_color, a->a.i.flags); |
| break; |
| case at_rgb: |
| *rgb = a->a.r; |
| rc = EOK; |
| break; |
| } |
| return rc; |
| } |
| static int fb_set_style(viewport_t *vport, ipcarg_t style) |
| { |
| return rgb_from_style(&vport->attr, (int) style); |