Ignore:
Timestamp:
2014-04-16T17:14:06Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f857e8b
Parents:
dba3e2c (diff), 70b570c (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/device/hw_res.h

    rdba3e2c r8b863a62  
    5353        HW_RES_ENABLE_INTERRUPT,
    5454        HW_RES_DMA_CHANNEL_SETUP,
     55        HW_RES_DMA_CHANNEL_REMAIN,
    5556} hw_res_method_t;
    5657
    … …  
    7576                struct {
    7677                        uint64_t address;
     78                        size_t size;
     79                        bool relative;
    7780                        endianness_t endianness;
    78                         size_t size;
    7981                } mem_range;
    8082               
    8183                struct {
    8284                        uint64_t address;
     85                        size_t size;
     86                        bool relative;
    8387                        endianness_t endianness;
    84                         size_t size;
    8588                } io_range;
    8689               
    … …  
    115118
    116119extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
    117     uint16_t, uint8_t);
     120    uint32_t, uint8_t);
     121extern int hw_res_dma_channel_remain(async_sess_t *, unsigned);
    118122
    119123#endif
Note: See TracChangeset for help on using the changeset viewer.