| /branches/dd/uspace/lib/libc/generic/malloc.c |
|---|
| 410,7 → 410,7 |
| (next_head->free)) { |
| block_check(next_head); |
| block_init(head, head->size + next_head->size, false); |
| split_mark(head, ALIGN_UP(size, BASE_ALIGN)); |
| split_mark(head, real_size); |
| ptr = ((void *) head) + sizeof(heap_block_head_t); |
| } else { |
| /branches/dd/uspace/srv/kbd/ctl/pl050.c |
|---|
| 0,0 → 1,262 |
| /* |
| * Copyright (c) 2009 Vineeth Pillai |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup kbd_ctl |
| * @ingroup kbd |
| * @{ |
| */ |
| /** |
| * @file |
| * @brief PL050 keyboard controller driver. |
| */ |
| #include <kbd.h> |
| #include <io/console.h> |
| #include <io/keycode.h> |
| #include <kbd_ctl.h> |
| #include <gsp.h> |
| #include <stdio.h> |
| #define PL050_CAPS_SCAN_CODE 0x58 |
| #define PL050_NUM_SCAN_CODE 0x77 |
| #define PL050_SCROLL_SCAN_CODE 0x7E |
| static bool is_lock_key(int); |
| enum dec_state { |
| ds_s, |
| ds_e |
| }; |
| static enum dec_state ds; |
| static int scanmap_simple[] = { |
| [0x0e] = KC_BACKTICK, |
| [0x16] = KC_1, |
| [0x1e] = KC_2, |
| [0x26] = KC_3, |
| [0x25] = KC_4, |
| [0x2e] = KC_5, |
| [0x36] = KC_6, |
| [0x3d] = KC_7, |
| [0x3e] = KC_8, |
| [0x46] = KC_9, |
| [0x45] = KC_0, |
| [0x4e] = KC_MINUS, |
| [0x55] = KC_EQUALS, |
| [0x66] = KC_BACKSPACE, |
| [0x0d] = KC_TAB, |
| [0x15] = KC_Q, |
| [0x1d] = KC_W, |
| [0x24] = KC_E, |
| [0x2d] = KC_R, |
| [0x2c] = KC_T, |
| [0x35] = KC_Y, |
| [0x3c] = KC_U, |
| [0x43] = KC_I, |
| [0x44] = KC_O, |
| [0x4d] = KC_P, |
| [0x54] = KC_LBRACKET, |
| [0x5b] = KC_RBRACKET, |
| [0x58] = KC_CAPS_LOCK, |
| [0x1c] = KC_A, |
| [0x1b] = KC_S, |
| [0x23] = KC_D, |
| [0x2b] = KC_F, |
| [0x34] = KC_G, |
| [0x33] = KC_H, |
| [0x3b] = KC_J, |
| [0x42] = KC_K, |
| [0x4b] = KC_L, |
| [0x4c] = KC_SEMICOLON, |
| [0x52] = KC_QUOTE, |
| [0x5d] = KC_BACKSLASH, |
| [0x12] = KC_LSHIFT, |
| [0x1a] = KC_Z, |
| [0x22] = KC_X, |
| [0x21] = KC_C, |
| [0x2a] = KC_V, |
| [0x32] = KC_B, |
| [0x31] = KC_N, |
| [0x3a] = KC_M, |
| [0x41] = KC_COMMA, |
| [0x49] = KC_PERIOD, |
| [0x4a] = KC_SLASH, |
| [0x59] = KC_RSHIFT, |
| [0x14] = KC_LCTRL, |
| [0x11] = KC_LALT, |
| [0x29] = KC_SPACE, |
| [0x76] = KC_ESCAPE, |
| [0x05] = KC_F1, |
| [0x06] = KC_F2, |
| [0x04] = KC_F3, |
| [0x0c] = KC_F4, |
| [0x03] = KC_F5, |
| [0x0b] = KC_F6, |
| [0x02] = KC_F7, |
| [0x0a] = KC_F8, |
| [0x01] = KC_F9, |
| [0x09] = KC_F10, |
| [0x78] = KC_F11, |
| [0x07] = KC_F12, |
| [0x60] = KC_SCROLL_LOCK, |
| [0x5a] = KC_ENTER, |
| [0x77] = KC_NUM_LOCK, |
| [0x7c] = KC_NTIMES, |
| [0x7b] = KC_NMINUS, |
| [0x79] = KC_NPLUS, |
| [0x6c] = KC_N7, |
| [0x75] = KC_N8, |
| [0x7d] = KC_N9, |
| [0x6b] = KC_N4, |
| [0x73] = KC_N5, |
| [0x74] = KC_N6, |
| [0x69] = KC_N1, |
| [0x72] = KC_N2, |
| [0x7a] = KC_N3, |
| [0x70] = KC_N0, |
| [0x71] = KC_NPERIOD |
| }; |
| static int scanmap_e0[] = { |
| [0x65] = KC_RALT, |
| [0x59] = KC_RSHIFT, |
| [0x64] = KC_PRTSCR, |
| [0x70] = KC_INSERT, |
| [0x6c] = KC_HOME, |
| [0x7d] = KC_PAGE_UP, |
| [0x71] = KC_DELETE, |
| [0x69] = KC_END, |
| [0x7a] = KC_PAGE_DOWN, |
| [0x75] = KC_UP, |
| [0x6b] = KC_LEFT, |
| [0x72] = KC_DOWN, |
| [0x74] = KC_RIGHT, |
| [0x4a] = KC_NSLASH, |
| [0x5a] = KC_NENTER |
| }; |
| int kbd_ctl_init(void) |
| { |
| ds = ds_s; |
| return 0; |
| } |
| void kbd_ctl_parse_scancode(int scancode) |
| { |
| static int key_release_flag = 0; |
| static int is_locked = 0; |
| console_ev_type_t type; |
| unsigned int key; |
| int *map; |
| size_t map_length; |
| if (scancode == 0xe0) { |
| ds = ds_e; |
| return; |
| } |
| switch (ds) { |
| case ds_s: |
| map = scanmap_simple; |
| map_length = sizeof(scanmap_simple) / sizeof(int); |
| break; |
| case ds_e: |
| map = scanmap_e0; |
| map_length = sizeof(scanmap_e0) / sizeof(int); |
| break; |
| default: |
| map = NULL; |
| map_length = 0; |
| } |
| ds = ds_s; |
| if (scancode == 0xf0) { |
| key_release_flag = 1; |
| return; |
| } else { |
| if (key_release_flag) { |
| type = KEY_RELEASE; |
| key_release_flag = 0; |
| if (is_lock_key(scancode)) { |
| if (!is_locked) { |
| is_locked = 1; |
| } else { |
| is_locked = 0; |
| return; |
| } |
| } |
| } else { |
| if (is_lock_key(scancode) && is_locked) |
| return; |
| type = KEY_PRESS; |
| } |
| } |
| if (scancode < 0) |
| return; |
| key = map[scancode]; |
| if (key != 0) |
| kbd_push_ev(type, key); |
| } |
| static bool is_lock_key(int sc) |
| { |
| return ((sc == PL050_CAPS_SCAN_CODE) || (sc == PL050_NUM_SCAN_CODE) || |
| (sc == PL050_SCROLL_SCAN_CODE)); |
| } |
| /** |
| * @} |
| */ |
| /branches/dd/uspace/srv/kbd/port/pl050.c |
|---|
| 0,0 → 1,114 |
| /* |
| * Copyright (c) 2009 Vineeth Pillai |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup kbd_port |
| * @ingroup kbd |
| * @{ |
| */ |
| /** @file |
| * @brief pl050 port driver. |
| */ |
| #include <ddi.h> |
| #include <libarch/ddi.h> |
| #include <ipc/ipc.h> |
| #include <async.h> |
| #include <unistd.h> |
| #include <sysinfo.h> |
| #include <kbd_port.h> |
| #include <kbd.h> |
| #include <ddi.h> |
| #include <stdio.h> |
| #define PL050_STAT_RXFULL (1 << 4) |
| static irq_cmd_t pl050_cmds[] = { |
| { |
| .cmd = CMD_PIO_READ_8, |
| .addr = NULL, |
| .dstarg = 1 |
| }, |
| { |
| .cmd = CMD_BTEST, |
| .value = PL050_STAT_RXFULL, |
| .srcarg = 1, |
| .dstarg = 3 |
| }, |
| { |
| .cmd = CMD_PREDICATE, |
| .value = 2, |
| .srcarg = 3 |
| }, |
| { |
| .cmd = CMD_PIO_READ_8, |
| .addr = NULL, /* will be patched in run-time */ |
| .dstarg = 2 |
| }, |
| { |
| .cmd = CMD_ACCEPT |
| } |
| }; |
| static irq_code_t pl050_kbd = { |
| sizeof(pl050_cmds) / sizeof(irq_cmd_t), |
| pl050_cmds |
| }; |
| static void pl050_irq_handler(ipc_callid_t iid, ipc_call_t *call); |
| int kbd_port_init(void) |
| { |
| pl050_kbd.cmds[0].addr = (void *) sysinfo_value("kbd.address.status"); |
| pl050_kbd.cmds[3].addr = (void *) sysinfo_value("kbd.address.data"); |
| async_set_interrupt_received(pl050_irq_handler); |
| ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &pl050_kbd); |
| return 0; |
| } |
| void kbd_port_yield(void) |
| { |
| } |
| void kbd_port_reclaim(void) |
| { |
| } |
| static void pl050_irq_handler(ipc_callid_t iid, ipc_call_t *call) |
| { |
| int scan_code = IPC_GET_ARG2(*call); |
| kbd_push_scancode(scan_code); |
| return; |
| } |
| /** |
| * @} |
| */ |
| /branches/dd/uspace/srv/kbd/Makefile |
|---|
| 61,6 → 61,7 |
| endif |
| ifeq ($(UARCH), arm32) |
| ifeq ($(MACHINE), testarm) |
| GENARCH_SOURCES += \ |
| port/gxemul.c |
| 72,6 → 73,12 |
| ctl/stty.c |
| endif |
| endif |
| ifeq ($(MACHINE), integratorcp) |
| GENARCH_SOURCES += \ |
| port/pl050.c \ |
| ctl/pl050.c |
| endif |
| endif |
| ifeq ($(UARCH), ia32) |
| GENARCH_SOURCES += \ |
| /branches/dd/uspace/srv/fb/fb.c |
|---|
| 57,6 → 57,7 |
| #include <fibril.h> |
| #include <bool.h> |
| #include <stdio.h> |
| #include <byteorder.h> |
| #include "font-8x16.h" |
| #include "fb.h" |
| 212,9 → 213,9 |
| unsigned int row); |
| #define RED(x, bits) ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1)) |
| #define GREEN(x, bits) ((x >> (8 + 8 - bits)) & ((1 << bits) - 1)) |
| #define BLUE(x, bits) ((x >> (8 - bits)) & ((1 << bits) - 1)) |
| #define RED(x, bits) (((x) >> (8 + 8 + 8 - (bits))) & ((1 << (bits)) - 1)) |
| #define GREEN(x, bits) (((x) >> (8 + 8 - (bits))) & ((1 << (bits)) - 1)) |
| #define BLUE(x, bits) (((x) >> (8 - (bits))) & ((1 << (bits)) - 1)) |
| #define COL2X(col) ((col) * FONT_WIDTH) |
| #define ROW2Y(row) ((row) * FONT_SCANLINES) |
| 226,36 → 227,58 |
| #define BB_POS(vport, col, row) ((row) * vport->cols + (col)) |
| #define GLYPH_POS(glyph, y, cursor) (((glyph) + (cursor) * FONT_GLYPHS) * screen.glyphbytes + (y) * screen.glyphscanline) |
| /** ARGB 8:8:8:8 conversion |
| /* |
| * RGB conversion and mask functions. |
| * |
| * These functions write an RGB value to some memory in some predefined format. |
| * The naming convention corresponds to the format created by these functions. |
| * The functions use the so called network order (i.e. big endian) with respect |
| * to their names. |
| */ |
| static void rgb_0888(void *dst, uint32_t rgb) |
| { |
| *((uint32_t *) dst) = rgb & 0x00ffffff; |
| *((uint32_t *) dst) = host2uint32_t_be((0 << 24) | |
| (RED(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | (BLUE(rgb, 8))); |
| } |
| static void bgr_0888(void *dst, uint32_t rgb) |
| { |
| *((uint32_t *) dst) = host2uint32_t_be((0 << 24) | |
| (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | (RED(rgb, 8))); |
| } |
| static void mask_0888(void *dst, bool mask) |
| { |
| *((uint32_t *) dst) = (mask ? 0x00ffffff : 0); |
| bgr_0888(dst, mask ? 0xffffff : 0); |
| } |
| static void rgb_8880(void *dst, uint32_t rgb) |
| { |
| *((uint32_t *) dst) = host2uint32_t_be((RED(rgb, 8) << 24) | |
| (GREEN(rgb, 8) << 16) | (BLUE(rgb, 8) << 8) | 0); |
| } |
| /** ABGR 8:8:8:8 conversion |
| * |
| */ |
| static void bgr_0888(void *dst, uint32_t rgb) |
| static void bgr_8880(void *dst, uint32_t rgb) |
| { |
| *((uint32_t *) dst) |
| = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8); |
| *((uint32_t *) dst) = host2uint32_t_be((BLUE(rgb, 8) << 24) | |
| (GREEN(rgb, 8) << 16) | (RED(rgb, 8) << 8) | 0); |
| } |
| static void mask_8880(void *dst, bool mask) |
| { |
| bgr_8880(dst, mask ? 0xffffff : 0); |
| } |
| /** RGB 8:8:8 conversion |
| * |
| */ |
| static void rgb_888(void *dst, uint32_t rgb) |
| { |
| ((uint8_t *) dst)[0] = RED(rgb, 8); |
| ((uint8_t *) dst)[1] = GREEN(rgb, 8); |
| ((uint8_t *) dst)[2] = BLUE(rgb, 8); |
| } |
| static void bgr_888(void *dst, uint32_t rgb) |
| { |
| ((uint8_t *) dst)[0] = BLUE(rgb, 8); |
| ((uint8_t *) dst)[1] = GREEN(rgb, 8); |
| ((uint8_t *) dst)[2] = RED(rgb, 8); |
| 263,63 → 286,34 |
| static void mask_888(void *dst, bool mask) |
| { |
| if (mask) { |
| ((uint8_t *) dst)[0] = 0xff; |
| ((uint8_t *) dst)[1] = 0xff; |
| ((uint8_t *) dst)[2] = 0xff; |
| } else { |
| ((uint8_t *) dst)[0] = 0; |
| ((uint8_t *) dst)[1] = 0; |
| ((uint8_t *) dst)[2] = 0; |
| } |
| bgr_888(dst, mask ? 0xffffff : 0); |
| } |
| /** BGR 8:8:8 conversion |
| * |
| */ |
| static void bgr_888(void *dst, uint32_t rgb) |
| static void bgr_555(void *dst, uint32_t rgb) |
| { |
| ((uint8_t *) dst)[0] = RED(rgb, 8); |
| ((uint8_t *) dst)[1] = GREEN(rgb, 8); |
| ((uint8_t *) dst)[2] = BLUE(rgb, 8); |
| uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 5) << 5)) & 0xff; |
| uint8_t lo = (GREEN(rgb, 5) >> 3) | (RED(rgb, 5) << 2); |
| *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo); |
| } |
| /** RGB 5:5:5 conversion |
| * |
| */ |
| static void rgb_555(void *dst, uint32_t rgb) |
| { |
| *((uint16_t *) dst) |
| = (RED(rgb, 5) << 10) | (GREEN(rgb, 5) << 5) | BLUE(rgb, 5); |
| } |
| static void mask_555(void *dst, bool mask) |
| { |
| *((uint16_t *) dst) = (mask ? 0x7fff : 0); |
| bgr_555(dst, mask ? 0xffffff : 0); |
| } |
| /** RGB 5:6:5 conversion |
| * |
| */ |
| static void rgb_565(void *dst, uint32_t rgb) |
| static void bgr_565(void *dst, uint32_t rgb) |
| { |
| *((uint16_t *) dst) |
| = (RED(rgb, 5) << 11) | (GREEN(rgb, 6) << 5) | BLUE(rgb, 5); |
| uint8_t hi = (BLUE(rgb, 5) | (GREEN(rgb, 6) << 5)) & 0xff; |
| uint8_t lo = (GREEN(rgb, 6) >> 3) | (RED(rgb, 5) << 3); |
| *((uint16_t *) dst) = host2uint16_t_be((hi << 8) | lo); |
| } |
| static void mask_565(void *dst, bool mask) |
| { |
| *((uint16_t *) dst) = (mask ? 0xffff : 0); |
| bgr_565(dst, mask ? 0xffffff : 0); |
| } |
| /** RGB 3:2:3 |
| * |
| */ |
| static void rgb_323(void *dst, uint32_t rgb) |
| static void bgr_323(void *dst, uint32_t rgb) |
| { |
| *((uint8_t *) dst) |
| = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3)); |
| 327,7 → 321,7 |
| static void mask_323(void *dst, bool mask) |
| { |
| *((uint8_t *) dst) = (mask ? 0xff : 0); |
| bgr_323(dst, mask ? 0x0 : ~0x0); |
| } |
| /** Draw a filled rectangle. |
| 621,21 → 615,19 |
| static bool screen_init(void *addr, unsigned int xres, unsigned int yres, |
| unsigned int scan, unsigned int visual) |
| { |
| switch (visual) { |
| case VISUAL_INDIRECT_8: |
| screen.rgb_conv = rgb_323; |
| screen.rgb_conv = bgr_323; |
| screen.mask_conv = mask_323; |
| screen.pixelbytes = 1; |
| break; |
| case VISUAL_RGB_5_5_5: |
| screen.rgb_conv = rgb_555; |
| case VISUAL_BGR_5_5_5: |
| screen.rgb_conv = bgr_555; |
| screen.mask_conv = mask_555; |
| screen.pixelbytes = 2; |
| break; |
| case VISUAL_RGB_5_6_5: |
| screen.rgb_conv = rgb_565; |
| case VISUAL_BGR_5_6_5: |
| screen.rgb_conv = bgr_565; |
| screen.mask_conv = mask_565; |
| screen.pixelbytes = 2; |
| break; |
| 650,8 → 642,8 |
| screen.pixelbytes = 3; |
| break; |
| case VISUAL_RGB_8_8_8_0: |
| screen.rgb_conv = rgb_888; |
| screen.mask_conv = mask_888; |
| screen.rgb_conv = rgb_8880; |
| screen.mask_conv = mask_8880; |
| screen.pixelbytes = 4; |
| break; |
| case VISUAL_RGB_0_8_8_8: |
| 664,6 → 656,11 |
| screen.mask_conv = mask_0888; |
| screen.pixelbytes = 4; |
| break; |
| case VISUAL_BGR_8_8_8_0: |
| screen.rgb_conv = bgr_8880; |
| screen.mask_conv = mask_8880; |
| screen.pixelbytes = 4; |
| break; |
| default: |
| return false; |
| } |
| 1744,17 → 1741,17 |
| unsigned int fb_height = sysinfo_value("fb.height"); |
| unsigned int fb_scanline = sysinfo_value("fb.scanline"); |
| unsigned int fb_visual = sysinfo_value("fb.visual"); |
| unsigned int fbsize = fb_scanline * fb_height; |
| void *fb_addr = as_get_mappable_page(fbsize); |
| if (physmem_map(fb_ph_addr + fb_offset, fb_addr, |
| ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0) |
| return -1; |
| if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual)) |
| return 0; |
| return -1; |
| } |