Index: uspace/lib/c/include/adt/hash_table.h =================================================================== --- uspace/lib/c/include/adt/hash_table.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/adt/hash_table.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -38,4 +38,5 @@ #include #include +#include typedef unsigned long hash_count_t; @@ -83,5 +84,5 @@ list_get_instance((item), type, member) -extern int hash_table_create(hash_table_t *, hash_count_t, hash_count_t, +extern bool hash_table_create(hash_table_t *, hash_count_t, hash_count_t, hash_table_operations_t *); extern void hash_table_insert(hash_table_t *, unsigned long [], link_t *); Index: uspace/lib/c/include/as.h =================================================================== --- uspace/lib/c/include/as.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/as.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -60,4 +60,5 @@ extern void *set_maxheapsize(size_t); extern void * as_get_mappable_page(size_t); +extern int as_get_physical_mapping(void *, uintptr_t *); #endif Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/async.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -340,4 +340,5 @@ (arg4), (answer)) +extern aid_t async_data_read(int, void *, size_t, ipc_call_t *); #define async_data_read_start(p, buf, len) \ async_data_read_start_generic((p), (buf), (len), IPC_XF_NONE) Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/devman.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -55,4 +55,5 @@ extern int devman_device_get_handle_by_class(const char *, const char *, devman_handle_t *, unsigned int); +extern int devman_get_device_path(devman_handle_t, char *, size_t); extern int devman_add_device_to_class(devman_handle_t, const char *); Index: uspace/lib/c/include/errno.h =================================================================== --- uspace/lib/c/include/errno.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/errno.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -56,4 +56,16 @@ #define EMLINK (-266) +/** Bad checksum. */ +#define EBADCHECKSUM (-300) + +/** USB: stalled operation. */ +#define ESTALL (-301) + +/** Empty resource (no data). */ +#define EEMPTY (-302) + +/** Negative acknowledgment. */ +#define ENAK (-303) + /** An API function is called while another blocking function is in progress. */ #define EINPROGRESS (-10036) Index: uspace/lib/c/include/ipc/dev_iface.h =================================================================== --- uspace/lib/c/include/ipc/dev_iface.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/ipc/dev_iface.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -37,4 +37,15 @@ HW_RES_DEV_IFACE = 0, CHAR_DEV_IFACE, + + /** Interface provided by any PCI device. */ + PCI_DEV_IFACE, + + /** Interface provided by any USB device. */ + USB_DEV_IFACE, + /** Interface provided by USB host controller. */ + USBHC_DEV_IFACE, + /** Interface provided by USB HID devices. */ + USBHID_DEV_IFACE, + DEV_IFACE_MAX } dev_inferface_idx_t; @@ -48,4 +59,14 @@ DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX) +/* + * The first argument is actually method (as the "real" method is used + * for indexing into interfaces. + */ + +#define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call)) +#define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call)) +#define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call)) +#define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call)) + #endif Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/ipc/devman.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -149,5 +149,6 @@ typedef enum { DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD, - DEVMAN_DEVICE_GET_HANDLE_BY_CLASS + DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, + DEVMAN_DEVICE_GET_DEVICE_PATH } client_to_devman_t; Index: uspace/lib/c/include/ipc/kbd.h =================================================================== --- uspace/lib/c/include/ipc/kbd.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/ipc/kbd.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -39,7 +39,8 @@ #include +#include typedef enum { - KBD_YIELD = IPC_FIRST_USER_METHOD, + KBD_YIELD = DEV_FIRST_CUSTOM_METHOD, KBD_RECLAIM } kbd_request_t; Index: uspace/lib/c/include/l18n/langs.h =================================================================== --- uspace/lib/c/include/l18n/langs.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) +++ uspace/lib/c/include/l18n/langs.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2005 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 libc + * @{ + */ +/** @file + * Language and locale ids. + */ + +#ifndef LIBC_L18N_LANGS_H_ +#define LIBC_L18N_LANGS_H_ + +/** Windows locale IDs. + * Codes taken from + * Developing International Software For Windows 95 and Windows NT + * by Nadine Kano (Microsoft Press). + * FIXME: add missing codes. + */ +typedef enum { + L18N_WIN_LOCALE_AFRIKAANS = 0x0436, + /* ... */ + L18N_WIN_LOCALE_CZECH = 0x0405, + /* ... */ + L18N_WIN_LOCALE_ENGLISH_UNITED_STATES = 0x0409, + /* ... */ + L18N_WIN_LOCALE_SLOVAK = 0x041B, + /* ... */ + L18N_WIN_LOCALE_SPANISH_TRADITIONAL = 0x040A, + /* ... */ + L18N_WIN_LOCALE_ZULU = 0x0435 +} l18_win_locales_t; + +const char *str_l18_win_locale(l18_win_locales_t); + +#endif + +/** @} + */ Index: uspace/lib/c/include/sys/time.h =================================================================== --- uspace/lib/c/include/sys/time.h (revision f9061b499e4439544d82ae29d075f8782dde1065) +++ uspace/lib/c/include/sys/time.h (revision 160b75e098f96312d13cf8c93e26f0ee3e46c1a5) @@ -62,4 +62,6 @@ extern int gettimeofday(struct timeval *tv, struct timezone *tz); +extern void udelay(useconds_t); + #endif