Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 5863a95 in mainline for kernel/generic/src/ddi/ddi.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ddi/ddi.c

    r70e5ad5 r5863a95  
    232232 *
    233233 */
    234 unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
    235     unative_t pages, unative_t flags)
    236 {
    237         return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
     234sysarg_t sys_physmem_map(sysarg_t phys_base, sysarg_t virt_base,
     235    sysarg_t pages, sysarg_t flags)
     236{
     237        return (sysarg_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
    238238            FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
    239239            (size_t) pages, (int) flags);
     
    247247 *
    248248 */
    249 unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
     249sysarg_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
    250250{
    251251        ddi_ioarg_t arg;
    252252        int rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
    253253        if (rc != 0)
    254                 return (unative_t) rc;
    255        
    256         return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
     254                return (sysarg_t) rc;
     255       
     256        return (sysarg_t) ddi_iospace_enable((task_id_t) arg.task_id,
    257257            (uintptr_t) arg.ioaddr, (size_t) arg.size);
    258258}
     
    265265 * @retutn Zero on success, error code otherwise.
    266266 */
    267 unative_t sys_interrupt_enable(int irq, int enable)
     267sysarg_t sys_interrupt_enable(int irq, int enable)
    268268{
    269269/* FIXME: this needs to be generic code, or better not be in kernel at all. */
Note: See TracChangeset for help on using the changeset viewer.