Changeset 64b7854 in mainline


Ignore:
Timestamp:
2019-06-20T13:47:03Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Children:
d7dfa05
Parents:
e39d7b8
Message:

Use uspace_addr_t instead of uspace_ptr(void)

Location:
kernel/generic
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    re39d7b8 r64b7854  
    7171extern wchar_t getc(indev_t *indev);
    7272extern size_t gets(indev_t *indev, char *buf, size_t buflen);
    73 extern sys_errno_t sys_kio(int cmd, uspace_ptr(void) buf, size_t size);
     73extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);
    7474
    7575extern void grab_console(void);

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

    re39d7b8 r64b7854  
    6363extern void pio_unmap(void *, void *, size_t);
    6464
    65 extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_ptr(void),
     65extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, uspace_addr_t,
    6666    uintptr_t);
    6767extern sys_errno_t sys_physmem_unmap(uintptr_t);
    6868
    69 extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_ptr(void),
    70     uspace_ptr(void), uintptr_t);
     69extern sys_errno_t sys_dmamem_map(size_t, unsigned int, unsigned int, uspace_addr_t,
     70    uspace_addr_t, uintptr_t);
    7171extern sys_errno_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
    7272

  • kernel/generic/include/log.h

    re39d7b8 r64b7854  
    5252    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    5353
    54 extern sys_errno_t sys_klog(sysarg_t, uspace_ptr(void) buf, size_t size,
     54extern sys_errno_t sys_klog(sysarg_t, uspace_addr_t buf, size_t size,
    5555    sysarg_t level, uspace_ptr(size_t) uspace_nread);
    5656

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

    re39d7b8 r64b7854  
    162162extern void sysinfo_dump(sysinfo_item_t *);
    163163
    164 extern sys_errno_t sys_sysinfo_get_keys_size(uspace_ptr(void), size_t, uspace_ptr(void));
    165 extern sys_errno_t sys_sysinfo_get_keys(uspace_ptr(void), size_t, uspace_ptr(void), size_t, uspace_ptr(size_t));
    166 extern sysarg_t sys_sysinfo_get_val_type(uspace_ptr(void), size_t);
    167 extern sys_errno_t sys_sysinfo_get_value(uspace_ptr(void), size_t, uspace_ptr(void));
    168 extern sys_errno_t sys_sysinfo_get_data_size(uspace_ptr(void), size_t, uspace_ptr(void));
    169 extern sys_errno_t sys_sysinfo_get_data(uspace_ptr(void), size_t, uspace_ptr(void), size_t, uspace_ptr(size_t));
     164extern sys_errno_t sys_sysinfo_get_keys_size(uspace_addr_t, size_t, uspace_addr_t);
     165extern sys_errno_t sys_sysinfo_get_keys(uspace_addr_t, size_t, uspace_addr_t, size_t, uspace_ptr(size_t));
     166extern sysarg_t sys_sysinfo_get_val_type(uspace_addr_t, size_t);
     167extern sys_errno_t sys_sysinfo_get_value(uspace_addr_t, size_t, uspace_addr_t);
     168extern sys_errno_t sys_sysinfo_get_data_size(uspace_addr_t, size_t, uspace_addr_t);
     169extern sys_errno_t sys_sysinfo_get_data(uspace_addr_t, size_t, uspace_addr_t, size_t, uspace_ptr(size_t));
    170170
    171171#endif

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

    re39d7b8 r64b7854  
    5555errno_t udebug_regs_read(thread_t *t, void **buffer);
    5656
    57 errno_t udebug_mem_read(uspace_ptr(void) uspace_addr, size_t n, void **buffer);
     57errno_t udebug_mem_read(uspace_addr_t uspace_addr, size_t n, void **buffer);
    5858
    5959#endif

  • kernel/generic/src/console/console.c

    re39d7b8 r64b7854  
    395395 *
    396396 */
    397 sys_errno_t sys_kio(int cmd, uspace_ptr(void) buf, size_t size)
     397sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size)
    398398{
    399399        char *data;

  • kernel/generic/src/ddi/ddi.c

    re39d7b8 r64b7854  
    248248 */
    249249sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags,
    250     uspace_ptr(void) virt_ptr, uintptr_t bound)
     250    uspace_addr_t virt_ptr, uintptr_t bound)
    251251{
    252252        uintptr_t virt;
    … …  
    465465
    466466sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags,
    467     uspace_ptr(void) phys_ptr, uspace_ptr(void) virt_ptr, uintptr_t bound)
     467    uspace_addr_t phys_ptr, uspace_addr_t virt_ptr, uintptr_t bound)
    468468{
    469469        if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) {

  • kernel/generic/src/log/log.c

    re39d7b8 r64b7854  
    295295 *
    296296 */
    297 sys_errno_t sys_klog(sysarg_t operation, uspace_ptr(void) buf, size_t size,
     297sys_errno_t sys_klog(sysarg_t operation, uspace_addr_t buf, size_t size,
    298298    sysarg_t level, uspace_ptr(size_t) uspace_nread)
    299299{

  • kernel/generic/src/sysinfo/sysinfo.c

    re39d7b8 r64b7854  
    677677 *
    678678 */
    679 _NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(uspace_ptr(void) ptr, size_t size,
     679_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(uspace_addr_t ptr, size_t size,
    680680    bool dry_run)
    681681{
    … …  
    786786 *
    787787 */
    788 _NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(uspace_ptr(void) ptr, size_t size,
     788_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(uspace_addr_t ptr, size_t size,
    789789    bool dry_run)
    790790{
    … …  
    831831 *
    832832 */
    833 sys_errno_t sys_sysinfo_get_keys_size(uspace_ptr(void) path_ptr, size_t path_size,
    834     uspace_ptr(void) size_ptr)
     833sys_errno_t sys_sysinfo_get_keys_size(uspace_addr_t path_ptr, size_t path_size,
     834    uspace_addr_t size_ptr)
    835835{
    836836        errno_t rc;
    … …  
    879879 *
    880880 */
    881 sys_errno_t sys_sysinfo_get_keys(uspace_ptr(void) path_ptr, size_t path_size,
    882     uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
     881sys_errno_t sys_sysinfo_get_keys(uspace_addr_t path_ptr, size_t path_size,
     882    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
    883883{
    884884        errno_t rc;
    … …  
    914914 *
    915915 */
    916 sysarg_t sys_sysinfo_get_val_type(uspace_ptr(void) path_ptr, size_t path_size)
     916sysarg_t sys_sysinfo_get_val_type(uspace_addr_t path_ptr, size_t path_size)
    917917{
    918918        /*
    … …  
    950950 *
    951951 */
    952 sys_errno_t sys_sysinfo_get_value(uspace_ptr(void) path_ptr, size_t path_size,
    953     uspace_ptr(void) value_ptr)
     952sys_errno_t sys_sysinfo_get_value(uspace_addr_t path_ptr, size_t path_size,
     953    uspace_addr_t value_ptr)
    954954{
    955955        errno_t rc;
    … …  
    986986 *
    987987 */
    988 sys_errno_t sys_sysinfo_get_data_size(uspace_ptr(void) path_ptr, size_t path_size,
    989     uspace_ptr(void) size_ptr)
     988sys_errno_t sys_sysinfo_get_data_size(uspace_addr_t path_ptr, size_t path_size,
     989    uspace_addr_t size_ptr)
    990990{
    991991        errno_t rc;
    … …  
    10361036 *
    10371037 */
    1038 sys_errno_t sys_sysinfo_get_data(uspace_ptr(void) path_ptr, size_t path_size,
    1039     uspace_ptr(void) buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
     1038sys_errno_t sys_sysinfo_get_data(uspace_addr_t path_ptr, size_t path_size,
     1039    uspace_addr_t buffer_ptr, size_t buffer_size, uspace_ptr(size_t) size_ptr)
    10401040{
    10411041        errno_t rc;

  • kernel/generic/src/udebug/udebug_ipc.c

    re39d7b8 r64b7854  
    398398static void udebug_receive_mem_read(call_t *call)
    399399{
    400         uspace_ptr(void) uspace_dst;
    401         uspace_ptr(void) uspace_src;
     400        uspace_addr_t uspace_dst;
     401        uspace_addr_t uspace_src;
    402402        unsigned size;
    403403        void *buffer = NULL;
Note: See TracChangeset for help on using the changeset viewer.