Changeset 722912e in mainline for uspace/lib/c/generic/device/hw_res_parsed.c

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.

File:

• uspace/lib/c/generic/device/hw_res_parsed.c (modified) (1 diff)

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

@@ -44 +44 @@
         assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
         
-        const int channel = (res->type == DMA_CHANNEL_8) ?
+        const unsigned channel = (res->type == DMA_CHANNEL_8) ?
             res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
         const size_t count = out->dma_channels.count;