Changeset 5a5269d in mainline for kernel/generic/src/ddi/ddi.c
- Timestamp:
- 2019-07-02T12:03:55Z (5 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 98c4c16
- Parents:
- aca97582
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-02 12:03:55)
- git-committer:
- GitHub <noreply@…> (2019-07-02 12:03:55)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/ddi/ddi.c
raca97582 r5a5269d 248 248 */ 249 249 sys_errno_t sys_physmem_map(uintptr_t phys, size_t pages, unsigned int flags, 250 void *virt_ptr, uintptr_t bound)250 uspace_ptr_uintptr_t virt_ptr, uintptr_t bound) 251 251 { 252 252 uintptr_t virt; … … 262 262 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt)); 263 263 if (rc != EOK) { 264 physmem_unmap( (uintptr_t)virt);264 physmem_unmap(virt); 265 265 return rc; 266 266 } … … 393 393 * 394 394 */ 395 sys_errno_t sys_iospace_enable( ddi_ioarg_t *uspace_io_arg)395 sys_errno_t sys_iospace_enable(uspace_ptr_ddi_ioarg_t uspace_io_arg) 396 396 { 397 397 ddi_ioarg_t arg; … … 404 404 } 405 405 406 sys_errno_t sys_iospace_disable( ddi_ioarg_t *uspace_io_arg)406 sys_errno_t sys_iospace_disable(uspace_ptr_ddi_ioarg_t uspace_io_arg) 407 407 { 408 408 ddi_ioarg_t arg; … … 465 465 466 466 sys_errno_t sys_dmamem_map(size_t size, unsigned int map_flags, unsigned int flags, 467 void *phys_ptr, void *virt_ptr, uintptr_t bound)467 uspace_ptr_uintptr_t phys_ptr, uspace_ptr_uintptr_t virt_ptr, uintptr_t bound) 468 468 { 469 469 if ((flags & DMAMEM_FLAGS_ANONYMOUS) == 0) { … … 473 473 474 474 uintptr_t phys; 475 errno_t rc = dmamem_map( (uintptr_t)virt_ptr, size, map_flags,475 errno_t rc = dmamem_map(virt_ptr, size, map_flags, 476 476 flags, &phys); 477 477 … … 481 481 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys)); 482 482 if (rc != EOK) { 483 dmamem_unmap( (uintptr_t)virt_ptr, size);483 dmamem_unmap(virt_ptr, size); 484 484 return rc; 485 485 } … … 508 508 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys)); 509 509 if (rc != EOK) { 510 dmamem_unmap_anonymous( (uintptr_t)virt);510 dmamem_unmap_anonymous(virt); 511 511 return rc; 512 512 } … … 514 514 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt)); 515 515 if (rc != EOK) { 516 dmamem_unmap_anonymous( (uintptr_t)virt);516 dmamem_unmap_anonymous(virt); 517 517 return rc; 518 518 }
Note:
See TracChangeset
for help on using the changeset viewer.