Changeset 96b02eb9 in mainline for uspace/srv/ns


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:
uspace/srv/ns
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/ns/clonable.c

    r554debd r96b02eb9  
    4646typedef struct {
    4747        link_t link;
    48         ipcarg_t service;
     48        sysarg_t service;
    4949        ipc_call_t call;
    5050        ipc_callid_t callid;
    … …  
    7373 *
    7474 */
    75 void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
     75void register_clonable(sysarg_t service, sysarg_t phone, ipc_call_t *call,
    7676    ipc_callid_t callid)
    7777{
    … …  
    107107 *
    108108 */
    109 void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
     109void connect_to_clonable(sysarg_t service, ipc_call_t *call,
    110110    ipc_callid_t callid)
    111111{

  • uspace/srv/ns/clonable.h

    r554debd r96b02eb9  
    4040
    4141extern bool service_clonable(int service);
    42 extern void register_clonable(ipcarg_t service, ipcarg_t phone,
     42extern void register_clonable(sysarg_t service, sysarg_t phone,
    4343    ipc_call_t *call, ipc_callid_t callid);
    44 extern void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
     44extern void connect_to_clonable(sysarg_t service, ipc_call_t *call,
    4545    ipc_callid_t callid);
    4646

  • uspace/srv/ns/ns.c

    r554debd r96b02eb9  
    7878        }
    7979       
    80         ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
     80        ipc_answer_2(callid, EOK, (sysarg_t) *addr, AS_AREA_READ);
    8181}
    8282
    … …  
    135135               
    136136                task_id_t id;
    137                 ipcarg_t retval;
     137                sysarg_t retval;
    138138               
    139139                switch (IPC_GET_METHOD(call)) {

  • uspace/srv/ns/service.c

    r554debd r96b02eb9  
    4343typedef struct {
    4444        link_t link;
    45         ipcarg_t service;        /**< Number of the service. */
    46         ipcarg_t phone;          /**< Phone registered with the service. */
    47         ipcarg_t in_phone_hash;  /**< Incoming phone hash. */
     45        sysarg_t service;        /**< Number of the service. */
     46        sysarg_t phone;          /**< Phone registered with the service. */
     47        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
    4848} hashed_service_t;
    4949
    … …  
    115115typedef struct {
    116116        link_t link;
    117         ipcarg_t service;        /**< Number of the service. */
     117        sysarg_t service;        /**< Number of the service. */
    118118        ipc_callid_t callid;     /**< Call ID waiting for the connection */
    119         ipcarg_t arg2;           /**< Second argument */
    120         ipcarg_t arg3;           /**< Third argument */
     119        sysarg_t arg2;           /**< Second argument */
     120        sysarg_t arg3;           /**< Third argument */
    121121} pending_conn_t;
    122122
    … …  
    174174 *
    175175 */
    176 int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
     176int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call)
    177177{
    178178        unsigned long keys[3] = {
    … …  
    207207 *
    208208 */
    209 void connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
    210 {
    211         ipcarg_t retval;
     209void connect_to_service(sysarg_t service, ipc_call_t *call, ipc_callid_t callid)
     210{
     211        sysarg_t retval;
    212212        unsigned long keys[3] = {
    213213                service,

  • uspace/srv/ns/service.h

    r554debd r96b02eb9  
    3939extern void process_pending_conn(void);
    4040
    41 extern int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call);
    42 extern void connect_to_service(ipcarg_t service, ipc_call_t *call,
     41extern int register_service(sysarg_t service, sysarg_t phone, ipc_call_t *call);
     42extern void connect_to_service(sysarg_t service, ipc_call_t *call,
    4343     ipc_callid_t callid);
    4444

  • uspace/srv/ns/task.c

    r554debd r96b02eb9  
    4545#define P2I_HASH_TABLE_CHAINS  256
    4646
    47 static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id);
     47static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id);
    4848
    4949/* TODO:
    … …  
    124124typedef struct {
    125125        link_t link;
    126         ipcarg_t phash;    /**< Task ID. */
     126        sysarg_t phash;    /**< Task ID. */
    127127        task_id_t id;    /**< Task ID. */
    128128} p2i_entry_t;
    … …  
    248248void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
    249249{
    250         ipcarg_t retval;
     250        sysarg_t retval;
    251251        task_exit_t texit;
    252252
    … …  
    393393}
    394394
    395 static int get_id_by_phone(ipcarg_t phone_hash, task_id_t *id)
     395static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
    396396{
    397397        unsigned long keys[1];
Note: See TracChangeset for help on using the changeset viewer.