Changeset 5a6cc679 in mainline for uspace/drv/bus/isa/i8237.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/bus/isa/i8237.c (modified) (3 diffs)

uspace/drv/bus/isa/i8237.c

@@ -279 +279 @@
  *
  */
-static inline int dma_controller_init(dma_controller_t *controller)
+static inline errno_t dma_controller_init(dma_controller_t *controller)
 {
         assert(controller);
-        int ret = pio_enable(DMA_CONTROLLER_PAGE_BASE, sizeof(dma_page_regs_t),
+        errno_t ret = pio_enable(DMA_CONTROLLER_PAGE_BASE, sizeof(dma_page_regs_t),
             (void **) &controller->page_table);
         if (ret != EOK)
@@ -339 +339 @@
  * @return Error code.
  */
-int dma_channel_setup(unsigned int channel, uint32_t pa, uint32_t size,
+errno_t dma_channel_setup(unsigned int channel, uint32_t pa, uint32_t size,
     uint8_t mode)
 {
@@ -454 +454 @@
  * @return Error code.
  */
-int dma_channel_remain(unsigned channel, size_t *size)
+errno_t dma_channel_remain(unsigned channel, size_t *size)
 {
         assert(size);