Changeset 1433ecda in mainline for kernel/genarch/src/drivers/pl011/pl011.c

Timestamp:

2018-04-04T15:42:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

File:

• kernel/genarch/src/drivers/pl011/pl011.c (modified) (5 diffs)

kernel/genarch/src/drivers/pl011/pl011.c

@@ -50 +50 @@
         /* Wait for space becoming available in Tx FIFO. */
         // TODO make pio_read accept consts pointers and remove the cast
-        while ((pio_read_32((ioport32_t*)&uart->regs->flag) & PL011_UART_FLAG_TXFF_FLAG) != 0)
+        while ((pio_read_32((ioport32_t *)&uart->regs->flag) & PL011_UART_FLAG_TXFF_FLAG) != 0)
                 ;
 
@@ -86 +86 @@
 
         // TODO make pio_read accept const pointers and remove the cast
-        while ((pio_read_32((ioport32_t*)&uart->regs->flag) & PL011_UART_FLAG_RXFE_FLAG) == 0) {
+        while ((pio_read_32((ioport32_t *)&uart->regs->flag) & PL011_UART_FLAG_RXFE_FLAG) == 0) {
                 /* We ignore all error flags here */
                 const uint8_t data = pio_read_32(&uart->regs->data);
@@ -99 +99 @@
 {
         assert(uart);
-        uart->regs = (void*)km_map(addr, sizeof(pl011_uart_regs_t),
-                                   PAGE_NOT_CACHEABLE);
+        uart->regs = (void *)km_map(addr, sizeof(pl011_uart_regs_t),
+            PAGE_NOT_CACHEABLE);
         assert(uart->regs);
 
         /* Disable UART */
-        uart->regs->control &= ~ PL011_UART_CONTROL_UARTEN_FLAG;
+        uart->regs->control &= ~PL011_UART_CONTROL_UARTEN_FLAG;
 
         /* Enable hw flow control */
         uart->regs->control |=
-                PL011_UART_CONTROL_RTSE_FLAG |
-                PL011_UART_CONTROL_CTSE_FLAG;
+            PL011_UART_CONTROL_RTSE_FLAG |
+            PL011_UART_CONTROL_CTSE_FLAG;
 
         /* Mask all interrupts */
@@ -117 +117 @@
         /* Enable UART, TX and RX */
         uart->regs->control |=
-                PL011_UART_CONTROL_UARTEN_FLAG |
-                PL011_UART_CONTROL_TXE_FLAG |
-                PL011_UART_CONTROL_RXE_FLAG;
+            PL011_UART_CONTROL_UARTEN_FLAG |
+            PL011_UART_CONTROL_TXE_FLAG |
+            PL011_UART_CONTROL_RXE_FLAG;
 
         outdev_initialize("pl011_uart_dev", &uart->outdev, &pl011_uart_ops);
@@ -143 +143 @@
         /* Enable receive interrupts */
         uart->regs->interrupt_mask |=
-                PL011_UART_INTERRUPT_RX_FLAG |
-                PL011_UART_INTERRUPT_RT_FLAG;
+            PL011_UART_INTERRUPT_RX_FLAG |
+            PL011_UART_INTERRUPT_RT_FLAG;
 }