Changeset 8c52f66 in mainline


Ignore:
Timestamp:
2009-09-11T16:21:29Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2ac62cf
Parents:
e8e2ae1
Message:

simplify and add missing protocols

Location:
contrib/arch
Files:
2 deleted
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • contrib/arch/HelenOS.adl

    re8e2ae1 r8c52f66  
    66        inst ns ns;
    77       
    8         [/uspace/lib/libc/bind.kernel%ns]
     8        /* RAM disk */
     9        inst rd rd;
     10       
     11        [/uspace/lib/libc/bind%ns]
     12        [/usrpace/lib/libc/bind%rd]
    913};

  • contrib/arch/kernel/kernel.adl

    re8e2ae1 r8c52f66  
    77                unative_t sys_klog(int fd, const void *buf, size_t size);
    88        protocol:
    9                 sys_klog*
     9                ?sys_klog*
    1010};
    1111
    … …  
    1717                uintptr_t sys_debug_disable_console(void);
    1818        protocol:
    19                 (sys_debug_enable_console + sys_debug_disable_console)*
     19                (?sys_debug_enable_console + ?sys_debug_disable_console)*
    2020};
    2121
    … …  
    2424                unative_t sys_tls_set(unative_t addr);
    2525        protocol:
    26                 sys_tls_set*
     26                ?sys_tls_set*
    2727};
    2828
    … …  
    3737                unative_t sys_thread_get_id(thread_id_t *uspace_thread_id);
    3838        protocol:
    39                 (sys_thread_create + sys_thread_get_id)* ; sys_thread_exit
     39                (?sys_thread_create + ?sys_thread_get_id)* ; ?sys_thread_exit
    4040};
    4141
    … …  
    4747                unative_t sys_task_get_id(task_id_t *uspace_task_id);
    4848        protocol:
    49                 (sys_task_set_name + sys_task_get_id)*
     49                (?sys_task_set_name + ?sys_task_get_id)*
    5050};
    5151
    … …  
    5454                unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len);
    5555        protocol:
    56                 sys_program_spawn_loader*
     56                ?sys_program_spawn_loader*
    5757};
    5858
    … …  
    6464                unative_t sys_futex_wakeup(uintptr_t uaddr);
    6565        protocol:
    66                 (sys_futex_sleep_timeout + sys_futex_wakeup)*
     66                (?sys_futex_sleep_timeout + ?sys_futex_wakeup)*
    6767};
    6868
    … …  
    7171                unative_t sys_smc_coherence(uintptr_t va, size_t size);
    7272        protocol:
    73                 sys_smc_coherence*
     73                ?sys_smc_coherence*
    7474};
    7575
    … …  
    8787                unative_t sys_as_area_destroy(uintptr_t address);
    8888        protocol:
    89                 (sys_as_area_create + sys_as_area_resize + sys_as_area_change_flags + sys_as_area_destroy)*
     89                (?sys_as_area_create + ?sys_as_area_resize + ?sys_as_area_change_flags + ?sys_as_area_destroy)*
    9090};
    9191
    … …  
    124124                unative_t sys_ipc_poke(void);
    125125        protocol:
    126                 (sys_ipc_call_sync_fast + sys_ipc_call_sync_slow + sys_ipc_call_async_fast + sys_ipc_call_async_slow + sys_ipc_forward_fast + sys_ipc_forward_slow + sys_ipc_answer_fast + sys_ipc_answer_slow + sys_ipc_hangup + sys_ipc_wait_for_call + sys_ipc_poke)*
     126                (?sys_ipc_call_sync_fast + ?sys_ipc_call_sync_slow + ?sys_ipc_call_async_fast + ?sys_ipc_call_async_slow + ?sys_ipc_forward_fast + ?sys_ipc_forward_slow + ?sys_ipc_answer_fast + ?sys_ipc_answer_slow + ?sys_ipc_hangup + ?sys_ipc_wait_for_call + ?sys_ipc_poke)*
    127127};
    128128
    … …  
    131131                unative_t sys_event_subscribe(unative_t evno, unative_t method);
    132132        protocol:
    133                 sys_event_subscribe*
     133                ?sys_event_subscribe*
    134134};
    135135
    … …  
    141141                unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
    142142        protocol:
    143                 (sys_cap_grant + sys_cap_rewoke)*
     143                (?sys_cap_grant + ?sys_cap_rewoke)*
    144144};
    145145
    … …  
    163163                unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
    164164        protocol:
    165                 (sys_enable_iospace + sys_physmem_map + sys_device_assign_devno + sys_preempt_control + sys_ipc_register_irq + sys_ipc_unregister_irq)*
     165                (?sys_enable_iospace + ?sys_physmem_map + ?sys_device_assign_devno + ?sys_preempt_control + ?sys_ipc_register_irq + ?sys_ipc_unregister_irq)*
    166166};
    167167
    … …  
    173173                unative_t sys_sysinfo_value(unatice_t ptr, unative_t len);
    174174        protocol:
    175                 (sys_sysinfo_valid + sys_sysinfo_value)*
     175                (?sys_sysinfo_valid + ?sys_sysinfo_value)*
    176176};
    177177
    … …  
    180180                unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg);
    181181        protocol:
    182                 sys_ipc_connect_kbox*
     182                ?sys_ipc_connect_kbox*
    183183};
    184184
    … …  
    261261        delegate kernel_task to kernel_proc:kernel_task;
    262262        delegate kernel_program to kernel_proc:kernel_program;
     263        delegate kernel_futex to kernel_synch:kernel_futex;
     264        delegate kernel_smc to kernel_synch:kernel_smc;
    263265        delegate kernel_as to kernel_mm:kernel_as;
    264266        delegate kernel_ipc to kernel_ipc:kernel_sys;

  • contrib/arch/uspace/lib/libc/bind

    re8e2ae1 r8c52f66  
    66bind %%:kernel_task to kernel:kernel_task;
    77bind %%:kernel_program to kernel:kernel_program;
     8bind %%:kernel_futex to kernel:kernel_futex;
     9bind %%:kernel_smc to kernel:kernel_smc;
    810bind %%:kernel_as to kernel:kernel_as;
    911bind %%:kernel_ipc to kernel:kernel_sys;

  • contrib/arch/uspace/lib/libc/fnc.devmap_device_connect

    re8e2ae1 r8c52f66  
    1 [devmap_get_phone] ;
    2 !dev.IPC_M_CONNECT_ME_TO
     1!ns.ipc_m_connect_me_to /* device via devmap */

  • contrib/arch/uspace/lib/libc/fnc.devmap_device_get_count

    re8e2ae1 r8c52f66  
    1 [devmap_get_phone] ;
    2 !devmap.DEVMAP_DEVICE_GET_COUNT
     1[fnc.devmap_get_phone] ;
     2!dm_client.device_get_count

  • contrib/arch/uspace/lib/libc/fnc.devmap_device_get_devices

    re8e2ae1 r8c52f66  
    1 [devmap_get_phone] ;
    2 !devmap.DEVMAP_DEVICE_GET_DEVICES ;
    3 !devmap.IPC_M_DATA_READ
     1[fnc.devmap_get_phone] ;
     2!dm_client.device_get_devices {
     3        !dm_client.ipc_m_data_read /* buffer */
     4}

  • contrib/arch/uspace/lib/libc/fnc.devmap_device_get_handle

    re8e2ae1 r8c52f66  
    1 [devmap_get_phone] ;
    2 !devmap.DEVMAP_DEVICE_GET_HANDLE ;
    3 !devmap.IPC_M_DATA_WRITE /* name */
     1[fnc.devmap_get_phone] ;
     2!dm_client.device_get_handle {
     3        !dm_client.ipc_m_data_write /* name */
     4}

  • contrib/arch/uspace/lib/libc/fnc.devmap_get_phone

    re8e2ae1 r8c52f66  
    1 !ns.IPC_M_CONNECT_ME_TO /* devmap */ +
    2 NULL
     1tentative {
     2        !ns.ipc_m_connect_me_to /* devmap */
     3}

  • contrib/arch/uspace/lib/libc/protocol

    re8e2ae1 r8c52f66  
    1 /* Protocol by which libc uses uspace services */
     1/* Protocol according to which libc uses kernel syscalls */
     2(
     3        !kernel_klog.sys_klog +
     4        !kernel_tls.sys_tls_set +
     5        !kernel_thread.sys_thread_create +
     6        !kernel_thread.sys_thread_get_id +
     7        !kernel_thread.sys_thread_exit +
     8        !kernel_task.sys_task_set_name +
     9        !kernel_task.sys_task_get_id +
     10        !kernel_program.sys_program_spawn_loader +
     11        !kernel_futex.sys_futex_sleep_timeout +
     12        !kernel_futex.sys_futex_wakeup +
     13        !kernel_smc.sys_smc_coherence +
     14        !kernel_as.sys_as_area_create +
     15        !kernel_as.sys_as_area_resize +
     16        !kernel_as.sys_as_area_change_flags +
     17        !kernel_as.sys_as_area_destroy +
     18        !kernel_ipc.sys_ipc_call_sync_fast +
     19        !kernel_ipc.sys_ipc_call_sync_slow +
     20        !kernel_ipc.sys_ipc_call_async_fast +
     21        !kernel_ipc.sys_ipc_call_async_slow +
     22        !kernel_ipc.sys_ipc_forward_fast +
     23        !kernel_ipc.sys_ipc_forward_slow +
     24        !kernel_ipc.sys_ipc_answer_fast +
     25        !kernel_ipc.sys_ipc_answer_slow +
     26        !kernel_ipc.sys_ipc_hangup +
     27        !kernel_ipc.sys_ipc_wait_for_call +
     28        !kernel_ipc.sys_ipc_poke +
     29        !kernel_event.sys_event_subscribe +
     30        !kernel_cap.sys_cap_grant +
     31        !kernel_cap.sys_cap_rewoke +
     32        !kernel_ddi.sys_enable_iospace +
     33        !kernel_ddi.sys_physmem_map +
     34        !kernel_ddi.sys_device_assign_devno +
     35        !kernel_ddi.sys_preempt_control +
     36        !kernel_ddi.sys_ipc_register_irq +
     37        !kernel_ddi.sys_ipc_unregister_irq +
     38        !kernel_sysinfo.sys_sysinfo_valid +
     39        !kernel_sysinfo.sys_sysinfo_value +
     40        !kernel_debug.sys_ipc_connect_kbox
     41)*

  • contrib/arch/uspace/lib/libc/requires

    re8e2ae1 r8c52f66  
    1 /* Interfaces required by libc */
    2 naming_service ns;
     1/* Kernel interfaces required by libc */
     2kernel_klog kernel_klog;
     3kernel_console kernel_console;
     4kernel_tls kernel_tls;
     5kernel_thread kernel_thread;
     6kernel_task kernel_task;
     7kernel_program kernel_program;
     8kernel_futex kernel_futex;
     9kernel_smc kernel_smc;
     10kernel_as kernel_as;
     11kernel_ipc kernel_sys;
     12kernel_event kernel_event;
     13kernel_cap kernel_cap;
     14kernel_ddi kernel_ddi;
     15kernel_sysinfo kernel_sysinfo;
     16kernel_debug kernel_debug;

  • contrib/arch/uspace/srv/bd/rd/rd.adl

    re8e2ae1 r8c52f66  
    33                block_device bd;
    44        requires:
     5                naming_service ns;
     6                device_mapper_driver dm_driver;
    57                [/uspace/lib/libc/requires]
    6                 [/uspace/lib/libc/requires.kernel]
    7                 device_mapper_driver dm_driver;
    88        protocol:
    99                [/uspace/lib/libc/protocol] +
    10                 [/uspace/lib/libc/protocol.kernel] +
    1110                [rd.bp]
    1211};

  • contrib/arch/uspace/srv/ns/ns.adl

    re8e2ae1 r8c52f66  
    3131                naming_service ns;
    3232        requires:
    33                 [/uspace/lib/libc/requires.kernel]
     33                [/uspace/lib/libc/requires]
    3434        protocol:
    35                 [/uspace/lib/libc/protocol.kernel]
     35                [/uspace/lib/libc/protocol]
    3636};
Note: See TracChangeset for help on using the changeset viewer.