| /branches/dd/uspace/lib/libc/include/console.h |
|---|
| 27,7 → 27,7 |
| */ |
| /** @addtogroup libc |
| * @{ |
| * @{ |
| */ |
| /** @file |
| */ |
| 40,19 → 40,16 |
| #include <sys/types.h> |
| #include <bool.h> |
| extern void console_open(bool); |
| extern int console_open(bool); |
| extern void console_close(void); |
| extern int console_phone_get(bool); |
| extern void console_wait(void); |
| extern void console_clear(void); |
| extern void console_goto(int, int); |
| extern void console_putchar(wchar_t); |
| extern ssize_t console_write(const char *buf, size_t nbyte); |
| extern void console_putstr(const char *s); |
| extern ssize_t console_write(const char *, size_t); |
| extern void console_putstr(const char *); |
| extern void console_flush(void); |
| extern void console_flush_optional(void); |
| extern int console_get_size(int *, int *); |
| extern void console_set_style(int); |
| 63,6 → 60,6 |
| extern void console_kcon_enable(void); |
| #endif |
| /** @} |
| */ |
| /branches/dd/uspace/lib/libc/include/string.h |
|---|
| 42,10 → 42,10 |
| #define U_SPECIAL '?' |
| #define U_BOM 0xfeff |
| /**< No size limit constant */ |
| /** No size limit constant */ |
| #define STR_NO_LIMIT ((size_t) -1) |
| /**< Maximum size of a string containing @c length characters */ |
| /** Maximum size of a string containing @c length characters */ |
| #define STR_BOUNDS(length) ((length) << 2) |
| extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); |
| /branches/dd/uspace/lib/libc/include/vfs/vfs.h |
|---|
| 39,8 → 39,8 |
| extern char *absolutize(const char *, size_t *); |
| extern int mount(const char *, const char *, const char *, |
| const unsigned int flags); |
| extern int mount(const char *, const char *, const char *, const char *, |
| unsigned int flags); |
| #endif |
| /branches/dd/uspace/lib/libc/include/async.h |
|---|
| 98,22 → 98,22 |
| /* Wrappers for simple communication */ |
| #define async_msg_0(phone, method) \ |
| ipc_call_async_0((phone), (method), NULL, NULL, !in_interrupt_handler()) |
| ipc_call_async_0((phone), (method), NULL, NULL, true) |
| #define async_msg_1(phone, method, arg1) \ |
| ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \ |
| !in_interrupt_handler()) |
| true) |
| #define async_msg_2(phone, method, arg1, arg2) \ |
| ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \ |
| !in_interrupt_handler()) |
| true) |
| #define async_msg_3(phone, method, arg1, arg2, arg3) \ |
| ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \ |
| !in_interrupt_handler()) |
| true) |
| #define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \ |
| ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ |
| NULL, !in_interrupt_handler()) |
| NULL, true) |
| #define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \ |
| ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \ |
| (arg5), NULL, NULL, !in_interrupt_handler()) |
| (arg5), NULL, NULL, true) |
| /* |
| * User-friendly wrappers for async_req_fast() and async_req_slow(). The macros |
| 253,8 → 253,6 |
| fibril_dec_sercount(); |
| } |
| extern bool in_interrupt_handler(void); |
| extern atomic_t async_futex; |
| #endif |
| /branches/dd/uspace/lib/libc/include/libadt/list.h |
|---|
| 37,26 → 37,20 |
| #include <unistd.h> |
| #ifndef true |
| # define true 1 |
| #endif |
| #ifndef false |
| # define false 0 |
| #endif |
| typedef struct link link_t; |
| /** Doubly linked list head and link type. */ |
| struct link { |
| link_t *prev; /**< Pointer to the previous item in the list. */ |
| link_t *next; /**< Pointer to the next item in the list. */ |
| }; |
| typedef struct link { |
| struct link *prev; /**< Pointer to the previous item in the list. */ |
| struct link *next; /**< Pointer to the next item in the list. */ |
| } link_t; |
| /** Declare and initialize statically allocated list. |
| * |
| * @param name Name of the new statically allocated list. |
| */ |
| #define LIST_INITIALIZE(name) link_t name = { .prev = &name, .next = &name } |
| #define LIST_INITIALIZE(name) link_t name = { \ |
| .prev = &name, \ |
| .next = &name \ |
| } |
| /** Initialize doubly-linked circular list link |
| * |
| 145,7 → 139,7 |
| */ |
| static inline int list_empty(link_t *head) |
| { |
| return head->next == head ? true : false; |
| return ((head->next == head) ? 1 : 0); |
| } |
| 161,11 → 155,11 |
| */ |
| static inline void headless_list_split_or_concat(link_t *part1, link_t *part2) |
| { |
| link_t *hlp; |
| part1->prev->next = part2; |
| part2->prev->next = part1; |
| hlp = part1->prev; |
| part2->prev->next = part1; |
| link_t *hlp = part1->prev; |
| part1->prev = part2->prev; |
| part2->prev = hlp; |
| } |
| 195,10 → 189,11 |
| headless_list_split_or_concat(part1, part2); |
| } |
| #define list_get_instance(link,type,member) (type *)(((char *)(link))-((char *)&(((type *)NULL)->member))) |
| #define list_get_instance(link, type, member) ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member)))) |
| extern int list_member(const link_t *link, const link_t *head); |
| extern void list_concat(link_t *head1, link_t *head2); |
| extern unsigned int list_count(const link_t *link); |
| #endif |
| /branches/dd/uspace/lib/libc/include/devmap.h |
|---|
| 0,0 → 1,56 |
| /* |
| * Copyright (c) 2009 Jiri Svoboda |
| * 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 libc |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef LIBC_DEVMAP_H_ |
| #define LIBC_DEVMAP_H_ |
| #include <ipc/devmap.h> |
| #include <async.h> |
| extern int devmap_get_phone(devmap_interface_t, unsigned int); |
| extern void devmap_hangup_phone(devmap_interface_t iface); |
| extern int devmap_driver_register(const char *, async_client_conn_t); |
| extern int devmap_device_register(const char *, dev_handle_t *); |
| extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int); |
| extern int devmap_device_connect(dev_handle_t, unsigned int); |
| extern ipcarg_t devmap_device_get_count(void); |
| extern ipcarg_t devmap_device_get_devices(ipcarg_t, dev_desc_t *); |
| #endif |
| /** @} |
| */ |
| /branches/dd/uspace/lib/libc/include/io/stream.h |
|---|
| 37,15 → 37,12 |
| #include <libarch/types.h> |
| #define EMFILE -17 |
| #define EMFILE -17 |
| extern ssize_t read_stdin(void *, size_t); |
| extern int klog_puts(const char *); |
| extern void klog_update(void); |
| extern ssize_t read_stdin(void *, size_t); |
| extern ssize_t write_stdout(const void *, size_t); |
| extern ssize_t write_stderr(const void *, size_t); |
| extern int flush_stdout(void); |
| #endif |
| /** @} |
| /branches/dd/uspace/lib/libc/include/ipc/devmap.h |
|---|
| 33,11 → 33,14 |
| #ifndef DEVMAP_DEVMAP_H_ |
| #define DEVMAP_DEVMAP_H_ |
| #include <atomic.h> |
| #include <ipc/ipc.h> |
| #include <libadt/list.h> |
| #define DEVMAP_NAME_MAXLEN 512 |
| #define DEVMAP_NAME_MAXLEN 255 |
| typedef ipcarg_t dev_handle_t; |
| typedef enum { |
| DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD, |
| DEVMAP_DRIVER_UNREGISTER, |
| 44,56 → 47,30 |
| DEVMAP_DEVICE_REGISTER, |
| DEVMAP_DEVICE_UNREGISTER, |
| DEVMAP_DEVICE_GET_NAME, |
| DEVMAP_DEVICE_GET_HANDLE |
| DEVMAP_DEVICE_GET_HANDLE, |
| DEVMAP_DEVICE_GET_COUNT, |
| DEVMAP_DEVICE_GET_DEVICES |
| } devmap_request_t; |
| /** Representation of device driver. |
| * Each driver is responsible for a set of devices. |
| */ |
| typedef struct { |
| /** Pointers to previous and next drivers in linked list */ |
| link_t drivers; |
| /** Pointer to the linked list of devices controlled by |
| * this driver */ |
| link_t devices; |
| /** Phone asociated with this driver */ |
| ipcarg_t phone; |
| /** Device driver name */ |
| char *name; |
| /** Futex for list of devices owned by this driver */ |
| atomic_t devices_futex; |
| } devmap_driver_t; |
| /** Info about registered device |
| /** Interface provided by devmap. |
| * |
| */ |
| typedef struct { |
| /** Pointer to the previous and next device in the list of all devices */ |
| link_t devices; |
| /** Pointer to the previous and next device in the list of devices |
| owned by one driver */ |
| link_t driver_devices; |
| /** Unique device identifier */ |
| int handle; |
| /** Device name */ |
| char *name; |
| /** Device driver handling this device */ |
| devmap_driver_t *driver; |
| } devmap_device_t; |
| /** Interface provided by devmap. |
| * Every process that connects to devmap must ask one of following |
| * interfaces otherwise connection will be refused. |
| * |
| */ |
| typedef enum { |
| /** Connect as device driver */ |
| DEVMAP_DRIVER = 1, |
| /** Connect as client */ |
| /** Connect as device driver */ |
| DEVMAP_DRIVER = 1, |
| /** Connect as client */ |
| DEVMAP_CLIENT, |
| /** Create new connection to instance of device that |
| * is specified by second argument of call. */ |
| /** Create new connection to instance of device that |
| is specified by second argument of call. */ |
| DEVMAP_CONNECT_TO_DEVICE |
| } devmap_interface_t; |
| typedef struct { |
| dev_handle_t handle; |
| char name[DEVMAP_NAME_MAXLEN + 1]; |
| } dev_desc_t; |
| #endif |
| /branches/dd/uspace/lib/libc/include/ipc/bd.h |
|---|
| 0,0 → 1,48 |
| /* |
| * Copyright (c) 2009 Jiri Svoboda |
| * 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_IPC_BD_H_ |
| #define LIBC_IPC_BD_H_ |
| #include <ipc/ipc.h> |
| typedef enum { |
| BD_READ_BLOCK = IPC_FIRST_USER_METHOD, |
| BD_WRITE_BLOCK |
| } bd_request_t; |
| #endif |
| /** @} |
| */ |
| /branches/dd/uspace/lib/libc/include/ipc/fb.h |
|---|
| 66,7 → 66,9 |
| FB_ANIM_CHGVP, |
| FB_ANIM_START, |
| FB_ANIM_STOP, |
| FB_POINTER_MOVE |
| FB_POINTER_MOVE, |
| FB_SCREEN_YIELD, |
| FB_SCREEN_RECLAIM |
| } fb_request_t; |
| #endif |