| /trunk/uspace/ns/ns.c |
|---|
| 83,19 → 83,17 |
| static void *clockaddr = NULL; |
| static void *klogaddr = NULL; |
| static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, char *colstr, void **addr) |
| static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr) |
| { |
| void *ph_addr; |
| int ph_color; |
| if (!*addr) { |
| ph_addr = (void *) sysinfo_value(name); |
| ph_addr = (void *)sysinfo_value(name); |
| if (!ph_addr) { |
| ipc_answer_fast(callid, ENOENT, 0, 0); |
| return; |
| } |
| ph_color = (int) sysinfo_value(colstr); |
| *addr = as_get_mappable_page(PAGE_SIZE, ph_color); |
| *addr = as_get_mappable_page(PAGE_SIZE); |
| physmem_map(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE); |
| } |
| ipc_answer_fast(callid, 0, (ipcarg_t) *addr, AS_AREA_READ); |
| 118,12 → 116,10 |
| case IPC_M_AS_AREA_RECV: |
| switch (IPC_GET_ARG3(call)) { |
| case SERVICE_MEM_REALTIME: |
| get_as_area(callid, &call, "clock.faddr", |
| "clock.fcolor", &clockaddr); |
| get_as_area(callid, &call, "clock.faddr", &clockaddr); |
| break; |
| case SERVICE_MEM_KLOG: |
| get_as_area(callid, &call, "klog.faddr", |
| "klog.fcolor", &klogaddr); |
| get_as_area(callid, &call, "klog.faddr", &klogaddr); |
| break; |
| default: |
| ipc_answer_fast(callid, ENOENT, 0, 0); |
| /trunk/uspace/fb/fb.c |
|---|
| 704,10 → 704,9 |
| case IPC_M_AS_AREA_SEND: |
| /* We accept one area for data interchange */ |
| if (IPC_GET_ARG1(*call) == shm_id) { |
| void *dest = as_get_mappable_page(IPC_GET_ARG2(*call), |
| PAGE_COLOR(IPC_GET_ARG1(*call))); |
| void *dest = as_get_mappable_page(IPC_GET_ARG2(*call)); |
| shm_size = IPC_GET_ARG2(*call); |
| if (!ipc_answer_fast(callid, 0, (sysarg_t) dest, 0)) |
| if (!ipc_answer_fast(callid, 0, (sysarg_t)dest, 0)) |
| shm = dest; |
| else |
| shm_id = 0; |
| 717,7 → 716,7 |
| return 1; |
| } else { |
| intersize = IPC_GET_ARG2(*call); |
| receive_comm_area(callid, call, (void *) &interbuffer); |
| receive_comm_area(callid,call,(void *)&interbuffer); |
| } |
| return 1; |
| case FB_PREPARE_SHM: |
| 1283,13 → 1282,12 |
| fb_invert_colors = sysinfo_value("fb.invert-colors"); |
| asz = fb_scanline * fb_height; |
| fb_addr = as_get_mappable_page(asz, (int) sysinfo_value("fb.address.color")); |
| fb_addr = as_get_mappable_page(asz); |
| physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH, |
| AS_AREA_READ | AS_AREA_WRITE); |
| if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual, |
| fb_invert_colors)) |
| if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual, fb_invert_colors)) |
| return 0; |
| return -1; |
| /trunk/uspace/fb/ega.c |
|---|
| 34,6 → 34,7 |
| /** @file |
| */ |
| #include <stdlib.h> |
| #include <unistd.h> |
| #include <align.h> |
| 61,6 → 62,7 |
| saved_screen saved_screens[MAX_SAVED_SCREENS]; |
| #define EGA_IO_ADDRESS 0x3d4 |
| #define EGA_IO_SIZE 2 |
| 124,14 → 126,12 |
| { |
| int i; |
| if (rows > 0) { |
| memcpy (scr_addr,((char *)scr_addr) + rows * scr_width * 2, |
| scr_width * scr_height * 2 - rows * scr_width * 2); |
| memcpy (scr_addr,((char *)scr_addr) + rows * scr_width * 2, scr_width * scr_height * 2 - rows * scr_width * 2); |
| for (i = 0; i < rows * scr_width ; i ++) |
| (((short *)scr_addr) + scr_width * scr_height - rows * |
| scr_width) [i] = ((style << 8) + ' '); |
| (((short *)scr_addr) + scr_width * scr_height - rows * scr_width) [i] = ((style << 8) + ' '); |
| } else if (rows < 0) { |
| memcpy (((char *)scr_addr) - rows * scr_width * 2, scr_addr, |
| scr_width * scr_height * 2 + rows * scr_width * 2); |
| memcpy (((char *)scr_addr) - rows * scr_width * 2 ,scr_addr ,scr_width * scr_height * 2 + rows * scr_width * 2); |
| for (i = 0; i < - rows * scr_width ; i++) |
| ((short *)scr_addr) [i] = ((style << 8 ) + ' '); |
| } |
| 308,14 → 308,13 |
| ega_ph_addr=(void *)sysinfo_value("fb.address.physical"); |
| scr_width=sysinfo_value("fb.width"); |
| scr_height=sysinfo_value("fb.height"); |
| iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2); |
| iospace_enable(task_get_id(),(void *)EGA_IO_ADDRESS,2); |
| sz = scr_width * scr_height * 2; |
| scr_addr = as_get_mappable_page(sz, (int) |
| sysinfo_value("fb.address.color")); |
| sz = scr_width*scr_height*2; |
| scr_addr = as_get_mappable_page(sz); |
| physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >> |
| PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE); |
| physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >> PAGE_WIDTH, |
| AS_AREA_READ | AS_AREA_WRITE); |
| async_set_client_connection(ega_client_connection); |
| /trunk/uspace/fb/main.c |
|---|
| 43,8 → 43,7 |
| { |
| void *dest; |
| dest = as_get_mappable_page(IPC_GET_ARG2(*call), |
| PAGE_COLOR(IPC_GET_ARG1(*call))); |
| dest = as_get_mappable_page(IPC_GET_ARG2(*call)); |
| if (ipc_answer_fast(callid, 0, (sysarg_t)dest, 0) == 0) { |
| if (*area) |
| as_area_destroy(*area); |
| /trunk/uspace/rd/rd.c |
|---|
| 73,12 → 73,11 |
| { |
| size_t rd_size = sysinfo_value("rd.size"); |
| void * rd_ph_addr = (void *) sysinfo_value("rd.address.physical"); |
| int rd_color = (int) sysinfo_value("rd.address.color"); |
| if (rd_size == 0) |
| return false; |
| void * rd_addr = as_get_mappable_page(rd_size, rd_color); |
| void * rd_addr = as_get_mappable_page(rd_size); |
| physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE); |
| /trunk/uspace/libc/include/bitops.h |
|---|
| File deleted |
| /trunk/uspace/libc/include/as.h |
|---|
| 39,15 → 39,12 |
| #include <task.h> |
| #include <kernel/arch/mm/as.h> |
| #include <kernel/mm/as.h> |
| #include <libarch/config.h> |
| #define PAGE_COLOR(va) (((va) >> PAGE_WIDTH) & ((1 << PAGE_COLOR_BITS) - 1)) |
| extern void *as_area_create(void *address, size_t size, int flags); |
| extern int as_area_resize(void *address, size_t size, int flags); |
| extern int as_area_destroy(void *address); |
| extern void *set_maxheapsize(size_t mhs); |
| extern void * as_get_mappable_page(size_t sz, int color); |
| extern void * as_get_mappable_page(size_t sz); |
| #endif |
| /trunk/uspace/libc/generic/as.c |
|---|
| 37,7 → 37,6 |
| #include <unistd.h> |
| #include <align.h> |
| #include <types.h> |
| #include <bitops.h> |
| /** |
| * Either 4*256M on 32-bit architecures or 16*256M on 64-bit architectures. |
| 54,14 → 53,12 |
| */ |
| void *as_area_create(void *address, size_t size, int flags) |
| { |
| return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, |
| (sysarg_t) size, (sysarg_t) flags); |
| return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
| } |
| /** Resize address space area. |
| * |
| * @param address Virtual address pointing into already existing address space |
| * area. |
| * @param address Virtual address pointing into already existing address space area. |
| * @param size New requested size of the area. |
| * @param flags Currently unused. |
| * |
| 69,14 → 66,12 |
| */ |
| int as_area_resize(void *address, size_t size, int flags) |
| { |
| return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) |
| size, (sysarg_t) flags); |
| return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags); |
| } |
| /** Destroy address space area. |
| * |
| * @param address Virtual address pointing into the address space area being |
| * destroyed. |
| * @param address Virtual address pointing into the address space area being destroyed. |
| * |
| * @return Zero on success or a code from @ref errno.h on failure. |
| */ |
| 138,53 → 133,28 |
| maxheapsize = mhs; |
| /* Return pointer to area not managed by sbrk */ |
| return ((void *) &_heap + maxheapsize); |
| } |
| /** Return pointer to some unmapped area, where fits new as_area |
| * |
| * @param sz Requested size of the allocation. |
| * @param color Requested virtual color of the allocation. |
| * |
| * @return Pointer to the beginning |
| * |
| * TODO: make some first_fit/... algorithm, we are now just incrementing |
| * the pointer to last area |
| */ |
| #include <stdio.h> |
| void *as_get_mappable_page(size_t sz, int color) |
| void * as_get_mappable_page(size_t sz) |
| { |
| void *res; |
| uint64_t asz; |
| int i; |
| if (!sz) |
| return NULL; |
| asz = 1 << (fnzb64(sz - 1) + 1); |
| /* Set heapsize to some meaningful value */ |
| if (maxheapsize == -1) |
| set_maxheapsize(MAX_HEAP_SIZE); |
| /* |
| * Make sure we allocate from naturally aligned address and a page of |
| * appropriate color. |
| */ |
| i = 0; |
| do { |
| if (!last_allocated) { |
| last_allocated = (void *) ALIGN_UP((void *) &_heap + |
| maxheapsize, asz); |
| } else { |
| last_allocated = (void *) ALIGN_UP(((uintptr_t) |
| last_allocated) + (int) (i > 0), asz); |
| } |
| } while ((asz < (1 << (PAGE_COLOR_BITS + PAGE_WIDTH))) && |
| (PAGE_COLOR((uintptr_t) last_allocated) != color) && |
| (++i < (1 << PAGE_COLOR_BITS))); |
| if (!last_allocated) |
| last_allocated = (void *) ALIGN_UP((void *) &_heap + maxheapsize, PAGE_SIZE); |
| sz = ALIGN_UP(sz, PAGE_SIZE); |
| res = last_allocated; |
| last_allocated += ALIGN_UP(sz, PAGE_SIZE); |
| last_allocated += sz; |
| return res; |
| } |
| /trunk/uspace/libc/generic/mman.c |
|---|
| 39,7 → 39,7 |
| void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) |
| { |
| if (!start) |
| start = as_get_mappable_page(length, 0); |
| start = as_get_mappable_page(length); |
| // if (! ((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE))) |
| // return MAP_FAILED; |
| /trunk/uspace/libc/generic/time.c |
|---|
| 40,7 → 40,6 |
| #include <unistd.h> |
| #include <atomic.h> |
| #include <futex.h> |
| #include <sysinfo.h> |
| #include <ipc/services.h> |
| #include <sysinfo.h> |
| 72,12 → 71,9 |
| int res; |
| if (!ktime) { |
| mapping = as_get_mappable_page(PAGE_SIZE, (int) |
| sysinfo_value("clock.fcolor")); |
| mapping = as_get_mappable_page(PAGE_SIZE); |
| /* Get the mapping of kernel clock */ |
| res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, (sysarg_t) |
| mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL, &rights, |
| NULL); |
| res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_REALTIME, NULL, &rights, NULL); |
| if (res) { |
| printf("Failed to initialize timeofday memarea\n"); |
| _exit(1); |
| /trunk/uspace/libc/arch/sparc64/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 13 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 1 /**< Bit 13 is the page color. */ |
| #endif |
| /trunk/uspace/libc/arch/ia64/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 14 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/libc/arch/ppc32/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 12 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/libc/arch/amd64/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 12 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/libc/arch/ppc64/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 12 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/libc/arch/mips32/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 14 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/libc/arch/ia32/include/config.h |
|---|
| 37,7 → 37,6 |
| #define PAGE_WIDTH 12 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #endif |
| /trunk/uspace/klog/klog.c |
|---|
| 63,10 → 63,10 |
| printf("Kernel console output.\n"); |
| mapping = as_get_mappable_page(PAGE_SIZE, sysinfo_value("klog.fcolor")); |
| mapping = as_get_mappable_page(PAGE_SIZE); |
| res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, |
| (sysarg_t) mapping, PAGE_SIZE, SERVICE_MEM_KLOG, |
| NULL, NULL, NULL); |
| (sysarg_t)mapping, PAGE_SIZE, SERVICE_MEM_KLOG, |
| NULL,NULL,NULL); |
| if (res) { |
| printf("Failed to initialize klog memarea\n"); |
| _exit(1); |