Changeset 96b02eb9 in mainline for kernel/generic/include


Ignore:
Timestamp:
2010-12-14T12:52:38Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6b10dab
Parents:
554debd
Message:

more unification of basic types

  • use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
  • remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:
kernel/generic/include
Files:
24 edited

Legend:

Unmodified
Added
Removed

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

    r554debd r96b02eb9  
    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/console/console.h

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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/ddi/ddi.h

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    123123        answerbox_t *answerbox;
    124124        /** Method to be used for the notification. */
    125         unative_t method;
     125        sysarg_t method;
    126126        /** Arguments that will be sent if the IRQ is claimed. */
    127127        uint32_t scratch[IPC_CALL_LEN];

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

    r554debd r96b02eb9  
    4848        answerbox_t *answerbox;
    4949        /** Method to be used for the notification. */
    50         unative_t method;
     50        sysarg_t method;
    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

    r554debd r96b02eb9  
    311311
    312312typedef struct {
    313         unative_t args[IPC_CALL_LEN];
     313        sysarg_t args[IPC_CALL_LEN];
    314314        phone_t *phone;
    315315} ipc_data_t;
    … …  
    331331       
    332332        /** Private data to internal IPC. */
    333         unative_t priv;
     333        sysarg_t priv;
    334334       
    335335        /** Data passed from/to userspace. */
    … …  
    368368
    369369extern void ipc_cleanup(void);
    370 extern void ipc_backsend_err(phone_t *, call_t *, unative_t);
     370extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
    371371extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
    372372extern void ipc_cleanup_call_list(link_t *);

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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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,
     42extern sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method,
     43    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data);
     44extern sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question,
    4545    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,
     46extern sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method,
     47    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4);
     48extern sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data);
     49extern sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval,
     50    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4);
     51extern sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data);
     52extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
    5353    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,
     54extern sysarg_t sys_ipc_poke(void);
     55extern sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid,
     56    sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode);
     57extern sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid,
    5858    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,
     59extern sysarg_t sys_ipc_hangup(sysarg_t phoneid);
     60extern sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method,
    6161    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);
     62extern sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
     63extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *task_id);
    6464
    6565#endif

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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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/proc/program.h

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    145145#endif
    146146
    147 extern unative_t sys_task_get_id(task_id_t *);
    148 extern unative_t sys_task_set_name(const char *, size_t);
     147extern sysarg_t sys_task_get_id(task_id_t *);
     148extern sysarg_t sys_task_set_name(const char *, size_t);
    149149
    150150#endif

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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    7676typedef uint32_t cap_t;
    7777
    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);
     78extern sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
     79extern sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
    8080
    8181#endif

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

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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/syscall/syscall.h

    r554debd r96b02eb9  
    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/sysinfo.h

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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/udebug/udebug.h

    r554debd r96b02eb9  
    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

    r554debd r96b02eb9  
    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.