| /branches/dynload/uspace/lib/libc/include/ddi.h |
|---|
| 37,9 → 37,10 |
| #include <task.h> |
| extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags); |
| extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size); |
| extern int preemption_control(int enable); |
| extern int physmem_map(void *, void *, unsigned long, int); |
| extern int iospace_enable(task_id_t, void *, unsigned long); |
| extern int preemption_control(int); |
| extern int pio_enable(void *, size_t, void **); |
| #endif |
| /branches/dynload/uspace/lib/libc/include/task.h |
|---|
| 40,6 → 40,7 |
| typedef uint64_t task_id_t; |
| extern task_id_t task_get_id(void); |
| extern int task_set_name(const char *name); |
| extern task_id_t task_spawn(const char *path, char *const argv[]); |
| #endif |
| /branches/dynload/uspace/lib/libc/include/kbd/keycode.h |
|---|
| 199,9 → 199,19 |
| } keycode_t; |
| enum keymod { |
| KM_SHIFT = 0x01, |
| KM_CTRL = 0x02, |
| KM_ALT = 0x04 |
| KM_LSHIFT = 0x001, |
| KM_RSHIFT = 0x002, |
| KM_LCTRL = 0x004, |
| KM_RCTRL = 0x008, |
| KM_LALT = 0x010, |
| KM_RALT = 0x020, |
| KM_CAPS_LOCK = 0x040, |
| KM_NUM_LOCK = 0x080, |
| KM_SCROLL_LOCK = 0x100, |
| KM_SHIFT = KM_LSHIFT | KM_RSHIFT, |
| KM_CTRL = KM_LCTRL | KM_RCTRL, |
| KM_ALT = KM_LALT | KM_RALT |
| } keymod_t; |
| #endif |
| /branches/dynload/uspace/lib/libc/include/ipc/bus.h |
|---|
| 0,0 → 1,47 |
| /* |
| * Copyright (c) 2009 Jakub Jermar |
| * 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 libcipc |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef LIBC_BUS_H_ |
| #define LIBC_BUS_H_ |
| #include <ipc/ipc.h> |
| typedef enum { |
| BUS_CLEAR_INTERRUPT = IPC_FIRST_USER_METHOD |
| } bus_request_t; |
| #endif |
| /** @} |
| */ |
| /branches/dynload/uspace/lib/libc/include/ipc/services.h |
|---|
| 44,7 → 44,9 |
| SERVICE_VIDEO, |
| SERVICE_CONSOLE, |
| SERVICE_VFS, |
| SERVICE_DEVMAP |
| SERVICE_DEVMAP, |
| SERVICE_FHC, |
| SERVICE_OBIO |
| } services_t; |
| /* Memory area to be received from NS */ |
| /branches/dynload/uspace/lib/libc/generic/ddi.c |
|---|
| 35,6 → 35,9 |
| #include <ddi.h> |
| #include <libc.h> |
| #include <task.h> |
| #include <as.h> |
| #include <align.h> |
| #include <libarch/config.h> |
| #include <kernel/ddi/ddi_arg.h> |
| /** Map piece of physical memory to task. |
| 41,18 → 44,20 |
| * |
| * Caller of this function must have the CAP_MEM_MANAGER capability. |
| * |
| * @param pf Physical address of the starting frame. |
| * @param vp Virtual address of the sterting page. |
| * @param pages Number of pages to map. |
| * @param flags Flags for the new address space area. |
| * @param pf Physical address of the starting frame. |
| * @param vp Virtual address of the starting page. |
| * @param pages Number of pages to map. |
| * @param flags Flags for the new address space area. |
| * |
| * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability, |
| * ENOENT if there is no task with specified ID and ENOMEM if there |
| * was some problem in creating address space area. |
| * @return 0 on success, EPERM if the caller lacks the |
| * CAP_MEM_MANAGER capability, ENOENT if there is no task |
| * with specified ID and ENOMEM if there was some problem |
| * in creating address space area. |
| */ |
| int physmem_map(void *pf, void *vp, unsigned long pages, int flags) |
| { |
| return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags); |
| return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, |
| flags); |
| } |
| /** Enable I/O space range to task. |
| 59,13 → 64,14 |
| * |
| * Caller of this function must have the IO_MEM_MANAGER capability. |
| * |
| * @param id Task ID. |
| * @param ioaddr Starting address of the I/O range. |
| * @param size Size of the range. |
| * @param id Task ID. |
| * @param ioaddr Starting address of the I/O range. |
| * @param size Size of the range. |
| * |
| * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability, |
| * ENOENT if there is no task with specified ID and ENOMEM if there |
| * was some problem in allocating memory. |
| * @return 0 on success, EPERM if the caller lacks the |
| * CAP_IO_MANAGER capability, ENOENT if there is no task |
| * with specified ID and ENOMEM if there was some problem |
| * in allocating memory. |
| */ |
| int iospace_enable(task_id_t id, void *ioaddr, unsigned long size) |
| { |
| 80,7 → 86,7 |
| /** Interrupt control |
| * |
| * @param enable 1 - enable interrupts, 0 - disable interrupts |
| * @param enable 1 - enable interrupts, 0 - disable interrupts |
| */ |
| int preemption_control(int enable) |
| { |
| 87,5 → 93,36 |
| return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable); |
| } |
| /** Enable PIO for specified I/O range. |
| * |
| * @param pio_addr I/O start address. |
| * @param size Size of the I/O region. |
| * @param use_addr Address where the final address for application's PIO |
| * will be stored. |
| * |
| * @return Zero on success or negative error code. |
| */ |
| int pio_enable(void *pio_addr, size_t size, void **use_addr) |
| { |
| void *phys; |
| void *virt; |
| size_t offset; |
| unsigned int pages; |
| #ifdef IO_SPACE_BOUNDARY |
| if (pio_addr < IO_SPACE_BOUNDARY) { |
| *use_addr = pio_addr; |
| return iospace_enable(task_get_id(), pio_addr, size); |
| } |
| #endif |
| phys = ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE); |
| offset = pio_addr - phys; |
| pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH; |
| virt = as_get_mappable_page(pages); |
| *use_addr = virt + offset; |
| return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE); |
| } |
| /** @} |
| */ |
| /branches/dynload/uspace/lib/libc/generic/task.c |
|---|
| 38,6 → 38,7 |
| #include <stdlib.h> |
| #include <errno.h> |
| #include <loader/loader.h> |
| #include <string.h> |
| task_id_t task_get_id(void) |
| { |
| 48,6 → 49,17 |
| return task_id; |
| } |
| /** Set the task name. |
| * |
| * @param name The new name, typically the command used to execute the |
| * program. |
| * @return Zero on success or negative error code. |
| */ |
| int task_set_name(const char *name) |
| { |
| return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, strlen(name)); |
| } |
| /** Create a new task by running an executable from the filesystem. |
| * |
| * This is really just a convenience wrapper over the more complicated |
| /branches/dynload/uspace/lib/libc/arch/ia32/include/ddi.h |
|---|
| 33,6 → 33,8 |
| #ifndef LIBC_ia32_DDI_H_ |
| #define LIBC_ia32_DDI_H_ |
| #define IO_SPACE_BOUNDARY ((void *) (64 * 1024)) |
| static inline void outb(int16_t port, uint8_t b) |
| { |
| asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port)); |