Changeset 0dc2fec in mainline for kernel/genarch/src/drivers/grlib/uart.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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/grlib/uart.c (modified) (1 diff)

kernel/genarch/src/drivers/grlib/uart.c

@@ -52 +52 @@
         grlib_uart_status_t *status;
         grlib_uart_t *uart = (grlib_uart_t *) dev->data;
+        uint32_t reg;
         
         /* Wait for space becoming available in Tx FIFO. */
         do {
-                uint32_t reg = pio_read_32(&uart->io->status);
+                reg = pio_read_32(&uart->io->status);
                 status = (grlib_uart_status_t *) ®
         } while (status->tf != 0);