Index: uspace/lib/c/include/adt/checksum.h =================================================================== --- uspace/lib/c/include/adt/checksum.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2012 Dominik Taborsky - * 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_CHECKSUM_H_ -#define _LIBC_CHECKSUM_H_ - -#include -#include - -extern uint32_t compute_crc32(uint8_t *, size_t); -extern uint32_t compute_crc32_seed(uint8_t *, size_t, uint32_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/circ_buf.h =================================================================== --- uspace/lib/c/include/adt/circ_buf.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,66 +1,0 @@ -/* - * Copyright (c) 2017 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 Circular buffer - */ - -#ifndef _LIBC_CIRC_BUF_H_ -#define _LIBC_CIRC_BUF_H_ - -#include -#include - -/** Circular buffer */ -typedef struct { - /** Buffer */ - void *buf; - /** Number of buffer members */ - size_t nmemb; - /** Member size */ - size_t size; - /** Read position */ - size_t rp; - /** Write position */ - size_t wp; - /** Number of used entries */ - size_t nused; -} circ_buf_t; - -extern void circ_buf_init(circ_buf_t *, void *, size_t, size_t); -extern size_t circ_buf_nfree(circ_buf_t *); -extern size_t circ_buf_nused(circ_buf_t *); -extern errno_t circ_buf_push(circ_buf_t *, const void *); -extern errno_t circ_buf_pop(circ_buf_t *, void *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/fifo.h =================================================================== --- uspace/lib/c/include/adt/fifo.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,127 +1,0 @@ -/* - * Copyright (c) 2006 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 - */ - -/* - * This implementation of FIFO stores values in an array - * (static or dynamic). As such, these FIFOs have upper bound - * on number of values they can store. Push and pop operations - * are done via accessing the array through head and tail indices. - * Because of better operation ordering in fifo_pop(), the access - * policy for these two indices is to 'increment (mod size of FIFO) - * and use'. - */ - -#ifndef _LIBC_FIFO_H_ -#define _LIBC_FIFO_H_ - -#include - -typedef unsigned long fifo_count_t; -typedef unsigned long fifo_index_t; - -#define FIFO_CREATE_STATIC(name, t, itms) \ - struct { \ - t fifo[(itms)]; \ - fifo_count_t items; \ - fifo_index_t head; \ - fifo_index_t tail; \ - } name - -/** Create and initialize static FIFO. - * - * FIFO is allocated statically. - * This macro is suitable for creating smaller FIFOs. - * - * @param name Name of FIFO. - * @param t Type of values stored in FIFO. - * @param itms Number of items that can be stored in FIFO. - */ -#define FIFO_INITIALIZE_STATIC(name, t, itms) \ - FIFO_CREATE_STATIC(name, t, itms) = { \ - .items = (itms), \ - .head = 0, \ - .tail = 0 \ - } - -/** Create and prepare dynamic FIFO. - * - * FIFO is allocated dynamically. - * This macro is suitable for creating larger FIFOs. - * - * @param name Name of FIFO. - * @param t Type of values stored in FIFO. - * @param itms Number of items that can be stored in FIFO. - */ -#define FIFO_INITIALIZE_DYNAMIC(name, t, itms) \ - struct { \ - t *fifo; \ - fifo_count_t items; \ - fifo_index_t head; \ - fifo_index_t tail; \ - } name = { \ - .fifo = NULL, \ - .items = (itms), \ - .head = 0, \ - .tail = 0 \ - } - -/** Pop value from head of FIFO. - * - * @param name FIFO name. - * - * @return Leading value in FIFO. - */ -#define fifo_pop(name) \ - name.fifo[name.head = (name.head + 1) < name.items ? (name.head + 1) : 0] - -/** Push value to tail of FIFO. - * - * @param name FIFO name. - * @param value Value to be appended to FIFO. - * - */ -#define fifo_push(name, value) \ - name.fifo[name.tail = (name.tail + 1) < name.items ? (name.tail + 1) : 0] = (value) - -/** Allocate memory for dynamic FIFO. - * - * @param name FIFO name. - */ -#define fifo_create(name) \ - name.fifo = malloc(sizeof(*name.fifo) * name.items) - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/gcdlcm.h =================================================================== --- uspace/lib/c/include/adt/gcdlcm.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * 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_GCDLCM_H_ -#define _LIBC_GCDLCM_H_ - -#include -#include - -#define DECLARE_GCD(type, name) \ - static inline type name(type a, type b) \ - { \ - if (a == 0) \ - return b; \ - \ - while (b != 0) { \ - if (a > b) \ - a -= b; \ - else \ - b -= a; \ - } \ - \ - return a; \ - } - -#define DECLARE_LCM(type, name, gcd) \ - static inline type name(type a, type b) \ - { \ - return (a * b) / gcd(a, b); \ - } - -DECLARE_GCD(uint32_t, gcd32); -DECLARE_GCD(uint64_t, gcd64); -DECLARE_GCD(size_t, gcd); - -DECLARE_LCM(uint32_t, lcm32, gcd32); -DECLARE_LCM(uint64_t, lcm64, gcd64); -DECLARE_LCM(size_t, lcm, gcd); - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/hash.h =================================================================== --- uspace/lib/c/include/adt/hash.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,113 +1,0 @@ -/* - * Copyright (c) 2012 Adam Hraska - * 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_ADT_HASH_H_ -#define _LIBC_ADT_HASH_H_ - -#include -#include - -/** Produces a uniform hash affecting all output bits from the skewed input. */ -static inline uint32_t hash_mix32(uint32_t hash) -{ - /* - * Thomas Wang's modification of Bob Jenkin's hash mixing function: - * http://www.concentric.net/~Ttwang/tech/inthash.htm - * Public domain. - */ - hash = ~hash + (hash << 15); - hash = hash ^ (hash >> 12); - hash = hash + (hash << 2); - hash = hash ^ (hash >> 4); - hash = hash * 2057; - hash = hash ^ (hash >> 16); - return hash; -} - -/** Produces a uniform hash affecting all output bits from the skewed input. */ -static inline uint64_t hash_mix64(uint64_t hash) -{ - /* - * Thomas Wang's public domain 64-bit hash mixing function: - * http://www.concentric.net/~Ttwang/tech/inthash.htm - */ - hash = (hash ^ 61) ^ (hash >> 16); - hash = hash + (hash << 3); - hash = hash ^ (hash >> 4); - hash = hash * 0x27d4eb2d; - hash = hash ^ (hash >> 15); - /* - * Lower order bits are mixed more thoroughly. Swap them with - * the higher order bits and make the resulting higher order bits - * more usable. - */ - return (hash << 32) | (hash >> 32); -} - -/** Produces a uniform hash affecting all output bits from the skewed input. */ -static inline size_t hash_mix(size_t hash) -{ -#ifdef __32_BITS__ - return hash_mix32(hash); -#elif defined(__64_BITS__) - return hash_mix64(hash); -#else -#error Unknown size_t size - cannot select proper hash mix function. -#endif -} - -/** Use to create a hash from multiple values. - * - * Typical usage: - * @code - * int car_id; - * bool car_convertible; - * // .. - * size_t hash = 0; - * hash = hash_combine(hash, car_id); - * hash = hash_combine(hash, car_convertible); - * // Now use hash as a hash of both car_id and car_convertible. - * @endcode - */ -static inline size_t hash_combine(size_t seed, size_t hash) -{ - /* - * todo: use Bob Jenkin's proper mixing hash pass: - * http://burtleburtle.net/bob/c/lookup3.c - */ - seed ^= hash + 0x9e3779b9 + - ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5))); - return seed; -} - -#endif Index: uspace/lib/c/include/adt/hash_table.h =================================================================== --- uspace/lib/c/include/adt/hash_table.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,108 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * Copyright (c) 2012 Adam Hraska - * - * 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_HASH_TABLE_H_ -#define _LIBC_HASH_TABLE_H_ - -#include -#include -#include -#include - -/** Opaque hash table link type. */ -typedef struct ht_link { - link_t link; -} ht_link_t; - -/** Set of operations for hash table. */ -typedef struct { - /** Returns the hash of the key stored in the item (ie its lookup key). */ - size_t (*hash)(const ht_link_t *item); - - /** Returns the hash of the key. */ - size_t (*key_hash)(const void *key); - - /** True if the items are equal (have the same lookup keys). */ - bool (*equal)(const ht_link_t *item1, const ht_link_t *item2); - - /** Returns true if the key is equal to the item's lookup key. */ - bool (*key_equal)(const void *key, const ht_link_t *item); - - /** Hash table item removal callback. - * - * Must not invoke any mutating functions of the hash table. - * - * @param item Item that was removed from the hash table. - */ - void (*remove_callback)(ht_link_t *item); -} hash_table_ops_t; - -/** Hash table structure. */ -typedef struct { - const hash_table_ops_t *op; - list_t *bucket; - size_t bucket_cnt; - size_t full_item_cnt; - size_t item_cnt; - size_t max_load; - bool apply_ongoing; -} hash_table_t; - -#define hash_table_get_inst(item, type, member) \ - member_to_inst((item), type, member) - -extern bool hash_table_create(hash_table_t *, size_t, size_t, - const hash_table_ops_t *); -extern void hash_table_destroy(hash_table_t *); - -extern bool hash_table_empty(hash_table_t *); -extern size_t hash_table_size(hash_table_t *); - -extern void hash_table_clear(hash_table_t *); -extern void hash_table_insert(hash_table_t *, ht_link_t *); -extern bool hash_table_insert_unique(hash_table_t *, ht_link_t *); -extern ht_link_t *hash_table_find(const hash_table_t *, const void *); -extern ht_link_t *hash_table_find_next(const hash_table_t *, ht_link_t *, - ht_link_t *); -extern size_t hash_table_remove(hash_table_t *, const void *); -extern void hash_table_remove_item(hash_table_t *, ht_link_t *); -extern void hash_table_apply(hash_table_t *, bool (*)(ht_link_t *, void *), - void *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/list.h =================================================================== --- uspace/lib/c/include/adt/list.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,451 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * Copyright (c) 2013 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_LIST_H_ -#define _LIBC_LIST_H_ - -#include -#include -#include -#include -#include -#include -#include <_bits/decls.h> - -#ifndef __cplusplus - -/** - * We don't define the macros in C++ to avoid polluting headers with - * namespaceless names. We don't actually need them, so this is fine. - * We still allow including the rest of the file (in `helenos` namespace) - * so that we can expose publicly visible types that have list_t members. - */ - -/** Declare and initialize statically allocated list. - * - * @param name Name of the new statically allocated list. - * - */ -#define LIST_INITIALIZE(name) \ - list_t name = LIST_INITIALIZER(name) - -/** Initializer for statically allocated list. - * - * @code - * struct named_list { - * const char *name; - * list_t list; - * } var = { - * .name = "default name", - * .list = LIST_INITIALIZER(name_list.list) - * }; - * @endcode - * - * @param name Name of the new statically allocated list. - * - */ -#define LIST_INITIALIZER(name) \ - { \ - .head = { \ - .prev = &(name).head, \ - .next = &(name).head \ - } \ - } - -#define list_get_instance(link, type, member) \ - member_to_inst(link, type, member) - -#define list_foreach(list, member, itype, iterator) \ - for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) sizeof(itype)) \ - for (link_t *_link = (list).head.next; \ - iterator = list_get_instance(_link, itype, member), \ - _link != &(list).head; _link = _link->next) - -#define list_foreach_rev(list, member, itype, iterator) \ - for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) sizeof(itype)) \ - for (link_t *_link = (list).head.prev; \ - iterator = list_get_instance(_link, itype, member), \ - _link != &(list).head; _link = _link->prev) - -/** Unlike list_foreach(), allows removing items while traversing a list. - * - * @code - * list_t mylist; - * typedef struct item { - * int value; - * link_t item_link; - * } item_t; - * - * //.. - * - * // Print each list element's value and remove the element from the list. - * list_foreach_safe(mylist, cur_link, next_link) { - * item_t *cur_item = list_get_instance(cur_link, item_t, item_link); - * printf("%d\n", cur_item->value); - * list_remove(cur_link); - * } - * @endcode - * - * @param list List to traverse. - * @param iterator Iterator to the current element of the list. - * The item this iterator points may be safely removed - * from the list. - * @param next_iter Iterator to the next element of the list. - */ -#define list_foreach_safe(list, iterator, next_iter) \ - for (link_t *iterator = (list).head.next, \ - *next_iter = iterator->next; \ - iterator != &(list).head; \ - iterator = next_iter, next_iter = iterator->next) - -#define assert_link_not_used(link) \ - assert(!link_used(link)) - -#define list_pop(list, type, member) \ - ((type *) list_pop_internal(list, \ - (list_link_to_void(&(((type *) NULL)->member)) - NULL))) - -#endif /* !__cplusplus */ - -__HELENOS_DECLS_BEGIN; - -/** Doubly linked list link. */ -typedef struct __adt_list_link { - struct __adt_list_link *prev; /**< Pointer to the previous item in the list. */ - struct __adt_list_link *next; /**< Pointer to the next item in the list. */ -} link_t; - -/** Doubly linked list. */ -typedef struct { - link_t head; /**< List head. Does not have any data. */ -} list_t; - -extern bool list_member(const link_t *, const list_t *); -extern void list_splice(list_t *, link_t *); -extern size_t list_count(const list_t *); - -/** Returns true if the link is definitely part of a list. False if not sure. */ -static inline bool link_in_use(const link_t *link) -{ - return link->prev != NULL && link->next != NULL; -} - -/** Initialize doubly-linked circular list link - * - * Initialize doubly-linked list link. - * - * @param link Pointer to link_t structure to be initialized. - * - */ -_NO_TRACE static inline void link_initialize(link_t *link) -{ - link->prev = NULL; - link->next = NULL; -} - -/** Initialize doubly-linked circular list - * - * Initialize doubly-linked circular list. - * - * @param list Pointer to list_t structure. - * - */ -_NO_TRACE static inline void list_initialize(list_t *list) -{ - list->head.prev = &list->head; - list->head.next = &list->head; -} - -/** Insert item before another item in doubly-linked circular list. - * - */ -static inline void list_insert_before(link_t *lnew, link_t *lold) -{ - lnew->next = lold; - lnew->prev = lold->prev; - lold->prev->next = lnew; - lold->prev = lnew; -} - -/** Insert item after another item in doubly-linked circular list. - * - */ -static inline void list_insert_after(link_t *lnew, link_t *lold) -{ - lnew->prev = lold; - lnew->next = lold->next; - lold->next->prev = lnew; - lold->next = lnew; -} - -/** Add item to the beginning of doubly-linked circular list - * - * Add item to the beginning of doubly-linked circular list. - * - * @param link Pointer to link_t structure to be added. - * @param list Pointer to list_t structure. - * - */ -_NO_TRACE static inline void list_prepend(link_t *link, list_t *list) -{ - list_insert_after(link, &list->head); -} - -/** Add item to the end of doubly-linked circular list - * - * Add item to the end of doubly-linked circular list. - * - * @param link Pointer to link_t structure to be added. - * @param list Pointer to list_t structure. - * - */ -_NO_TRACE static inline void list_append(link_t *link, list_t *list) -{ - list_insert_before(link, &list->head); -} - -/** Remove item from doubly-linked circular list - * - * Remove item from doubly-linked circular list. - * - * @param link Pointer to link_t structure to be removed from the list - * it is contained in. - * - */ -_NO_TRACE static inline void list_remove(link_t *link) -{ - if ((link->prev != NULL) && (link->next != NULL)) { - link->next->prev = link->prev; - link->prev->next = link->next; - } - - link_initialize(link); -} - -/** Query emptiness of doubly-linked circular list - * - * Query emptiness of doubly-linked circular list. - * - * @param list Pointer to lins_t structure. - * - */ -_NO_TRACE static inline bool list_empty(const list_t *list) -{ - return (list->head.next == &list->head); -} - -/** Get first item in list. - * - * @param list Pointer to list_t structure. - * - * @return Head item of the list. - * @return NULL if the list is empty. - * - */ -static inline link_t *list_first(const list_t *list) -{ - return ((list->head.next == &list->head) ? NULL : list->head.next); -} - -/** Get last item in list. - * - * @param list Pointer to list_t structure. - * - * @return Head item of the list. - * @return NULL if the list is empty. - * - */ -static inline link_t *list_last(const list_t *list) -{ - return (list->head.prev == &list->head) ? NULL : list->head.prev; -} - -/** Get next item in list. - * - * @param link Current item link - * @param list List containing @a link - * - * @return Next item or NULL if @a link is the last item. - */ -static inline link_t *list_next(const link_t *link, const list_t *list) -{ - return (link->next == &list->head) ? NULL : link->next; -} - -/** Get previous item in list. - * - * @param link Current item link - * @param list List containing @a link - * - * @return Previous item or NULL if @a link is the first item. - */ -static inline link_t *list_prev(const link_t *link, const list_t *list) -{ - return (link->prev == &list->head) ? NULL : link->prev; -} - -/** Split or concatenate headless doubly-linked circular list - * - * Split or concatenate headless doubly-linked circular list. - * - * Note that the algorithm works both directions: - * concatenates splitted lists and splits concatenated lists. - * - * @param part1 Pointer to link_t structure leading the first - * (half of the headless) list. - * @param part2 Pointer to link_t structure leading the second - * (half of the headless) list. - * - */ -_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2) -{ - part1->prev->next = part2; - part2->prev->next = part1; - - link_t *hlp = part1->prev; - - part1->prev = part2->prev; - part2->prev = hlp; -} - -/** Split headless doubly-linked circular list - * - * Split headless doubly-linked circular list. - * - * @param part1 Pointer to link_t structure leading - * the first half of the headless list. - * @param part2 Pointer to link_t structure leading - * the second half of the headless list. - * - */ -_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2) -{ - headless_list_split_or_concat(part1, part2); -} - -/** Concatenate two headless doubly-linked circular lists - * - * Concatenate two headless doubly-linked circular lists. - * - * @param part1 Pointer to link_t structure leading - * the first headless list. - * @param part2 Pointer to link_t structure leading - * the second headless list. - * - */ -_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2) -{ - headless_list_split_or_concat(part1, part2); -} - -/** Concatenate two lists - * - * Concatenate lists @a list1 and @a list2, producing a single - * list @a list1 containing items from both (in @a list1, @a list2 - * order) and empty list @a list2. - * - * @param list1 First list and concatenated output - * @param list2 Second list and empty output. - * - */ -_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2) -{ - list_splice(list2, list1->head.prev); -} - -/** Get n-th item in a list. - * - * @param list Pointer to link_t structure representing the list. - * @param n Item number (indexed from zero). - * - * @return n-th item of the list. - * @return NULL if no n-th item found. - * - */ -static inline link_t *list_nth(const list_t *list, size_t n) -{ - size_t cnt = 0; - - link_t *link = list_first(list); - while (link != NULL) { - if (cnt == n) - return link; - - cnt++; - link = list_next(link, list); - } - - return NULL; -} - -/** Verify that argument type is a pointer to link_t (at compile time). - * - * This can be used to check argument type in a macro. - */ -static inline const void *list_link_to_void(const link_t *link) -{ - return link; -} - -/** Determine if link is used. - * - * @param link Link - * @return @c true if link is used, @c false if not. - */ -static inline bool link_used(link_t *link) -{ - if (link->prev == NULL && link->next == NULL) - return false; - - assert(link->prev != NULL && link->next != NULL); - return true; -} - -static inline void *list_pop_internal(list_t *list, ptrdiff_t offset) -{ - link_t *tmp = list_first(list); - if (tmp == NULL) - return NULL; - - list_remove(tmp); - return (void *) (((uint8_t *) tmp) - offset); -} - -__HELENOS_DECLS_END; - -#endif - -/** @} - */ Index: uspace/lib/c/include/adt/odict.h =================================================================== --- uspace/lib/c/include/adt/odict.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../kernel/generic/include/adt/odict.h Index: uspace/lib/c/include/bsearch.h =================================================================== --- uspace/lib/c/include/bsearch.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2018 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_BSEARCH_H_ -#define _LIBC_BSEARCH_H_ - -#include -#include <_bits/decls.h> - -__C_DECLS_BEGIN; - -extern void *bsearch(const void *, const void *, size_t, size_t, - int (*)(const void *, const void *)); - -__C_DECLS_END; - -#endif - -/** @} - */ Index: uspace/lib/c/include/clipboard.h =================================================================== --- uspace/lib/c/include/clipboard.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * 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_CLIPBOARD_H_ -#define _LIBC_CLIPBOARD_H_ - -#include - -extern errno_t clipboard_put_str(const char *); -extern errno_t clipboard_get_str(char **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/corecfg.h =================================================================== --- uspace/lib/c/include/corecfg.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2013 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_CORECFG_H_ -#define _LIBC_CORECFG_H_ - -#include -#include - -extern errno_t corecfg_init(void); -extern errno_t corecfg_set_enable(bool); -extern errno_t corecfg_get_enable(bool *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ctype.h =================================================================== --- uspace/lib/c/include/ctype.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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. - */ - -#ifndef _LIBC_CTYPE_H_ -#define _LIBC_CTYPE_H_ - -#include <_bits/decls.h> - -__C_DECLS_BEGIN; -int islower(int); -int isupper(int); -int isalpha(int); -int isdigit(int); -int isalnum(int); -int isblank(int); -int iscntrl(int); -int isprint(int); -int isgraph(int); -int isspace(int); -int ispunct(int); -int isxdigit(int); -int tolower(int); -int toupper(int); -__C_DECLS_END; - -#endif Index: uspace/lib/c/include/fibril_synch.h =================================================================== --- uspace/lib/c/include/fibril_synch.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ uspace/lib/c/include/fibril_synch.h (revision 325ea9c6759c593c8c6e9e86ea7c6abf745f8801) @@ -153,5 +153,17 @@ extern void __fibril_synch_fini(void); -extern void fibril_mutex_initialize(fibril_mutex_t *); +/** Initialize fibril mutex. + * + * Kept as in-line to allow constexpr marker for C++ library where this + * is used by C++ mutex type (list initialization are two assignments + * so it is actually reasonable to have this inlined). + */ +static inline __CONSTEXPR void fibril_mutex_initialize(fibril_mutex_t *fm) +{ + fm->oi.owned_by = NULL; + fm->counter = 1; + list_initialize(&fm->waiters); +} + extern void fibril_mutex_lock(fibril_mutex_t *); extern bool fibril_mutex_trylock(fibril_mutex_t *); Index: uspace/lib/c/include/gsort.h =================================================================== --- uspace/lib/c/include/gsort.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * 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_SORT_H_ -#define _LIBC_SORT_H_ - -#include -#include - -typedef int (*sort_cmp_t)(void *, void *, void *); - -extern bool gsort(void *, size_t, size_t, sort_cmp_t, void *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/charfield.h =================================================================== --- uspace/lib/c/include/io/charfield.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,107 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * Copyright (c) 2011 Petr Koupy - * 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_IO_CHARFIELD_H_ -#define _LIBC_IO_CHARFIELD_H_ - -#include -#include -#include -#include -#include - -typedef enum { - CHAR_FLAG_NONE = 0, - CHAR_FLAG_DIRTY = 1 -} char_flags_t; - -typedef enum { - CHAR_ATTR_STYLE, - CHAR_ATTR_INDEX, - CHAR_ATTR_RGB -} char_attr_type_t; - -typedef struct { - console_color_t bgcolor; - console_color_t fgcolor; - console_color_attr_t attr; -} char_attr_index_t; - -typedef struct { - pixel_t bgcolor; - pixel_t fgcolor; -} char_attr_rgb_t; - -typedef union { - console_style_t style; - char_attr_index_t index; - char_attr_rgb_t rgb; -} char_attr_val_t; - -typedef struct { - char_attr_type_t type; - char_attr_val_t val; -} char_attrs_t; - -typedef struct { - char32_t ch; - char_attrs_t attrs; - char_flags_t flags; -} charfield_t; - -static inline bool attrs_same(char_attrs_t a1, char_attrs_t a2) -{ - if (a1.type != a2.type) - return false; - - switch (a1.type) { - case CHAR_ATTR_STYLE: - return (a1.val.style == a2.val.style); - case CHAR_ATTR_INDEX: - return (a1.val.index.bgcolor == a2.val.index.bgcolor) && - (a1.val.index.fgcolor == a2.val.index.fgcolor) && - (a1.val.index.attr == a2.val.index.attr); - case CHAR_ATTR_RGB: - return (a1.val.rgb.bgcolor == a2.val.rgb.bgcolor) && - (a1.val.rgb.fgcolor == a2.val.rgb.fgcolor); - } - - return false; -} - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/chargrid.h =================================================================== --- uspace/lib/c/include/io/chargrid.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,103 +1,0 @@ -/* - * Copyright (c) 2011 Martin Decky - * 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_IO_CHARGRID_H_ -#define _LIBC_IO_CHARGRID_H_ - -#include -#include -#include - -typedef enum { - CHARGRID_FLAG_NONE = 0, - CHARGRID_FLAG_SHARED = 1 -} chargrid_flag_t; - -typedef struct { - size_t size; /**< Structure size */ - chargrid_flag_t flags; /**< Screenbuffer flags */ - - sysarg_t cols; /**< Number of columns */ - sysarg_t rows; /**< Number of rows */ - - sysarg_t col; /**< Current column */ - sysarg_t row; /**< Current row */ - bool cursor_visible; /**< Cursor visibility */ - - char_attrs_t attrs; /**< Current attributes */ - - sysarg_t top_row; /**< The first row in the cyclic buffer */ - charfield_t data[]; /**< Screen contents (cyclic buffer) */ -} chargrid_t; - -static inline charfield_t *chargrid_charfield_at(chargrid_t *chargrid, - sysarg_t col, sysarg_t row) -{ - return chargrid->data + - ((row + chargrid->top_row) % chargrid->rows) * chargrid->cols + - col; -} - -extern chargrid_t *chargrid_create(sysarg_t, sysarg_t, - chargrid_flag_t); -extern void chargrid_destroy(chargrid_t *); - -extern bool chargrid_cursor_at(chargrid_t *, sysarg_t, sysarg_t); - -extern sysarg_t chargrid_get_top_row(chargrid_t *); - -extern sysarg_t chargrid_putuchar(chargrid_t *, char32_t, bool); -extern sysarg_t chargrid_newline(chargrid_t *); -extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t); -extern sysarg_t chargrid_backspace(chargrid_t *); - -extern void chargrid_clear(chargrid_t *); -extern void chargrid_clear_row(chargrid_t *, sysarg_t); - -extern void chargrid_set_cursor(chargrid_t *, sysarg_t, sysarg_t); -extern void chargrid_set_cursor_visibility(chargrid_t *, bool); -extern bool chargrid_get_cursor_visibility(chargrid_t *); - -extern void chargrid_get_cursor(chargrid_t *, sysarg_t *, sysarg_t *); - -extern void chargrid_set_style(chargrid_t *, console_style_t); -extern void chargrid_set_color(chargrid_t *, console_color_t, - console_color_t, console_color_attr_t); -extern void chargrid_set_rgb_color(chargrid_t *, pixel_t, pixel_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/color.h =================================================================== --- uspace/lib/c/include/io/color.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2008 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_IO_COLOR_H_ -#define _LIBC_IO_COLOR_H_ - -typedef enum { - COLOR_BLACK = 0, - COLOR_BLUE = 1, - COLOR_GREEN = 2, - COLOR_CYAN = 3, - COLOR_RED = 4, - COLOR_MAGENTA = 5, - COLOR_YELLOW = 6, - COLOR_WHITE = 7 -} console_color_t; - -typedef enum { - CATTR_NORMAL = 0, - CATTR_BRIGHT = 8, - CATTR_BLINK = 16 -} console_color_attr_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/con_srv.h =================================================================== --- uspace/lib/c/include/io/con_srv.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,101 +1,0 @@ -/* - * Copyright (c) 2021 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_CON_SRV_H_ -#define _LIBC_CON_SRV_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -typedef struct con_ops con_ops_t; - -#define CON_CAPTION_MAXLEN 255 - -/** Service setup (per sevice) */ -typedef struct { - con_ops_t *ops; - void *sarg; - /** Period to check for abort */ - usec_t abort_timeout; - bool aborted; -} con_srvs_t; - -/** Server structure (per client session) */ -typedef struct { - con_srvs_t *srvs; - async_sess_t *client_sess; - void *carg; -} con_srv_t; - -struct con_ops { - errno_t (*open)(con_srvs_t *, con_srv_t *); - errno_t (*close)(con_srv_t *); - errno_t (*read)(con_srv_t *, void *, size_t, size_t *); - errno_t (*write)(con_srv_t *, void *, size_t, size_t *); - void (*sync)(con_srv_t *); - void (*clear)(con_srv_t *); - void (*set_pos)(con_srv_t *, sysarg_t col, sysarg_t row); - errno_t (*get_pos)(con_srv_t *, sysarg_t *, sysarg_t *); - errno_t (*get_size)(con_srv_t *, sysarg_t *, sysarg_t *); - errno_t (*get_color_cap)(con_srv_t *, console_caps_t *); - void (*set_style)(con_srv_t *, console_style_t); - void (*set_color)(con_srv_t *, console_color_t, console_color_t, - console_color_attr_t); - void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t); - void (*set_cursor_visibility)(con_srv_t *, bool); - errno_t (*set_caption)(con_srv_t *, const char *); - errno_t (*get_event)(con_srv_t *, cons_event_t *); - errno_t (*map)(con_srv_t *, sysarg_t, sysarg_t, charfield_t **); - void (*unmap)(con_srv_t *); - void (*update)(con_srv_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -}; - -extern void con_srvs_init(con_srvs_t *); - -extern errno_t con_conn(ipc_call_t *, con_srvs_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/concaps.h =================================================================== --- uspace/lib/c/include/io/concaps.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2012 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_IO_CONCAPS_H_ -#define _LIBC_IO_CONCAPS_H_ - -typedef enum { - CONSOLE_CAP_NONE = 0, - CONSOLE_CAP_STYLE = 1, - CONSOLE_CAP_INDEXED = 2, - CONSOLE_CAP_RGB = 4 -} console_caps_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/cons_event.h =================================================================== --- uspace/lib/c/include/io/cons_event.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,66 +1,0 @@ -/* - * Copyright (c) 2013 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_IO_CONS_EVENT_H_ -#define _LIBC_IO_CONS_EVENT_H_ - -#include -#include -#include - -typedef enum { - /** Key event */ - CEV_KEY, - /** Position event */ - CEV_POS -} cons_event_type_t; - -/** Console event structure. */ -typedef struct { - /** List handle */ - link_t link; - - /** Event type */ - cons_event_type_t type; - - union { - kbd_event_t key; - pos_event_t pos; - } ev; -} cons_event_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2021 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_IO_CONSOLE_H_ -#define _LIBC_IO_CONSOLE_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** Console control structure. */ -typedef struct { - /** Console input file */ - FILE *input; - - /** Console output file */ - FILE *output; - - /** Console input session */ - async_sess_t *input_sess; - - /** Console output session */ - async_sess_t *output_sess; - - /** Input request call with timeout */ - ipc_call_t input_call; - - /** Input response with timeout */ - aid_t input_aid; -} console_ctrl_t; - -extern console_ctrl_t *console_init(FILE *, FILE *); -extern void console_done(console_ctrl_t *); -extern bool console_kcon(void); - -extern void console_flush(console_ctrl_t *); -extern void console_clear(console_ctrl_t *); - -extern errno_t console_get_size(console_ctrl_t *, sysarg_t *, sysarg_t *); -extern errno_t console_get_pos(console_ctrl_t *, sysarg_t *, sysarg_t *); -extern void console_set_pos(console_ctrl_t *, sysarg_t, sysarg_t); - -extern void console_set_style(console_ctrl_t *, uint8_t); -extern void console_set_color(console_ctrl_t *, uint8_t, uint8_t, uint8_t); -extern void console_set_rgb_color(console_ctrl_t *, uint32_t, uint32_t); - -extern void console_cursor_visibility(console_ctrl_t *, bool); -extern errno_t console_set_caption(console_ctrl_t *, const char *); -extern errno_t console_get_color_cap(console_ctrl_t *, sysarg_t *); -extern errno_t console_get_event(console_ctrl_t *, cons_event_t *); -extern errno_t console_get_event_timeout(console_ctrl_t *, cons_event_t *, - usec_t *); -extern errno_t console_map(console_ctrl_t *, sysarg_t, sysarg_t, - charfield_t **); -extern void console_unmap(console_ctrl_t *, charfield_t *); -extern errno_t console_update(console_ctrl_t *, sysarg_t, sysarg_t, sysarg_t, - sysarg_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/input.h =================================================================== --- uspace/lib/c/include/io/input.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,68 +1,0 @@ -/* - * Copyright (c) 2022 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_IO_INPUT_H_ -#define _LIBC_IO_INPUT_H_ - -#include -#include - -struct input_ev_ops; - -typedef struct { - async_sess_t *sess; - struct input_ev_ops *ev_ops; - void *user; -} input_t; - -typedef struct input_ev_ops { - errno_t (*active)(input_t *); - errno_t (*deactive)(input_t *); - errno_t (*key)(input_t *, unsigned, kbd_event_type_t, keycode_t, - keymod_t, char32_t); - errno_t (*move)(input_t *, unsigned, int, int); - errno_t (*abs_move)(input_t *, unsigned, unsigned, unsigned, unsigned, - unsigned); - errno_t (*button)(input_t *, unsigned, int, int); - errno_t (*dclick)(input_t *, unsigned, int); -} input_ev_ops_t; - -extern errno_t input_open(async_sess_t *, input_ev_ops_t *, void *, input_t **); -extern void input_close(input_t *); -extern errno_t input_activate(input_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/kbd_event.h =================================================================== --- uspace/lib/c/include/io/kbd_event.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,72 +1,0 @@ -/* - * Copyright (c) 2022 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_IO_KBD_EVENT_H_ -#define _LIBC_IO_KBD_EVENT_H_ - -#include -#include -#include -#include - -typedef enum { - KEY_PRESS, - KEY_RELEASE -} kbd_event_type_t; - -/** Console event structure. */ -typedef struct { - /** List handle */ - link_t link; - - /** Keyboard device ID */ - sysarg_t kbd_id; - - /** Press or release event. */ - kbd_event_type_t type; - - /** Keycode of the key that was pressed or released. */ - keycode_t key; - - /** Bitmask of modifiers held. */ - keymod_t mods; - - /** The character that was generated or '\0' for none. */ - char32_t c; -} kbd_event_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/keycode.h =================================================================== --- uspace/lib/c/include/io/keycode.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,223 +1,0 @@ -/* - * 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_IO_KEYCODE_H_ -#define _LIBC_IO_KEYCODE_H_ - -/** Keycode definitions. - * - * A keycode identifies a key by its position on the keyboard, rather - * than by its label. For human readability, key positions are noted - * with the key label on a keyboard with US layout. This label has - * nothing to do with the character, that the key produces - * -- this is determined by the keymap. - * - * The keyboard model reflects a standard PC keyboard layout. - * Non-standard keyboards need to be mapped to this model in some - * logical way. Scancodes are mapped to keycodes with a scanmap. - * - * For easier mapping to the model and to emphasize the nature of keycodes, - * they really are organized here by position, rather than by label. - */ -typedef enum { - - /* Main block row 1 */ - - KC_BACKTICK = 1, - - KC_1, - KC_2, - KC_3, - KC_4, - KC_5, - KC_6, - KC_7, - KC_8, - KC_9, - KC_0, - - KC_MINUS, - KC_EQUALS, - KC_BACKSPACE, - - /* Main block row 2 */ - - KC_TAB, - - KC_Q, - KC_W, - KC_E, - KC_R, - KC_T, - KC_Y, - KC_U, - KC_I, - KC_O, - KC_P, - - KC_LBRACKET, - KC_RBRACKET, - - /* Main block row 3 */ - - KC_CAPS_LOCK, - - KC_A, - KC_S, - KC_D, - KC_F, - KC_G, - KC_H, - KC_J, - KC_K, - KC_L, - - KC_SEMICOLON, - KC_QUOTE, - KC_BACKSLASH, - KC_HASH, - - KC_ENTER, - - /* Main block row 4 */ - - KC_LSHIFT, - - KC_Z, - KC_X, - KC_C, - KC_V, - KC_B, - KC_N, - KC_M, - - KC_COMMA, - KC_PERIOD, - KC_SLASH, - - KC_RSHIFT, - - /* Main block row 5 */ - - KC_LCTRL, - KC_LALT, - KC_SPACE, - KC_RALT, - KC_RCTRL, - - /* Function keys block */ - - KC_ESCAPE, - - KC_F1, - KC_F2, - KC_F3, - KC_F4, - KC_F5, - KC_F6, - KC_F7, - KC_F8, - KC_F9, - KC_F10, - KC_F11, - KC_F12, - - KC_PRTSCR, - KC_SYSREQ, - KC_SCROLL_LOCK, - KC_PAUSE, - KC_BREAK, - - /* Cursor keys block */ - - KC_INSERT, - KC_HOME, - KC_PAGE_UP, - - KC_DELETE, - KC_END, - KC_PAGE_DOWN, - - KC_UP, - KC_LEFT, - KC_DOWN, - KC_RIGHT, - - /* Numeric block */ - - KC_NUM_LOCK, - KC_NSLASH, - KC_NTIMES, - KC_NMINUS, - - KC_NPLUS, - KC_NENTER, - - KC_N7, - KC_N8, - KC_N9, - - KC_N4, - KC_N5, - KC_N6, - - KC_N1, - KC_N2, - KC_N3, - - KC_N0, - KC_NPERIOD - -} keycode_t; - -typedef enum { - 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 - -/** @} - */ Index: uspace/lib/c/include/io/output.h =================================================================== --- uspace/lib/c/include/io/output.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2011 Martin Decky - * 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_IO_OUTPUT_H_ -#define _LIBC_IO_OUTPUT_H_ - -#include -#include -#include - -extern errno_t output_yield(async_sess_t *); -extern errno_t output_claim(async_sess_t *); -extern errno_t output_get_dimensions(async_sess_t *, sysarg_t *, sysarg_t *); -extern errno_t output_get_caps(async_sess_t *, console_caps_t *); - -extern frontbuf_handle_t output_frontbuf_create(async_sess_t *, chargrid_t *); - -extern errno_t output_cursor_update(async_sess_t *, frontbuf_handle_t); -extern errno_t output_set_style(async_sess_t *, console_style_t); - -extern errno_t output_update(async_sess_t *, frontbuf_handle_t); -extern errno_t output_damage(async_sess_t *, frontbuf_handle_t, - sysarg_t, sysarg_t, sysarg_t, sysarg_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/pos_event.h =================================================================== --- uspace/lib/c/include/io/pos_event.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,64 +1,0 @@ -/* - * Copyright (c) 2021 Jiri Svoboda - * Copyright (c) 2012 Petr Koupy - * 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_IO_POS_EVENT_H_ -#define _LIBC_IO_POS_EVENT_H_ - -#include - -typedef enum { - /** Position update */ - POS_UPDATE, - /** Button press */ - POS_PRESS, - /** Button release */ - POS_RELEASE, - /** Double click */ - POS_DCLICK -} pos_event_type_t; - -/** Positioning device event */ -typedef struct { - sysarg_t pos_id; - pos_event_type_t type; - sysarg_t btn_num; - sysarg_t hpos; - sysarg_t vpos; -} pos_event_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/io/printf_core.h =================================================================== --- uspace/lib/c/include/io/printf_core.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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_PRINTF_CORE_H_ -#define _LIBC_PRINTF_CORE_H_ - -#include -#include -#include - -/** Structure for specifying output methods for different printf clones. */ -typedef struct { - /* String output function, returns number of printed characters or EOF */ - int (*str_write)(const char *, size_t, void *); - - /* Wide string output function, returns number of printed characters or EOF */ - int (*wstr_write)(const char32_t *, size_t, void *); - - /* User data - output stream specification, state, locks, etc. */ - void *data; -} printf_spec_t; - -extern int printf_core(const char *, printf_spec_t *, va_list); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/clipboard.h =================================================================== --- uspace/lib/c/include/ipc/clipboard.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * 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_CLIPBOARD_H_ -#define _LIBC_IPC_CLIPBOARD_H_ - -#include - -typedef enum { - CLIPBOARD_PUT_DATA = IPC_FIRST_USER_METHOD, - CLIPBOARD_GET_DATA, - CLIPBOARD_CONTENT -} clipboard_request_t; - -typedef enum { - CLIPBOARD_TAG_NONE, - CLIPBOARD_TAG_DATA -} clipboard_tag_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/console.h =================================================================== --- uspace/lib/c/include/ipc/console.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,61 +1,0 @@ -/* - * Copyright (c) 2021 Jiri Svoboda - * Copyright (c) 2006 Josef Cejka - * 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_CONSOLE_H_ -#define _LIBC_IPC_CONSOLE_H_ - -#include - -typedef enum { - CONSOLE_GET_SIZE = VFS_OUT_LAST, - CONSOLE_GET_COLOR_CAP, - CONSOLE_GET_EVENT, - CONSOLE_GET_POS, - CONSOLE_SET_POS, - CONSOLE_CLEAR, - CONSOLE_SET_STYLE, - CONSOLE_SET_COLOR, - CONSOLE_SET_RGB_COLOR, - CONSOLE_SET_CURSOR_VISIBILITY, - CONSOLE_SET_CAPTION, - CONSOLE_MAP, - CONSOLE_UNMAP, - CONSOLE_UPDATE -} console_request_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/corecfg.h =================================================================== --- uspace/lib/c/include/ipc/corecfg.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2013 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 - * @{ - */ - -#ifndef _LIBC_IPC_CORECFG_H_ -#define _LIBC_IPC_CORECFG_H_ - -#include - -typedef enum { - CORECFG_GET_ENABLE = IPC_FIRST_USER_METHOD, - CORECFG_SET_ENABLE -} corecfg_request_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/input.h =================================================================== --- uspace/lib/c/include/ipc/input.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,58 +1,0 @@ -/* - * Copyright (c) 2021 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_INPUT_H_ -#define _LIBC_IPC_INPUT_H_ - -#include - -typedef enum { - INPUT_ACTIVATE = IPC_FIRST_USER_METHOD -} input_request_t; - -typedef enum { - INPUT_EVENT_ACTIVE = IPC_FIRST_USER_METHOD, - INPUT_EVENT_DEACTIVE, - INPUT_EVENT_KEY, - INPUT_EVENT_MOVE, - INPUT_EVENT_ABS_MOVE, - INPUT_EVENT_BUTTON, - INPUT_EVENT_DCLICK -} input_notif_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/ipc_test.h =================================================================== --- uspace/lib/c/include/ipc/ipc_test.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2018 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_IPC_TEST_H_ -#define _LIBC_IPC_IPC_TEST_H_ - -#include - -typedef enum { - IPC_TEST_PING = IPC_FIRST_USER_METHOD, - IPC_TEST_GET_RO_AREA_SIZE, - IPC_TEST_GET_RW_AREA_SIZE, - IPC_TEST_SHARE_IN_RO, - IPC_TEST_SHARE_IN_RW -} ipc_test_request_t; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/kbdev.h =================================================================== --- uspace/lib/c/include/ipc/kbdev.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2011 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_KBDEV_H_ -#define _LIBC_IPC_KBDEV_H_ - -#include -#include - -typedef enum { - KBDEV_YIELD = DEV_FIRST_CUSTOM_METHOD, - KBDEV_RECLAIM, - KBDEV_SET_IND -} kbdev_request_t; - -typedef enum { - KBDEV_EVENT = IPC_FIRST_USER_METHOD -} kbdev_notif_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/mouseev.h =================================================================== --- uspace/lib/c/include/ipc/mouseev.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,57 +1,0 @@ -/* - * 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 - * @brief - * @{ - */ -/** @file - */ - -#ifndef _LIBC_IPC_MOUSEEV_H_ -#define _LIBC_IPC_MOUSEEV_H_ - -#include -#include - -typedef enum { - MOUSEEV_YIELD = DEV_FIRST_CUSTOM_METHOD, - MOUSEEV_RECLAIM -} mouseev_request_t; - -typedef enum { - MOUSEEV_MOVE_EVENT = IPC_FIRST_USER_METHOD, - MOUSEEV_ABS_MOVE_EVENT, - MOUSEEV_BUTTON_EVENT -} mouseev_notif_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc/output.h =================================================================== --- uspace/lib/c/include/ipc/output.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,64 +1,0 @@ -/* - * Copyright (c) 2012 Martin Decky - * 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_OUTPUT_H_ -#define _LIBC_IPC_OUTPUT_H_ - -#include - -typedef sysarg_t frontbuf_handle_t; - -typedef enum { - OUTPUT_YIELD = IPC_FIRST_USER_METHOD, - OUTPUT_CLAIM, - OUTPUT_GET_DIMENSIONS, - OUTPUT_GET_CAPS, - - OUTPUT_FRONTBUF_CREATE, - OUTPUT_FRONTBUF_DESTROY, - - OUTPUT_CURSOR_UPDATE, - OUTPUT_SET_STYLE, - OUTPUT_SET_COLOR, - OUTPUT_SET_RGB_COLOR, - - OUTPUT_UPDATE, - OUTPUT_DAMAGE -} output_request_t; - -#endif - -/** - * @} - */ Index: uspace/lib/c/include/ipc_test.h =================================================================== --- uspace/lib/c/include/ipc_test.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2018 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_IPC_TEST_H_ -#define _LIBC_IPC_TEST_H_ - -#include -#include - -typedef struct { - async_sess_t *sess; -} ipc_test_t; - -extern errno_t ipc_test_create(ipc_test_t **); -extern void ipc_test_destroy(ipc_test_t *); -extern errno_t ipc_test_ping(ipc_test_t *); -extern errno_t ipc_test_get_ro_area_size(ipc_test_t *, size_t *); -extern errno_t ipc_test_get_rw_area_size(ipc_test_t *, size_t *); -extern errno_t ipc_test_share_in_ro(ipc_test_t *, size_t, const void **); -extern errno_t ipc_test_share_in_rw(ipc_test_t *, size_t, void **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/loc.h =================================================================== --- uspace/lib/c/include/loc.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ uspace/lib/c/include/loc.h (revision 325ea9c6759c593c8c6e9e86ea7c6abf745f8801) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2009 Jiri Svoboda + * Copyright (c) 2023 Jiri Svoboda * All rights reserved. * @@ -39,15 +39,17 @@ #include #include +#include typedef void (*loc_cat_change_cb_t)(void *); -extern async_exch_t *loc_exchange_begin_blocking(iface_t); -extern async_exch_t *loc_exchange_begin(iface_t); +extern async_exch_t *loc_exchange_begin_blocking(void); +extern async_exch_t *loc_exchange_begin(void); extern void loc_exchange_end(async_exch_t *); -extern errno_t loc_server_register(const char *); -extern errno_t loc_service_register(const char *, service_id_t *); -extern errno_t loc_service_unregister(service_id_t); -extern errno_t loc_service_add_to_cat(service_id_t, category_id_t); +extern errno_t loc_server_register(const char *, loc_srv_t **); +extern void loc_server_unregister(loc_srv_t *); +extern errno_t loc_service_register(loc_srv_t *, const char *, service_id_t *); +extern errno_t loc_service_unregister(loc_srv_t *, service_id_t); +extern errno_t loc_service_add_to_cat(loc_srv_t *, service_id_t, category_id_t); extern errno_t loc_service_get_id(const char *, service_id_t *, Index: uspace/lib/c/include/malloc.h =================================================================== --- uspace/lib/c/include/malloc.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ uspace/lib/c/include/malloc.h (revision 325ea9c6759c593c8c6e9e86ea7c6abf745f8801) @@ -39,21 +39,7 @@ #include <_bits/decls.h> -__C_DECLS_BEGIN; - -extern void *malloc(size_t size) - __attribute__((malloc)); -extern void *calloc(size_t nmemb, size_t size) - __attribute__((malloc)); -extern void *realloc(void *addr, size_t size) - __attribute__((warn_unused_result)); -extern void free(void *addr); - -__C_DECLS_END; - #ifdef _HELENOS_SOURCE __HELENOS_DECLS_BEGIN; -extern void *memalign(size_t align, size_t size) - __attribute__((malloc)); extern void *heap_check(void); Index: uspace/lib/c/include/mem.h =================================================================== --- uspace/lib/c/include/mem.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,60 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * Copyright (c) 2018 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_MEM_H_ -#define _LIBC_MEM_H_ - -#include -#include <_bits/decls.h> - -__C_DECLS_BEGIN; - -extern void *memset(void *, int, size_t) - __attribute__((nonnull(1))); -extern void *memcpy(void *, const void *, size_t) - __attribute__((nonnull(1, 2))); -extern void *memmove(void *, const void *, size_t) - __attribute__((nonnull(1, 2))); -extern int memcmp(const void *, const void *, size_t) - __attribute__((nonnull(1, 2))); -extern void *memchr(const void *, int, size_t) - __attribute__((nonnull(1))); - -__C_DECLS_END; - -#endif - -/** @} - */ Index: uspace/lib/c/include/qsort.h =================================================================== --- uspace/lib/c/include/qsort.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * Copyright (c) 2017 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_QSORT_H_ -#define _LIBC_QSORT_H_ - -#include -#include <_bits/decls.h> - -__C_DECLS_BEGIN; -extern void qsort(void *, size_t, size_t, int (*)(const void *, - const void *)); -__C_DECLS_END; - -#ifdef _HELENOS_SOURCE -__HELENOS_DECLS_BEGIN; -extern void qsort_r(void *, size_t, size_t, int (*)(const void *, - const void *, void *), void *); -__HELENOS_DECLS_END; -#endif - -#endif - -/** @} - */ Index: uspace/lib/c/include/stdlib.h =================================================================== --- uspace/lib/c/include/stdlib.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,116 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * 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_STDLIB_H_ -#define _LIBC_STDLIB_H_ - -#include <_bits/size_t.h> -#include <_bits/wchar_t.h> -#include <_bits/uchar.h> -#include <_bits/decls.h> -#include -#include -#include - -#define EXIT_SUCCESS 0 -#define EXIT_FAILURE 1 - -#define RAND_MAX 714025 - -#define MB_CUR_MAX 4 - -__C_DECLS_BEGIN; - -/** Type returned by the div function */ -typedef struct { - /** Quotient */ - int quot; - /** Remainder */ - int rem; -} div_t; - -/** Type returned by the ldiv function */ -typedef struct { - /** Quotient */ - long quot; - /** Remainder */ - long rem; -} ldiv_t; - -/** Type returned by the lldiv function */ -typedef struct { - /** Quotient */ - long long quot; - /** Remainder */ - long long rem; -} lldiv_t; - -extern long double strtold(const char *, char **); - -extern int rand(void); -extern void srand(unsigned int); - -extern void abort(void) __attribute__((noreturn)); -extern int atexit(void (*)(void)); -extern void exit(int) __attribute__((noreturn)); -extern void _Exit(int) __attribute__((noreturn)); -extern int at_quick_exit(void (*)(void)); -extern void quick_exit(int); - -extern char *getenv(const char *); -extern int system(const char *); - -extern int abs(int); -extern long labs(long); -extern long long llabs(long long); - -extern int atoi(const char *); -extern long atol(const char *); -extern long long atoll(const char *); - -extern long strtol(const char *__restrict__, char **__restrict__, int); -extern long long strtoll(const char *__restrict__, char **__restrict__, int); -extern unsigned long strtoul(const char *__restrict__, char **__restrict__, int); -extern unsigned long long strtoull(const char *__restrict__, char **__restrict__, int); - -extern div_t div(int, int); -extern ldiv_t ldiv(long, long); -extern lldiv_t lldiv(long long, long long); - -__C_DECLS_END; - -#endif - -/** @} - */ Index: uspace/lib/c/include/str.h =================================================================== --- uspace/lib/c/include/str.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,158 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * Copyright (c) 2005 Martin Decky - * Copyright (c) 2011 Oleg Romanenko - * 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_STR_H_ -#define _LIBC_STR_H_ - -#include -#include -#include -#include - -#include -#include <_bits/decls.h> - -#ifndef __cplusplus - -/* Common Unicode characters */ -#define U_SPECIAL '?' - -/** No size limit constant */ -#define STR_NO_LIMIT ((size_t) -1) - -/** Maximum size of a string containing @c length characters */ -#define STR_BOUNDS(length) ((length) << 2) - -/** - * Maximum size of a buffer needed to a string converted from space-padded - * ASCII of size @a spa_size using spascii_to_str(). - */ -#define SPASCII_STR_BUFSIZE(spa_size) ((spa_size) + 1) - -#endif - -__HELENOS_DECLS_BEGIN; - -extern char32_t str_decode(const char *str, size_t *offset, size_t sz); -extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz); -extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz); - -extern size_t str_size(const char *str); -extern size_t wstr_size(const char32_t *str); - -extern size_t str_nsize(const char *str, size_t max_size); -extern size_t wstr_nsize(const char32_t *str, size_t max_size); - -extern size_t str_lsize(const char *str, size_t max_len); -extern size_t wstr_lsize(const char32_t *str, size_t max_len); - -extern size_t str_length(const char *str); -extern size_t wstr_length(const char32_t *wstr); - -extern size_t str_nlength(const char *str, size_t size); -extern size_t wstr_nlength(const char32_t *str, size_t size); - -extern size_t chr_width(char32_t ch); -extern size_t str_width(const char *str); - -extern bool ascii_check(char32_t ch); -extern bool chr_check(char32_t ch); - -extern int str_cmp(const char *s1, const char *s2); -extern int str_lcmp(const char *s1, const char *s2, size_t max_len); -extern int str_casecmp(const char *s1, const char *s2); -extern int str_lcasecmp(const char *s1, const char *s2, size_t max_len); - -extern bool str_test_prefix(const char *s, const char *p); -extern const char *str_suffix(const char *s, size_t prefix_length); - -extern void str_cpy(char *dest, size_t size, const char *src); -extern void str_ncpy(char *dest, size_t size, const char *src, size_t n); -extern void str_append(char *dest, size_t size, const char *src); - -extern errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n); -extern void wstr_to_str(char *dest, size_t size, const char32_t *src); -extern char *wstr_to_astr(const char32_t *src); -extern void str_to_wstr(char32_t *dest, size_t dlen, const char *src); -extern char32_t *str_to_awstr(const char *src); -extern errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src); -extern errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src); -extern size_t utf16_wsize(const uint16_t *ustr); - -extern char *str_chr(const char *str, char32_t ch); -extern char *str_rchr(const char *str, char32_t ch); -extern char *str_str(const char *hs, const char *n); - -extern void str_rtrim(char *str, char32_t ch); -extern void str_ltrim(char *str, char32_t ch); - -extern bool wstr_linsert(char32_t *str, char32_t ch, size_t pos, size_t max_pos); -extern bool wstr_remove(char32_t *str, size_t pos); - -extern char *str_dup(const char *src); -extern char *str_ndup(const char *src, size_t n); - -extern char *str_tok(char *, const char *, char **); - -extern errno_t str_uint8_t(const char *, const char **, unsigned int, bool, - uint8_t *); -extern errno_t str_uint16_t(const char *, const char **, unsigned int, bool, - uint16_t *); -extern errno_t str_uint32_t(const char *, const char **, unsigned int, bool, - uint32_t *); -extern errno_t str_uint64_t(const char *, const char **, unsigned int, bool, - uint64_t *); -extern errno_t str_size_t(const char *, const char **, unsigned int, bool, - size_t *); -extern errno_t str_int64_t(const char *, const char **, unsigned int, bool, - int64_t *); - -extern void order_suffix(const uint64_t, uint64_t *, char *); -extern void bin_order_suffix(const uint64_t, uint64_t *, const char **, bool); - -/* - * TODO: Get rid of this. - */ - -extern long int strtol(const char *, char **, int); -extern unsigned long strtoul(const char *, char **, int); - -__HELENOS_DECLS_END; - -#endif - -/** @} - */ Index: uspace/lib/c/include/str_error.h =================================================================== --- uspace/lib/c/include/str_error.h (revision 42c2e655758dd305315042a1d24342a2ac5b9013) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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_STRERROR_H_ -#define _LIBC_STRERROR_H_ - -#include - -const char *str_error(errno_t); -const char *str_error_name(errno_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/types/loc.h =================================================================== --- uspace/lib/c/include/types/loc.h (revision 325ea9c6759c593c8c6e9e86ea7c6abf745f8801) +++ uspace/lib/c/include/types/loc.h (revision 325ea9c6759c593c8c6e9e86ea7c6abf745f8801) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2023 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_TYPES_LOC_H_ +#define _LIBC_TYPES_LOC_H_ + +#include + +/** Server register with location service */ +typedef struct { + async_sess_t *sess; +} loc_srv_t; + +#endif + +/** @} + */