Changeset 722912e in mainline for uspace/lib/c


Ignore:
Timestamp:
2012-06-29T13:04:54Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ea150dc6
Parents:
6843a9c
Message:

Fix mainline merge breakage.

Location:
uspace/lib/c
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/device/hw_res_parsed.c

    r6843a9c r722912e  
    4444        assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
    4545       
    46         const int channel = (res->type == DMA_CHANNEL_8) ?
     46        const unsigned channel = (res->type == DMA_CHANNEL_8) ?
    4747            res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
    4848        const size_t count = out->dma_channels.count;

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

    r6843a9c r722912e  
    100100        /** List of IRQs */
    101101        irq_list_t irqs;
    102 
    103         /** List of DMA channels */
    104         dma_list_t dma_channels;
    105102       
    106103        /** List of DMA channels */
Note: See TracChangeset for help on using the changeset viewer.