Changeset cc250b3 in mainline for kernel/genarch/src/drivers/arm926_uart/arm926_uart.c

Timestamp:

2012-09-06T12:31:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

504f1756

Parents:

ecd1a0a (diff), 8cf4823 (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:

• kernel/genarch/src/drivers/arm926_uart/arm926_uart.c (modified) (3 diffs)

kernel/genarch/src/drivers/arm926_uart/arm926_uart.c

@@ -83 +83 @@
         arm926_uart_t *uart = irq->instance;
 
-        // TODO make pio_read accept consts pointers and remove the cast
+        // TODO make pio_read accept const pointers and remove the cast
         while ((pio_read_32((ioport32_t*)&uart->regs->flag) & ARM926_UART_FLAG_RXFE_FLAG) == 0) {
                 /* We ignore all error flags here */
@@ -109 +109 @@
 
         /* Mask all interrupts */
-        uart->regs->interrupt_mask = ARM926_UART_INTERRUPT_ALL;
+        uart->regs->interrupt_mask = 0;
 
         outdev_initialize("arm926_uart_dev", &uart->outdev, &arm926_uart_ops);
@@ -133 +133 @@
         irq_register(&uart->irq);
         /* Enable receive interrupt */
-        uart->regs->interrupt_mask &= ~ARM926_UART_INTERRUPT_RX_FLAG;
+        uart->regs->interrupt_mask |= ARM926_UART_INTERRUPT_RX_FLAG;
 }