Changeset 7bdcc45 in mainline for kernel/generic/include


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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:

Merge mainline changes.

Location:
kernel/generic/include
Files:
35 edited

Legend:

Unmodified
Added
Removed

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

    r8e58f94 r7bdcc45  
    4848         * @return Index into hash table.
    4949         */
    50         size_t (* hash)(unative_t key[]);
     50        size_t (* hash)(sysarg_t key[]);
    5151       
    5252        /** Hash table item comparison function.
    … …  
    5757         * @return true if the keys match, false otherwise.
    5858         */
    59         bool (*compare)(unative_t key[], size_t keys, link_t *item);
     59        bool (*compare)(sysarg_t key[], size_t keys, link_t *item);
    6060
    6161        /** Hash table item removal callback.
    … …  
    7979extern void hash_table_create(hash_table_t *h, size_t m, size_t max_keys,
    8080    hash_table_operations_t *op);
    81 extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
    82 extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
    83 extern void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys);
     81extern void hash_table_insert(hash_table_t *h, sysarg_t key[], link_t *item);
     82extern link_t *hash_table_find(hash_table_t *h, sysarg_t key[]);
     83extern void hash_table_remove(hash_table_t *h, sysarg_t key[], size_t keys);
    8484
    8585#endif

  • kernel/generic/include/config.h

    r8e58f94 r7bdcc45  
    6666
    6767typedef struct {
    68         size_t cpu_count;            /**< Number of processors detected. */
     68        unsigned int cpu_count;      /**< Number of processors detected. */
    6969        volatile size_t cpu_active;  /**< Number of processors that are up and running. */
    7070       

  • kernel/generic/include/console/console.h

    r8e58f94 r7bdcc45  
    6767extern wchar_t getc(indev_t *indev);
    6868extern size_t gets(indev_t *indev, char *buf, size_t buflen);
    69 extern unative_t sys_klog(int fd, const void *buf, size_t size);
     69extern sysarg_t sys_klog(int fd, const void *buf, size_t size);
    7070
    7171extern void grab_console(void);
    7272extern void release_console(void);
    7373
    74 extern unative_t sys_debug_enable_console(void);
    75 extern unative_t sys_debug_disable_console(void);
     74extern sysarg_t sys_debug_enable_console(void);
     75extern sysarg_t sys_debug_disable_console(void);
    7676
    7777#endif /* KERN_CONSOLE_H_ */

  • kernel/generic/include/console/kconsole.h

    r8e58f94 r7bdcc45  
    6262        size_t len;
    6363        /** Integer value. */
    64         unative_t intval;
     64        sysarg_t intval;
    6565        /** Resulting type of variable arg */
    6666        cmd_arg_type_t vartype;

  • kernel/generic/include/cpu.h

    r8e58f94 r7bdcc45  
    8383         * Processor ID assigned by kernel.
    8484         */
    85         size_t id;
     85        unsigned int id;
    8686       
    8787        bool active;

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

    r8e58f94 r7bdcc45  
    5252extern void ddi_parea_register(parea_t *);
    5353
    54 extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
    55 extern unative_t sys_iospace_enable(ddi_ioarg_t *);
    56 extern unative_t sys_interrupt_enable(int irq, int enable);
     54extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
     55extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
     56extern sysarg_t sys_interrupt_enable(int irq, int enable);
    5757
    5858/*

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

    r8e58f94 r7bdcc45  
    3939
    4040extern devno_t device_assign_devno(void);
    41 extern unative_t sys_device_assign_devno(void);
     41extern sysarg_t sys_device_assign_devno(void);
    4242
    4343#endif

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

    r8e58f94 r7bdcc45  
    122122        /** Answerbox for notifications. */
    123123        answerbox_t *answerbox;
    124         /** Method to be used for the notification. */
    125         unative_t method;
     124        /** Interface and method to be used for the notification. */
     125        sysarg_t imethod;
    126126        /** Arguments that will be sent if the IRQ is claimed. */
    127127        uint32_t scratch[IPC_CALL_LEN];

  • kernel/generic/include/interrupt.h

    r8e58f94 r7bdcc45  
    3737
    3838#include <arch/interrupt.h>
     39#include <print.h>
    3940#include <typedefs.h>
    4041#include <proc/task.h>
    … …  
    5758extern exc_table_t exc_table[];
    5859
    59 extern void fault_if_from_uspace(istate_t *, const char *, ...);
     60extern void fault_if_from_uspace(istate_t *, const char *, ...)
     61    PRINTF_ATTRIBUTE(2, 3);
    6062extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
    6163extern void exc_dispatch(unsigned int, istate_t *);

  • kernel/generic/include/ipc/event.h

    r8e58f94 r7bdcc45  
    4747        /** Answerbox for notifications. */
    4848        answerbox_t *answerbox;
    49         /** Method to be used for the notification. */
    50         unative_t method;
     49        /** Interface and method to be used for the notification. */
     50        sysarg_t imethod;
    5151        /** Counter. */
    5252        size_t counter;
    … …  
    5454
    5555extern void event_init(void);
    56 extern unative_t sys_event_subscribe(unative_t, unative_t);
     56extern sysarg_t sys_event_subscribe(sysarg_t, sysarg_t);
    5757extern bool event_is_subscribed(event_type_t);
    5858extern void event_cleanup_answerbox(answerbox_t *);
    … …  
    7171        event_notify((e), (a1), (a2), (a3), (a4), (a5))
    7272
    73 extern void event_notify(event_type_t, unative_t, unative_t, unative_t,
    74     unative_t, unative_t);
     73extern void event_notify(event_type_t, sysarg_t, sysarg_t, sysarg_t,
     74    sysarg_t, sysarg_t);
    7575
    7676#endif

  • kernel/generic/include/ipc/ipc.h

    r8e58f94 r7bdcc45  
    4343#define IPC_CALL_LEN  6
    4444
    45 /** Maximum active async calls per thread */
    46 #ifdef CONFIG_DEBUG
    47         #define IPC_MAX_ASYNC_CALLS  4
    48 #else
    49         #define IPC_MAX_ASYNC_CALLS  4000
    50 #endif
     45/** Maximum active async calls per phone */
     46#define IPC_MAX_ASYNC_CALLS  4
    5147
    5248/* Flags for calls */
    … …  
    8884/* Macros for manipulating calling data */
    8985#define IPC_SET_RETVAL(data, retval)  ((data).args[0] = (retval))
    90 #define IPC_SET_METHOD(data, val)     ((data).args[0] = (val))
     86#define IPC_SET_IMETHOD(data, val)    ((data).args[0] = (val))
    9187#define IPC_SET_ARG1(data, val)       ((data).args[1] = (val))
    9288#define IPC_SET_ARG2(data, val)       ((data).args[2] = (val))
    … …  
    9591#define IPC_SET_ARG5(data, val)       ((data).args[5] = (val))
    9692
    97 #define IPC_GET_METHOD(data)  ((data).args[0])
    98 #define IPC_GET_RETVAL(data)  ((data).args[0])
     93#define IPC_GET_IMETHOD(data)  ((data).args[0])
     94#define IPC_GET_RETVAL(data)   ((data).args[0])
    9995
    10096#define IPC_GET_ARG1(data)  ((data).args[1])
    … …  
    120116#define IPC_FF_ROUTE_FROM_ME  (1 << 0)
    121117
     118/** Kernel IPC interfaces
     119 *
     120 */
     121#define IPC_IF_KERNEL  0
     122
    122123/** System-specific methods - only through special syscalls
    123  * These methods have special behaviour
     124 *
     125 * These methods have special behaviour. These methods also
     126 * have the implicit kernel interface 0.
    124127 *
    125128 */
    … …  
    315318
    316319typedef struct {
    317         unative_t args[IPC_CALL_LEN];
     320        sysarg_t args[IPC_CALL_LEN];
    318321        phone_t *phone;
    319322} ipc_data_t;
    … …  
    335338       
    336339        /** Private data to internal IPC. */
    337         unative_t priv;
     340        sysarg_t priv;
    338341       
    339342        /** Data passed from/to userspace. */
    … …  
    372375
    373376extern void ipc_cleanup(void);
    374 extern void ipc_backsend_err(phone_t *, call_t *, unative_t);
     377extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
    375378extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
    376379extern void ipc_cleanup_call_list(link_t *);

  • kernel/generic/include/ipc/ipcrsc.h

    r8e58f94 r7bdcc45  
    3939#include <ipc/ipc.h>
    4040
    41 extern call_t * get_call(unative_t callid);
     41extern call_t * get_call(sysarg_t callid);
    4242extern int phone_alloc(task_t *t);
    4343extern void phone_connect(int phoneid, answerbox_t *box);

  • kernel/generic/include/ipc/irq.h

    r8e58f94 r7bdcc45  
    4444#include <adt/list.h>
    4545
    46 extern int ipc_irq_register(answerbox_t *, inr_t, devno_t, unative_t,
     46extern int ipc_irq_register(answerbox_t *, inr_t, devno_t, sysarg_t,
    4747    irq_code_t *);
    4848
    … …  
    7575        ipc_irq_send_msg((irq), (a1), (a2), (a3), (a4), (a5))
    7676
    77 extern void ipc_irq_send_msg(irq_t *, unative_t, unative_t, unative_t, unative_t,
    78     unative_t);
     77extern void ipc_irq_send_msg(irq_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     78    sysarg_t);
    7979
    8080#endif

  • kernel/generic/include/ipc/sysipc.h

    r8e58f94 r7bdcc45  
    4040#include <typedefs.h>
    4141
    42 extern unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,
    43     unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data);
    44 extern unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question,
    45     ipc_data_t *reply);
    46 extern unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method,
    47     unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4);
    48 extern unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data);
    49 extern unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
    50     unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4);
    51 extern unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data);
    52 extern unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
    53     unsigned int nonblocking);
    54 extern unative_t sys_ipc_poke(void);
    55 extern unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
    56     unative_t method, unative_t arg1, unative_t arg2, unsigned int mode);
    57 extern unative_t sys_ipc_forward_slow(unative_t callid, unative_t phoneid,
    58     ipc_data_t *data, unsigned int mode);
    59 extern unative_t sys_ipc_hangup(unative_t phoneid);
    60 extern unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,
    61     irq_code_t *ucode);
    62 extern unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
    63 extern unative_t sys_ipc_connect_kbox(sysarg64_t *task_id);
     42extern sysarg_t sys_ipc_call_sync_fast(sysarg_t, sysarg_t, sysarg_t,
     43    sysarg_t, sysarg_t, ipc_data_t *);
     44extern sysarg_t sys_ipc_call_sync_slow(sysarg_t, ipc_data_t *, ipc_data_t *);
     45extern sysarg_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
     46    sysarg_t, sysarg_t, sysarg_t);
     47extern sysarg_t sys_ipc_call_async_slow(sysarg_t, ipc_data_t *);
     48extern sysarg_t sys_ipc_answer_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     49    sysarg_t, sysarg_t);
     50extern sysarg_t sys_ipc_answer_slow(sysarg_t, ipc_data_t *);
     51extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *, uint32_t, unsigned int);
     52extern sysarg_t sys_ipc_poke(void);
     53extern sysarg_t sys_ipc_forward_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     54    sysarg_t, unsigned int);
     55extern sysarg_t sys_ipc_forward_slow(sysarg_t, sysarg_t, ipc_data_t *,
     56    unsigned int);
     57extern sysarg_t sys_ipc_hangup(sysarg_t);
     58extern sysarg_t sys_ipc_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
     59extern sysarg_t sys_ipc_unregister_irq(inr_t, devno_t);
     60
     61#ifdef __32_BITS__
     62
     63extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *);
     64
     65#endif  /* __32_BITS__ */
     66
     67#ifdef __64_BITS__
     68
     69extern sysarg_t sys_ipc_connect_kbox(sysarg_t);
     70
     71#endif  /* __64_BITS__ */
    6472
    6573#endif

  • kernel/generic/include/macros.h

    r8e58f94 r7bdcc45  
    104104#define STRING_ARG(arg)  #arg
    105105
    106 #define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
    107 #define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
     106#define LOWER32(arg)  (((uint64_t) (arg)) & UINT32_C(0xffffffff))
     107#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & UINT32_C(0xffffffff))
    108108
    109109#define MERGE_LOUP32(lo, up) \
    110         ((((uint64_t) (lo)) & 0xffffffff) \
    111             | ((((uint64_t) (up)) & 0xffffffff) << 32))
     110        ((((uint64_t) (lo)) & UINT32_C(0xffffffff)) \
     111            | ((((uint64_t) (up)) & UINT32_C(0xffffffff)) << 32))
    112112
    113113/** Pseudorandom generator

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

    r8e58f94 r7bdcc45  
    303303
    304304/* Address space area related syscalls. */
    305 extern unative_t sys_as_area_create(uintptr_t, size_t, unsigned int);
    306 extern unative_t sys_as_area_resize(uintptr_t, size_t, unsigned int);
    307 extern unative_t sys_as_area_change_flags(uintptr_t, unsigned int);
    308 extern unative_t sys_as_area_destroy(uintptr_t);
     305extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int);
     306extern sysarg_t sys_as_area_resize(uintptr_t, size_t, unsigned int);
     307extern sysarg_t sys_as_area_change_flags(uintptr_t, unsigned int);
     308extern sysarg_t sys_as_area_destroy(uintptr_t);
    309309
    310310/* Introspection functions. */

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

    r8e58f94 r7bdcc45  
    144144
    145145#define IS_BUDDY_ORDER_OK(index, order) \
    146     ((~(((unative_t) -1) << (order)) & (index)) == 0)
     146    ((~(((sysarg_t) -1) << (order)) & (index)) == 0)
    147147#define IS_BUDDY_LEFT_BLOCK(zone, frame) \
    148148    (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x01) == 0)

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

    r8e58f94 r7bdcc45  
    126126extern void slab_cache_destroy(slab_cache_t *);
    127127
    128 extern void * slab_alloc(slab_cache_t *, unsigned int);
     128extern void *slab_alloc(slab_cache_t *, unsigned int)
     129    __attribute__((malloc));
    129130extern void slab_free(slab_cache_t *, void *);
    130131extern size_t slab_reclaim(unsigned int);
    … …  
    138139
    139140/* malloc support */
    140 extern void *malloc(size_t, unsigned int);
     141extern void *malloc(size_t, unsigned int)
     142    __attribute__((malloc));
    141143extern void *realloc(void *, size_t, unsigned int);
    142144extern void free(void *);

  • kernel/generic/include/panic.h

    r8e58f94 r7bdcc45  
    3737
    3838#include <typedefs.h>
     39#include <print.h>
    3940
    4041#define panic(fmt, ...) \
    … …  
    6263
    6364extern void panic_common(panic_category_t, struct istate *, int,
    64     uintptr_t, const char *, ...) __attribute__ ((noreturn));
     65    uintptr_t, const char *, ...) __attribute__ ((noreturn))
     66    PRINTF_ATTRIBUTE(5, 6);
    6567
    6668#endif

  • kernel/generic/include/print.h

    r8e58f94 r7bdcc45  
    3939#include <stdarg.h>
    4040
     41#ifndef NVERIFY_PRINTF
     42
     43#define PRINTF_ATTRIBUTE(start, end) \
     44        __attribute__((format(gnu_printf, start, end)))
     45
     46#else /* NVERIFY_PRINTF */
     47
     48#define PRINTF_ATTRIBUTE(start, end)
     49
     50#endif /* NVERIFY_PRINTF */
     51
    4152#define EOF  (-1)
    4253
    4354extern int puts(const char *s);
    44 extern int printf(const char *fmt, ...);
    45 extern int snprintf(char *str, size_t size, const char *fmt, ...);
     55extern int printf(const char *fmt, ...)
     56    PRINTF_ATTRIBUTE(1, 2);
     57extern int snprintf(char *str, size_t size, const char *fmt, ...)
     58    PRINTF_ATTRIBUTE(3, 4);
    4659
    4760extern int vprintf(const char *fmt, va_list ap);

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

    r8e58f94 r7bdcc45  
    5959extern void program_ready(program_t *);
    6060
    61 extern unative_t sys_program_spawn_loader(char *, size_t);
     61extern sysarg_t sys_program_spawn_loader(char *, size_t);
    6262
    6363#endif

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

    r8e58f94 r7bdcc45  
    9393        phone_t phones[IPC_MAX_PHONES];
    9494        stats_ipc_t ipc_info;   /**< IPC statistics */
    95         /**
    96          * Active asynchronous messages. It is used for limiting uspace to
    97          * certain extent.
    98          */
    99         atomic_t active_calls;
    10095        /** List of synchronous answerboxes. */
    10196        link_t sync_box_head;
    … …  
    150145#endif
    151146
    152 extern unative_t sys_task_get_id(task_id_t *);
    153 extern unative_t sys_task_set_name(const char *, size_t);
     147#ifdef __32_BITS__
     148extern sysarg_t sys_task_get_id(sysarg64_t *);
     149#endif
     150
     151#ifdef __64_BITS__
     152extern sysarg_t sys_task_get_id(void);
     153#endif
     154
     155extern sysarg_t sys_task_set_name(const char *, size_t);
    154156
    155157#endif

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

    r8e58f94 r7bdcc45  
    241241
    242242/* Thread syscall prototypes. */
    243 extern unative_t sys_thread_create(uspace_arg_t *, char *, size_t,
     243extern sysarg_t sys_thread_create(uspace_arg_t *, char *, size_t,
    244244    thread_id_t *);
    245 extern unative_t sys_thread_exit(int);
    246 extern unative_t sys_thread_get_id(thread_id_t *);
    247 extern unative_t sys_thread_usleep(uint32_t);
     245extern sysarg_t sys_thread_exit(int);
     246extern sysarg_t sys_thread_get_id(thread_id_t *);
     247extern sysarg_t sys_thread_usleep(uint32_t);
    248248
    249249#endif

  • kernel/generic/include/security/cap.h

    r8e58f94 r7bdcc45  
    4848#define __CAP_H__
    4949
    50 #include <syscall/sysarg64.h>
    5150#include <typedefs.h>
    5251
    … …  
    5554 * privilege to/from other tasks.
    5655 */
    57 #define CAP_CAP                 (1<<0)
     56#define CAP_CAP  (1 << 0)
    5857
    5958/**
    … …  
    6160 * to other tasks.
    6261 */
    63 #define CAP_MEM_MANAGER         (1<<1)
     62#define CAP_MEM_MANAGER  (1 << 1)
    6463
    6564/**
    … …  
    6766 * to other tasks.
    6867 */
    69 #define CAP_IO_MANAGER          (1<<2)
     68#define CAP_IO_MANAGER  (1 << 2)
    7069
    7170/**
    7271 * CAP_IRQ_REG entitles its holder to register IRQ handlers.
    7372 */
    74 #define CAP_IRQ_REG             (1<<3)
     73#define CAP_IRQ_REG  (1 << 3)
    7574
    7675typedef uint32_t cap_t;
    7776
    78 extern unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
    79 extern unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
     77#ifdef __32_BITS__
     78
     79extern sysarg_t sys_cap_grant(sysarg64_t *, cap_t);
     80extern sysarg_t sys_cap_revoke(sysarg64_t *, cap_t);
     81
     82#endif  /* __32_BITS__ */
     83
     84#ifdef __64_BITS__
     85
     86extern sysarg_t sys_cap_grant(sysarg_t, cap_t);
     87extern sysarg_t sys_cap_revoke(sysarg_t, cap_t);
     88
     89#endif  /* __64_BITS__ */
    8090
    8191#endif

  • kernel/generic/include/stdint.h

    r8e58f94 r7bdcc45  
    3636#define KERN_STDINT_H_
    3737
    38 #define INT8_MIN  (0x80)
    39 #define INT8_MAX  (0x7F)
     38#define INT8_MIN  INT8_C(0x80)
     39#define INT8_MAX  INT8_C(0x7F)
    4040
    41 #define UINT8_MIN  (0u)
    42 #define UINT8_MAX  (0xFFu)
     41#define UINT8_MIN  UINT8_C(0)
     42#define UINT8_MAX  UINT8_C(0xFF)
    4343
    44 #define INT16_MIN  (0x8000)
    45 #define INT16_MAX  (0x7FFF)
     44#define INT16_MIN  INT16_C(0x8000)
     45#define INT16_MAX  INT16_C(0x7FFF)
    4646
    47 #define UINT16_MIN  (0u)
    48 #define UINT16_MAX  (0xFFFFu)
     47#define UINT16_MIN  UINT16_C(0)
     48#define UINT16_MAX  UINT16_C(0xFFFF)
    4949
    50 #define INT32_MIN  (0x80000000l)
    51 #define INT32_MAX  (0x7FFFFFFFl)
     50#define INT32_MIN  INT32_C(0x80000000)
     51#define INT32_MAX  INT32_C(0x7FFFFFFF)
    5252
    53 #define UINT32_MIN  (0ul)
    54 #define UINT32_MAX  (0xFFFFFFFFul)
     53#define UINT32_MIN  UINT32_C(0)
     54#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
    5555
    56 #define INT64_MIN  (0x8000000000000000ll)
    57 #define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
     56#define INT64_MIN  INT64_C(0x8000000000000000)
     57#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
    5858
    59 #define UINT64_MIN  (0ull)
    60 #define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
     59#define UINT64_MIN  UINT64_C(0)
     60#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
    6161
    6262#endif

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

    r8e58f94 r7bdcc45  
    5252
    5353extern void futex_init(void);
    54 extern unative_t sys_futex_sleep(uintptr_t);
    55 extern unative_t sys_futex_wakeup(uintptr_t);
     54extern sysarg_t sys_futex_sleep(uintptr_t);
     55extern sysarg_t sys_futex_wakeup(uintptr_t);
    5656
    5757extern void futex_cleanup(void);

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

    r8e58f94 r7bdcc45  
    3636#define KERN_SMC_H_
    3737
    38 extern unative_t sys_smc_coherence(uintptr_t va, size_t size);
     38extern sysarg_t sys_smc_coherence(uintptr_t va, size_t size);
    3939
    4040#endif

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

    r8e58f94 r7bdcc45  
    146146        if ((pname)++ > (value)) { \
    147147                (pname) = 0; \
    148                 printf("Deadlock probe %s: exceeded threshold %u\n", \
     148                printf("Deadlock probe %s: exceeded threshold %u\n" \
    149149                    "cpu%u: function=%s, line=%u\n", \
    150150                    #pname, (value), CPU->id, __func__, __LINE__); \

  • kernel/generic/include/syscall/syscall.h

    r8e58f94 r7bdcc45  
    3838typedef enum {
    3939        SYS_KLOG = 0,
    40         SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - fibril.S */
     40        SYS_TLS_SET = 1,  /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */
    4141       
    4242        SYS_THREAD_CREATE,
    … …  
    7171        SYS_IPC_REGISTER_IRQ,
    7272        SYS_IPC_UNREGISTER_IRQ,
     73        SYS_IPC_CONNECT_KBOX,
    7374       
    7475        SYS_EVENT_SUBSCRIBE,
    … …  
    9091        SYS_DEBUG_DISABLE_CONSOLE,
    9192       
    92         SYS_IPC_CONNECT_KBOX,
    9393        SYSCALL_END
    9494} syscall_t;
    … …  
    9898#include <typedefs.h>
    9999
    100 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,
    101     unative_t, unative_t);
     100typedef sysarg_t (*syshandler_t)(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     101    sysarg_t, sysarg_t);
    102102
    103103extern syshandler_t syscall_table[SYSCALL_END];
    104 extern unative_t syscall_handler(unative_t, unative_t, unative_t, unative_t,
    105     unative_t, unative_t, unative_t);
    106 extern unative_t sys_tls_set(unative_t);
     104extern sysarg_t syscall_handler(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     105    sysarg_t, sysarg_t, sysarg_t);
     106extern sysarg_t sys_tls_set(sysarg_t);
    107107
    108108#endif

  • kernel/generic/include/sysinfo/abi.h

    r8e58f94 r7bdcc45  
    6666 */
    6767typedef struct {
    68         size_t id;               /**< CPU ID as stored by kernel */
     68        unsigned int id;         /**< CPU ID as stored by kernel */
    6969        bool active;             /**< CPU is activate */
    7070        uint16_t frequency_mhz;  /**< Frequency in MHz */

  • kernel/generic/include/sysinfo/sysinfo.h

    r8e58f94 r7bdcc45  
    6565
    6666/** Gerated numeric value function */
    67 typedef unative_t (*sysinfo_fn_val_t)(struct sysinfo_item *);
     67typedef sysarg_t (*sysinfo_fn_val_t)(struct sysinfo_item *);
    6868
    6969/** Generated binary data function */
    … …  
    8282 */
    8383typedef union {
    84         unative_t val;              /**< Constant numberic value */
     84        sysarg_t val;               /**< Constant numberic value */
    8585        sysinfo_fn_val_t fn_val;    /**< Generated numeric value function */
    8686        sysinfo_fn_data_t fn_data;  /**< Generated binary data function */
    … …  
    9999        sysinfo_item_val_type_t tag;  /**< Return value type */
    100100        union {
    101                 unative_t val;            /**< Numberic value */
     101                sysarg_t val;             /**< Numberic value */
    102102                sysinfo_data_t data;      /**< Binary data */
    103103        };
    … …  
    130130} sysinfo_item_t;
    131131
    132 extern void sysinfo_set_item_val(const char *, sysinfo_item_t **, unative_t);
     132extern void sysinfo_set_item_val(const char *, sysinfo_item_t **, sysarg_t);
    133133extern void sysinfo_set_item_data(const char *, sysinfo_item_t **, void *,
    134134    size_t);
    … …  
    145145extern void sysinfo_dump(sysinfo_item_t *);
    146146
    147 extern unative_t sys_sysinfo_get_tag(void *, size_t);
    148 extern unative_t sys_sysinfo_get_value(void *, size_t, void *);
    149 extern unative_t sys_sysinfo_get_data_size(void *, size_t, void *);
    150 extern unative_t sys_sysinfo_get_data(void *, size_t, void *, size_t);
     147extern sysarg_t sys_sysinfo_get_tag(void *, size_t);
     148extern sysarg_t sys_sysinfo_get_value(void *, size_t, void *);
     149extern sysarg_t sys_sysinfo_get_data_size(void *, size_t, void *);
     150extern sysarg_t sys_sysinfo_get_data(void *, size_t, void *, size_t);
    151151
    152152#endif

  • kernel/generic/include/time/clock.h

    r8e58f94 r7bdcc45  
    4242/** Uptime structure */
    4343typedef struct {
    44         unative_t seconds1;
    45         unative_t useconds;
    46         unative_t seconds2;
     44        sysarg_t seconds1;
     45        sysarg_t useconds;
     46        sysarg_t seconds2;
    4747} uptime_t;
    4848

  • kernel/generic/include/typedefs.h

    r8e58f94 r7bdcc45  
    4040#include <arch/types.h>
    4141
    42 #define NULL  0UL
     42#define NULL  ((void *) 0)
    4343
    4444#define false  0
    … …  
    6969typedef int32_t devno_t;
    7070
    71 typedef int32_t wchar_t;
    72 
    7371typedef volatile uint8_t ioport8_t;
    7472typedef volatile uint16_t ioport16_t;
    7573typedef volatile uint32_t ioport32_t;
     74
     75#ifdef __32_BITS__
     76
     77/** Explicit 64-bit arguments passed to syscalls. */
     78typedef uint64_t sysarg64_t;
     79
     80#endif /* __32_BITS__ */
    7681
    7782#endif

  • kernel/generic/include/udebug/udebug.h

    r8e58f94 r7bdcc45  
    212212        waitq_t go_wq;
    213213        call_t *go_call;
    214         unative_t syscall_args[6];
     214        sysarg_t syscall_args[6];
    215215        istate_t *uspace_state;
    216216
    … …  
    229229void udebug_thread_initialize(udebug_thread_t *ut);
    230230
    231 void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
    232     unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
     231void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
     232    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
    233233    bool end_variant);
    234234

  • kernel/generic/include/udebug/udebug_ops.h

    r8e58f94 r7bdcc45  
    5252int udebug_regs_read(thread_t *t, void **buffer);
    5353
    54 int udebug_mem_read(unative_t uspace_addr, size_t n, void **buffer);
     54int udebug_mem_read(sysarg_t uspace_addr, size_t n, void **buffer);
    5555
    5656#endif
Note: See TracChangeset for help on using the changeset viewer.