Changeset bc73be3 in mainline for kernel/generic/include


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

cpp: merge and resolve conflicts

Location:
kernel/generic/include
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/adt/hash_table.h

    rad40b74b rbc73be3  
    5353
    5454        /** Returns the hash of the key. */
    55         size_t (*key_hash)(void *key);
     55        size_t (*key_hash)(const void *key);
    5656
    5757        /** True if the items are equal (have the same lookup keys). */
    … …  
    5959
    6060        /** Returns true if the key is equal to the item's lookup key. */
    61         bool (*key_equal)(void *key, const ht_link_t *item);
     61        bool (*key_equal)(const void *key, const ht_link_t *item);
    6262
    6363        /** Hash table item removal callback.
    … …  
    9494extern void hash_table_insert(hash_table_t *, ht_link_t *);
    9595extern bool hash_table_insert_unique(hash_table_t *, ht_link_t *);
    96 extern ht_link_t *hash_table_find(const hash_table_t *, void *);
     96extern ht_link_t *hash_table_find(const hash_table_t *, const void *);
    9797extern ht_link_t *hash_table_find_next(const hash_table_t *, ht_link_t *,
    9898    ht_link_t *);
    99 extern size_t hash_table_remove(hash_table_t *, void *);
     99extern size_t hash_table_remove(hash_table_t *, const void *);
    100100extern void hash_table_remove_item(hash_table_t *, ht_link_t *);
    101101extern void hash_table_apply(hash_table_t *, bool (*)(ht_link_t *, void *),

  • kernel/generic/include/adt/list.h

    rad40b74b rbc73be3  
    150150 *
    151151 */
    152 NO_TRACE static inline void link_initialize(link_t *link)
     152_NO_TRACE static inline void link_initialize(link_t *link)
    153153{
    154154        link->prev = NULL;
    … …  
    163163 *
    164164 */
    165 NO_TRACE static inline void list_initialize(list_t *list)
     165_NO_TRACE static inline void list_initialize(list_t *list)
    166166{
    167167        list->head.prev = &list->head;
    … …  
    199199 *
    200200 */
    201 NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
     201_NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
    202202{
    203203        list_insert_after(link, &list->head);
    … …  
    212212 *
    213213 */
    214 NO_TRACE static inline void list_append(link_t *link, list_t *list)
     214_NO_TRACE static inline void list_append(link_t *link, list_t *list)
    215215{
    216216        list_insert_before(link, &list->head);
    … …  
    225225 *
    226226 */
    227 NO_TRACE static inline void list_remove(link_t *link)
     227_NO_TRACE static inline void list_remove(link_t *link)
    228228{
    229229        if ((link->prev != NULL) && (link->next != NULL)) {
    … …  
    242242 *
    243243 */
    244 NO_TRACE static inline bool list_empty(const list_t *list)
     244_NO_TRACE static inline bool list_empty(const list_t *list)
    245245{
    246246        return (list->head.next == &list->head);
    … …  
    310310 *
    311311 */
    312 NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
     312_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
    313313{
    314314        part1->prev->next = part2;
    … …  
    331331 *
    332332 */
    333 NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
     333_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
    334334{
    335335        headless_list_split_or_concat(part1, part2);
    … …  
    346346 *
    347347 */
    348 NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
     348_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
    349349{
    350350        headless_list_split_or_concat(part1, part2);
    … …  
    361361 *
    362362 */
    363 NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
     363_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
    364364{
    365365        list_splice(list2, list1->head.prev);

  • kernel/generic/include/adt/odict.h

    rad40b74b rbc73be3  
    3333 */
    3434
    35 #ifndef LIBC_ODICT_H_
    36 #define LIBC_ODICT_H_
     35#ifndef _LIBC_ODICT_H_
     36#define _LIBC_ODICT_H_
    3737
    3838#include <errno.h>

  • kernel/generic/include/bitops.h

    rad40b74b rbc73be3  
    5252 *
    5353 */
    54 NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
     54_NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
    5555{
    5656        uint8_t n = 0;
    … …  
    8787 *
    8888 */
    89 NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
     89_NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
    9090{
    9191        uint8_t n = 0;

  • kernel/generic/include/context.h

    rad40b74b rbc73be3  
    9191 *
    9292 */
    93 NO_TRACE static inline void context_restore(context_t *ctx)
     93_NO_TRACE static inline void context_restore(context_t *ctx)
    9494{
    9595        context_restore_arch(ctx);

  • kernel/generic/include/ddi/ddi.h

    rad40b74b rbc73be3  
    6060extern void ddi_parea_register(parea_t *);
    6161
     62extern void *pio_map(void *, size_t);
     63extern void pio_unmap(void *, void *, size_t);
     64
    6265extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, void *,
    6366    uintptr_t);

  • kernel/generic/include/lib/elf_load.h

    rad40b74b rbc73be3  
    3838#include <abi/elf.h>
    3939
    40 /**
    41  * ELF error return codes
    42  */
    43 #define EE_OK             0  /* No error */
    44 #define EE_INVALID        1  /* Invalid ELF image */
    45 #define EE_MEMORY         2  /* Cannot allocate address space */
    46 #define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
    47 #define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
    48 #define EE_IRRECOVERABLE  5  /* Irrecoverable error. */
    49 
    50 extern unsigned int elf_load(elf_header_t *, as_t *);
    51 extern const char *elf_error(unsigned int rc);
     40extern errno_t elf_load(elf_header_t *, as_t *);
    5241
    5342#endif

  • kernel/generic/include/lib/refcount.h

    rad40b74b rbc73be3  
    3737 */
    3838
    39 #ifndef LIBC_REFCOUNT_H_
    40 #define LIBC_REFCOUNT_H_
     39#ifndef _LIBC_REFCOUNT_H_
     40#define _LIBC_REFCOUNT_H_
    4141
    4242#include <assert.h>

  • kernel/generic/include/macros.h

    rad40b74b rbc73be3  
    4949 *
    5050 */
    51 NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
     51_NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
    5252    uint64_t sz2)
    5353{
    … …  
    7878 *
    7979 */
    80 NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
     80_NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
    8181    uint64_t sz2)
    8282{

  • kernel/generic/include/mm/as.h

    rad40b74b rbc73be3  
    5959#define KERNEL_ADDRESS_SPACE_SHADOWED  KERNEL_ADDRESS_SPACE_SHADOWED_ARCH
    6060
     61/**
     62 * Defined to be true if user address space and kernel address space do not
     63 * share the same page table.
     64 */
     65#define KERNEL_SEPARATE_PTL0 KERNEL_SEPARATE_PTL0_ARCH
     66
    6167#define KERNEL_ADDRESS_SPACE_START  KERNEL_ADDRESS_SPACE_START_ARCH
    6268#define KERNEL_ADDRESS_SPACE_END    KERNEL_ADDRESS_SPACE_END_ARCH

  • kernel/generic/include/proc/program.h

    rad40b74b rbc73be3  
    5050        struct task *task;           /**< Program task */
    5151        struct thread *main_thread;  /**< Program main thread */
    52         unsigned int loader_status;  /**< Binary loader error status */
     52        errno_t loader_status;  /**< Binary loader error status */
    5353} program_t;
    5454

  • kernel/generic/include/str.h

    rad40b74b rbc73be3  
    11/*
    22 * Copyright (c) 2001-2004 Jakub Jermar
     3 * Copyright (c) 2005 Martin Decky
     4 * Copyright (c) 2011 Oleg Romanenko
    35 * All rights reserved.
    46 *
    … …  
    3638#define KERN_STR_H_
    3739
     40#include <errno.h>
    3841#include <stdbool.h>
    3942#include <stddef.h>
    4043#include <stdint.h>
    41 #include <errno.h>
    4244
    43 /**< Common Unicode characters */
     45/* Common Unicode characters */
    4446#define U_SPECIAL      '?'
    4547
    … …  
    6163#define U_CURSOR       0x2588
    6264
    63 /**< No size limit constant */
     65/** No size limit constant */
    6466#define STR_NO_LIMIT  ((size_t) -1)
    6567
    66 /**< Maximum size of a string containing cnt characters */
    67 #define STR_BOUNDS(cnt)  ((cnt) << 2)
     68/** Maximum size of a string containing @c length characters */
     69#define STR_BOUNDS(length)  ((length) << 2)
    6870
    6971extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
    … …  
    9294extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
    9395
    94 extern char *str_dup(const char *src);
    95 extern char *str_ndup(const char *src, size_t n);
    96 
    9796extern char *str_chr(const char *str, wchar_t ch);
    9897
    … …  
    10099extern bool wstr_remove(wchar_t *str, size_t pos);
    101100
    102 extern errno_t str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
     101extern char *str_dup(const char *src);
     102extern char *str_ndup(const char *src, size_t n);
     103
     104extern errno_t str_uint64_t(const char *, char **, unsigned int, bool,
     105    uint64_t *);
    103106
    104107extern void order_suffix(const uint64_t, uint64_t *, char *);

  • kernel/generic/include/synch/spinlock.h

    rad40b74b rbc73be3  
    103103 * @param lock  Pointer to spinlock_t structure.
    104104 */
    105 NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
     105_NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
    106106{
    107107        preemption_disable();
    … …  
    115115 * @param lock  Pointer to spinlock_t structure.
    116116 */
    117 NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
     117_NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
    118118{
    119119        atomic_flag_clear_explicit(&lock->flag, memory_order_release);

  • kernel/generic/include/trace.h

    rad40b74b rbc73be3  
    3636#define KERN_TRACE_H_
    3737
    38 #define NO_TRACE  __attribute__((no_instrument_function))
     38#define _NO_TRACE  __attribute__((no_instrument_function))
    3939
    4040#endif

  • kernel/generic/include/types/adt/odict.h

    rad40b74b rbc73be3  
    3333 */
    3434
    35 #ifndef LIBC_TYPES_ODICT_H_
    36 #define LIBC_TYPES_ODICT_H_
     35#ifndef _LIBC_TYPES_ODICT_H_
     36#define _LIBC_TYPES_ODICT_H_
    3737
    3838#include <adt/list.h>
Note: See TracChangeset for help on using the changeset viewer.