Changeset e8975278 in mainline for boot/arch/arm32/src/putchar.c

Timestamp:

2018-05-10T15:14:02Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1420cae9

Parents:

ae7d03c

git-author:

Jiri Svoboda <jiri@…> (2018-05-10 07:53:56)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-10 15:14:02)

Message:

A few more cstyle fixes.

File:

• boot/arch/arm32/src/putchar.c (modified) (4 diffs)

boot/arch/arm32/src/putchar.c

@@ -51 +51 @@
 {
         volatile uint32_t *thr =
-                (volatile uint32_t *) BBONE_SCONS_THR;
+            (volatile uint32_t *) BBONE_SCONS_THR;
         volatile uint32_t *ssr =
-                (volatile uint32_t *) BBONE_SCONS_SSR;
+            (volatile uint32_t *) BBONE_SCONS_SSR;
 
         /* Wait until transmitter is empty */
-        while (*ssr & BBONE_TXFIFO_FULL);
+        while (*ssr & BBONE_TXFIFO_FULL)
+                ;
 
         /* Transmit byte */
@@ -78 +79 @@
 
         /* Wait until transmitter is empty. */
-        while ((*ssr & BBXM_THR_FULL) == 1) ;
+        while ((*ssr & BBXM_THR_FULL) == 1)
+                ;
 
         /* Transmit byte. */
@@ -144 +146 @@
         write32(BCM2835_UART0_FBRD, 40);        /* Set fractional baud rate */
         write32(BCM2835_UART0_LCRH,
-                BCM2835_UART0_LCRH_FEN |        /* Enable FIFOs */
-                BCM2835_UART0_LCRH_WL8);        /* Word length: 8 */
+            BCM2835_UART0_LCRH_FEN |            /* Enable FIFOs */
+            BCM2835_UART0_LCRH_WL8);            /* Word length: 8 */
         write32(BCM2835_UART0_CR,
-                BCM2835_UART0_CR_UARTEN |       /* Enable UART */
-                BCM2835_UART0_CR_TXE |          /* Enable TX */
-                BCM2835_UART0_CR_RXE);          /* Enable RX */
+            BCM2835_UART0_CR_UARTEN |           /* Enable UART */
+            BCM2835_UART0_CR_TXE |              /* Enable TX */
+            BCM2835_UART0_CR_RXE);              /* Enable RX */
 }
 
@@ -159 +161 @@
         }
 
-        while (read32(BCM2835_UART0_FR) & BCM2835_UART0_FR_TXFF);
+        while (read32(BCM2835_UART0_FR) & BCM2835_UART0_FR_TXFF)
+                ;
 
         write32(BCM2835_UART0_DR, byte);