mcf5206 libcpu and mcf5206elite: Fix warnings

4 files changed, 705 insertions, 801 deletions

diff --git a/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c b/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
index ec284c4239..fccce8541d 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
+++ b/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
@@ -1,6 +1,8 @@
 /*
  * Generic UART Serial driver for Motorola Coldfire processors
- *
+ */
+
+/*
  * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russian Fed.
  * Author: Victor V. Vengerov <vvv@oktet.ru>
  *
@@ -10,7 +12,6 @@
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.org/license/LICENSE.
- *
  */
 
 #include <rtems.h>
@@ -23,8 +24,8 @@
  * UART descriptor structures
  */
 static struct {
-    mcfuart *uart;
-    int      vec;
+  mcfuart *uart;
+  int      vec;
 } int_driven_uart[2];
 
 /* Forward function declarations */
@@ -48,20 +49,24 @@ mcfuart_interrupt_handler(rtems_vector_number vec);
  *     RTEMS_SUCCESSFUL if all parameters are valid, or error code
  */
 rtems_status_code
-mcfuart_init(mcfuart *uart, void *tty, uint8_t   intvec,
-             uint32_t   chn)
+mcfuart_init(
+  mcfuart   *uart,
+  void      *tty,
+  uint8_t    intvec,
+  uint32_t   chn
+)
 {
-    if (uart == NULL)
-        return RTEMS_INVALID_ADDRESS;
+  if (uart == NULL)
+      return RTEMS_INVALID_ADDRESS;
 
-    if ((chn <= 0) || (chn > MCF5206E_UART_CHANNELS))
-        return RTEMS_INVALID_NUMBER;
+  if ((chn <= 0) || (chn > MCF5206E_UART_CHANNELS))
+      return RTEMS_INVALID_NUMBER;
 
-    uart->chn = chn;
-    uart->intvec = intvec;
-    uart->tty = tty;
+  uart->chn = chn;
+  uart->intvec = intvec;
+  uart->tty = tty;
 
-    return RTEMS_SUCCESSFUL;
+  return RTEMS_SUCCESSFUL;
 }
 
 /* mcfuart_set_baudrate --
@@ -77,38 +82,38 @@ mcfuart_init(mcfuart *uart, void *tty, uint8_t   intvec,
 static void
 mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
 {
-    uint32_t   div;
-    uint32_t   rate;
-    switch (baud)
-    {
-        case B50:     rate = 50; break;
-        case B75:     rate = 75; break;
-        case B110:    rate = 110; break;
-        case B134:    rate = 134; break;
-        case B150:    rate = 150; break;
-        case B200:    rate = 200; break;
-        case B300:    rate = 300; break;
-        case B600:    rate = 600; break;
-        case B1200:   rate = 1200; break;
-        case B2400:   rate = 2400; break;
-        case B4800:   rate = 4800; break;
-        case B9600:   rate = 9600; break;
-        case B19200:  rate = 19200; break;
-        case B38400:  rate = 38400; break;
-        case B57600:  rate = 57600; break;
+  uint32_t   div;
+  uint32_t   rate;
+
+    switch (baud) {
+      case B50:     rate = 50; break;
+      case B75:     rate = 75; break;
+      case B110:    rate = 110; break;
+      case B134:    rate = 134; break;
+      case B150:    rate = 150; break;
+      case B200:    rate = 200; break;
+      case B300:    rate = 300; break;
+      case B600:    rate = 600; break;
+      case B1200:   rate = 1200; break;
+      case B2400:   rate = 2400; break;
+      case B4800:   rate = 4800; break;
+      case B9600:   rate = 9600; break;
+      case B19200:  rate = 19200; break;
+      case B38400:  rate = 38400; break;
+      case B57600:  rate = 57600; break;
 #ifdef B115200
-        case B115200: rate = 115200; break;
+      case B115200: rate = 115200; break;
 #endif
 #ifdef B230400
-        case B230400: rate = 230400; break;
+      case B230400: rate = 230400; break;
 #endif
-        default:      rate = 9600; break;
+      default:      rate = 9600; break;
     }
 
-    div = SYSTEM_CLOCK_FREQUENCY / (rate * 32);
+  div = SYSTEM_CLOCK_FREQUENCY / (rate * 32);
 
-    *MCF5206E_UBG1(MBAR,uart->chn) = (uint8_t)((div >> 8) & 0xff);
-    *MCF5206E_UBG2(MBAR,uart->chn) = (uint8_t)(div & 0xff);
+  *MCF5206E_UBG1(MBAR,uart->chn) = (uint8_t)((div >> 8) & 0xff);
+  *MCF5206E_UBG2(MBAR,uart->chn) = (uint8_t)(div & 0xff);
 }
 
 /*
@@ -128,69 +133,64 @@ mcfuart_set_baudrate(mcfuart *uart, speed_t baud)
  *     This function in general follows to algorith described in MCF5206e
  *     User's Manual, 12.5 UART Module Initialization Sequence
  */
-rtems_status_code
-mcfuart_reset(mcfuart *uart)
+rtems_status_code mcfuart_reset(mcfuart *uart)
 {
-    register uint32_t   chn;
-    rtems_status_code rc;
-
-    if (uart == NULL)
-        return RTEMS_INVALID_ADDRESS;
-
-    chn = uart->chn;
-
-    /* Reset the receiver and transmitter */
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_RX;
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_TX;
-
-    /*
-     * Program the vector number for a UART module interrupt, or
-     * disable UART interrupts if polled I/O. Enable the desired
-     * interrupt sources.
-     */
-    if (uart->intvec != 0)
-    {
-        int_driven_uart[chn - 1].uart = uart;
-        int_driven_uart[chn - 1].vec = uart->intvec;
-        rc = rtems_interrupt_catch(mcfuart_interrupt_handler, uart->intvec,
-                                   &uart->old_handler);
-        if (rc != RTEMS_SUCCESSFUL)
-            return rc;
-        *MCF5206E_UIVR(MBAR,chn) = uart->intvec;
-        *MCF5206E_UIMR(MBAR,chn) = MCF5206E_UIMR_FFULL;
-        *MCF5206E_UACR(MBAR,chn) = MCF5206E_UACR_IEC;
-        *MCF5206E_IMR(MBAR) &= ~MCF5206E_INTR_BIT(uart->chn == 1 ?
-                                                  MCF5206E_INTR_UART_1 :
-                                                  MCF5206E_INTR_UART_2);
-    }
-    else
-    {
-        *MCF5206E_UIMR(MBAR,chn) = 0;
-    }
-
-    /* Select the receiver and transmitter clock. */
-    mcfuart_set_baudrate(uart, B19200); /* dBUG defaults (unfortunately,
-                                           it is differ to termios default */
-    *MCF5206E_UCSR(MBAR,chn) =
-        MCF5206E_UCSR_RCS_TIMER | MCF5206E_UCSR_TCS_TIMER;
-
-    /* Mode Registers 1,2 - set termios defaults (8N1) */
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_MR;
-    *MCF5206E_UMR(MBAR,chn) =
+  register uint32_t   chn;
+  rtems_status_code rc;
+
+  if (uart == NULL)
+    return RTEMS_INVALID_ADDRESS;
+
+  chn = uart->chn;
+
+  /* Reset the receiver and transmitter */
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_RX;
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_TX;
+
+  /*
+   * Program the vector number for a UART module interrupt, or
+   * disable UART interrupts if polled I/O. Enable the desired
+   * interrupt sources.
+   */
+  if (uart->intvec != 0) {
+    int_driven_uart[chn - 1].uart = uart;
+    int_driven_uart[chn - 1].vec = uart->intvec;
+    rc = rtems_interrupt_catch(mcfuart_interrupt_handler, uart->intvec,
+			       &uart->old_handler);
+    if (rc != RTEMS_SUCCESSFUL)
+      return rc;
+    *MCF5206E_UIVR(MBAR,chn) = uart->intvec;
+    *MCF5206E_UIMR(MBAR,chn) = MCF5206E_UIMR_FFULL;
+    *MCF5206E_UACR(MBAR,chn) = MCF5206E_UACR_IEC;
+    *MCF5206E_IMR(MBAR) &= ~MCF5206E_INTR_BIT(uart->chn == 1 ?
+					      MCF5206E_INTR_UART_1 :
+					      MCF5206E_INTR_UART_2);
+  } else {
+    *MCF5206E_UIMR(MBAR,chn) = 0;
+  }
+
+  /* Select the receiver and transmitter clock. */
+  mcfuart_set_baudrate(uart, B19200); /* dBUG defaults (unfortunately,
+					 it is differ to termios default */
+  *MCF5206E_UCSR(MBAR,chn) = MCF5206E_UCSR_RCS_TIMER | MCF5206E_UCSR_TCS_TIMER;
+
+  /* Mode Registers 1,2 - set termios defaults (8N1) */
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_MR;
+  *MCF5206E_UMR(MBAR,chn) =
 /*      MCF5206E_UMR1_RXRTS | */
-        MCF5206E_UMR1_PM_NO_PARITY |
-        MCF5206E_UMR1_BC_8;
-    *MCF5206E_UMR(MBAR,chn) =
-        MCF5206E_UMR2_CM_NORMAL |
+      MCF5206E_UMR1_PM_NO_PARITY |
+      MCF5206E_UMR1_BC_8;
+  *MCF5206E_UMR(MBAR,chn) =
+      MCF5206E_UMR2_CM_NORMAL |
 /*      MCF5206E_UMR2_TXCTS | */
-        MCF5206E_UMR2_SB_1;
+      MCF5206E_UMR2_SB_1;
 
-    /* Enable Receiver and Transmitter */
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_ERR;
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_TC_ENABLE;
-    *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_RC_ENABLE;
+  /* Enable Receiver and Transmitter */
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_MISC_RESET_ERR;
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_TC_ENABLE;
+  *MCF5206E_UCR(MBAR,chn) = MCF5206E_UCR_RC_ENABLE;
 
-    return RTEMS_SUCCESSFUL;
+  return RTEMS_SUCCESSFUL;
 }
 
 /*
@@ -205,25 +205,24 @@ mcfuart_reset(mcfuart *uart)
  *     RTEMS_SUCCESSFUL if UART closed successfuly, or error code in
  *     other case
  */
-rtems_status_code
-mcfuart_disable(mcfuart *uart)
+rtems_status_code mcfuart_disable(mcfuart *uart)
 {
-    rtems_status_code rc;
-    *MCF5206E_UCR(MBAR,uart->chn) =
-        MCF5206E_UCR_TC_DISABLE |
-        MCF5206E_UCR_RC_DISABLE;
-    if (uart->intvec != 0)
-    {
-        *MCF5206E_IMR(MBAR) |=  MCF5206E_INTR_BIT(uart->chn == 1 ?
-                                                  MCF5206E_INTR_UART_1 :
-                                                  MCF5206E_INTR_UART_2);
-        rc = rtems_interrupt_catch(uart->old_handler, uart->intvec, NULL);
-        int_driven_uart[uart->chn - 1].uart = NULL;
-        int_driven_uart[uart->chn - 1].vec = 0;
-        if (rc != RTEMS_SUCCESSFUL)
-            return rc;
-    }
-    return RTEMS_SUCCESSFUL;
+  rtems_status_code rc;
+
+  *MCF5206E_UCR(MBAR,uart->chn) =
+      MCF5206E_UCR_TC_DISABLE |
+      MCF5206E_UCR_RC_DISABLE;
+  if (uart->intvec != 0) {
+      *MCF5206E_IMR(MBAR) |=  MCF5206E_INTR_BIT(uart->chn == 1 ?
+						MCF5206E_INTR_UART_1 :
+						MCF5206E_INTR_UART_2);
+      rc = rtems_interrupt_catch(uart->old_handler, uart->intvec, NULL);
+      int_driven_uart[uart->chn - 1].uart = NULL;
+      int_driven_uart[uart->chn - 1].vec = 0;
+      if (rc != RTEMS_SUCCESSFUL)
+	  return rc;
+  }
+  return RTEMS_SUCCESSFUL;
 }
 
 /*
@@ -238,93 +237,72 @@ mcfuart_disable(mcfuart *uart)
  * RETURNS:
  *     RTEMS_SUCCESSFUL
  */
-int
-mcfuart_set_attributes(mcfuart *uart, const struct termios *t)
+int mcfuart_set_attributes(mcfuart *uart, const struct termios *t)
 {
-    int level;
-    speed_t baud;
-    uint8_t   umr1, umr2;
-
-    baud = cfgetospeed(t);
-    umr1 = 0;
-    umr2 = MCF5206E_UMR2_CM_NORMAL;
-
-    /* Set flow control */
-    if ((t->c_cflag & CRTSCTS) != 0)
-    {
-        umr1 |= MCF5206E_UMR1_RXRTS;
-        umr2 |= MCF5206E_UMR2_TXCTS;
-    }
-
-    /* Set character size */
-    switch (t->c_cflag & CSIZE)
-    {
-        case CS5: umr1 |= MCF5206E_UMR1_BC_5; break;
-        case CS6: umr1 |= MCF5206E_UMR1_BC_6; break;
-        case CS7: umr1 |= MCF5206E_UMR1_BC_7; break;
-        case CS8: umr1 |= MCF5206E_UMR1_BC_8; break;
-    }
-
-    /* Set number of stop bits */
-    if ((t->c_cflag & CSTOPB) != 0)
-    {
-        if ((t->c_cflag & CSIZE) == CS5)
-        {
-            umr2 |= MCF5206E_UMR2_SB5_2;
-        }
-        else
-        {
-            umr2 |= MCF5206E_UMR2_SB_2;
-        }
-    }
-    else
-    {
-        if ((t->c_cflag & CSIZE) == CS5)
-        {
-            umr2 |= MCF5206E_UMR2_SB5_1;
-        }
-        else
-        {
-            umr2 |= MCF5206E_UMR2_SB_1;
-        }
+  int level;
+  speed_t baud;
+  uint8_t   umr1, umr2;
+
+  baud = cfgetospeed(t);
+  umr1 = 0;
+  umr2 = MCF5206E_UMR2_CM_NORMAL;
+
+  /* Set flow control */
+  if ((t->c_cflag & CRTSCTS) != 0) {
+    umr1 |= MCF5206E_UMR1_RXRTS;
+    umr2 |= MCF5206E_UMR2_TXCTS;
+  }
+
+  /* Set character size */
+  switch (t->c_cflag & CSIZE) {
+    case CS5: umr1 |= MCF5206E_UMR1_BC_5; break;
+    case CS6: umr1 |= MCF5206E_UMR1_BC_6; break;
+    case CS7: umr1 |= MCF5206E_UMR1_BC_7; break;
+    case CS8: umr1 |= MCF5206E_UMR1_BC_8; break;
+  }
+
+  /* Set number of stop bits */
+  if ((t->c_cflag & CSTOPB) != 0) {
+    if ((t->c_cflag & CSIZE) == CS5) {
+      umr2 |= MCF5206E_UMR2_SB5_2;
+    } else {
+      umr2 |= MCF5206E_UMR2_SB_2;
     }
-
-    /* Set parity mode */
-    if ((t->c_cflag & PARENB) != 0)
-    {
-        if ((t->c_cflag & PARODD) != 0)
-        {
-            umr1 |= MCF5206E_UMR1_PM_ODD;
-        }
-        else
-        {
-            umr1 |= MCF5206E_UMR1_PM_EVEN;
-        }
+  } else {
+    if ((t->c_cflag & CSIZE) == CS5) {
+      umr2 |= MCF5206E_UMR2_SB5_1;
+    } else {
+      umr2 |= MCF5206E_UMR2_SB_1;
     }
-    else
-    {
-        umr1 |= MCF5206E_UMR1_PM_NO_PARITY;
+  }
+
+  /* Set parity mode */
+  if ((t->c_cflag & PARENB) != 0) {
+    if ((t->c_cflag & PARODD) != 0) {
+      umr1 |= MCF5206E_UMR1_PM_ODD;
+    } else {
+      umr1 |= MCF5206E_UMR1_PM_EVEN;
     }
-
-    rtems_interrupt_disable(level);
+  } else {
+    umr1 |= MCF5206E_UMR1_PM_NO_PARITY;
+  }
+
+  rtems_interrupt_disable(level);
+  *MCF5206E_UCR(MBAR,uart->chn) =
+      MCF5206E_UCR_TC_DISABLE | MCF5206E_UCR_RC_DISABLE;
+  mcfuart_set_baudrate(uart, baud);
+  *MCF5206E_UCR(MBAR,uart->chn) = MCF5206E_UCR_MISC_RESET_MR;
+  *MCF5206E_UMR(MBAR,uart->chn) = umr1;
+  *MCF5206E_UMR(MBAR,uart->chn) = umr2;
+  if ((t->c_cflag & CREAD) != 0) {
     *MCF5206E_UCR(MBAR,uart->chn) =
-        MCF5206E_UCR_TC_DISABLE | MCF5206E_UCR_RC_DISABLE;
-    mcfuart_set_baudrate(uart, baud);
-    *MCF5206E_UCR(MBAR,uart->chn) = MCF5206E_UCR_MISC_RESET_MR;
-    *MCF5206E_UMR(MBAR,uart->chn) = umr1;
-    *MCF5206E_UMR(MBAR,uart->chn) = umr2;
-    if ((t->c_cflag & CREAD) != 0)
-    {
-        *MCF5206E_UCR(MBAR,uart->chn) =
-            MCF5206E_UCR_TC_ENABLE | MCF5206E_UCR_RC_ENABLE;
-    }
-    else
-    {
-        *MCF5206E_UCR(MBAR,uart->chn) = MCF5206E_UCR_TC_ENABLE;
-    }
-    rtems_interrupt_enable(level);
+	MCF5206E_UCR_TC_ENABLE | MCF5206E_UCR_RC_ENABLE;
+  } else {
+    *MCF5206E_UCR(MBAR,uart->chn) = MCF5206E_UCR_TC_ENABLE;
+  }
+  rtems_interrupt_enable(level);
 
-    return RTEMS_SUCCESSFUL;
+  return RTEMS_SUCCESSFUL;
 }
 
 /*
@@ -343,41 +321,33 @@ mcfuart_set_attributes(mcfuart *uart, const struct termios *t)
  * RETURNS:
  *     code of received character or -1 if no characters received.
  */
-int
-mcfuart_poll_read(mcfuart *uart)
+int mcfuart_poll_read(mcfuart *uart)
 {
-    uint8_t   usr;
-    int ch;
-    if (uart->parerr_mark_flag == true)
-    {
-        uart->parerr_mark_flag = false;
-        return 0;
-    }
-    usr = *MCF5206E_USR(MBAR,uart->chn);
-    if ((usr & MCF5206E_USR_RXRDY) != 0)
-    {
-        if (((usr & (MCF5206E_USR_FE | MCF5206E_USR_PE)) != 0) &&
-            !(uart->c_iflag & IGNPAR))
-        {
-            ch = *MCF5206E_URB(MBAR,uart->chn); /* Clear error bits */
-            if (uart->c_iflag & PARMRK)
-            {
-                uart->parerr_mark_flag = true;
-                ch = 0xff;
-            }
-            else
-            {
-                ch = 0;
-            }
-        }
-        else
-        {
-            ch = *MCF5206E_URB(MBAR,uart->chn);
-        }
+  uint8_t   usr;
+  int ch;
+
+  if (uart->parerr_mark_flag == true) {
+    uart->parerr_mark_flag = false;
+    return 0;
+  }
+
+  usr = *MCF5206E_USR(MBAR,uart->chn);
+  if ((usr & MCF5206E_USR_RXRDY) != 0) {
+    if (((usr & (MCF5206E_USR_FE | MCF5206E_USR_PE)) != 0) &&
+	!(uart->c_iflag & IGNPAR)) {
+      ch = *MCF5206E_URB(MBAR,uart->chn); /* Clear error bits */
+      if (uart->c_iflag & PARMRK) {
+	uart->parerr_mark_flag = true;
+	ch = 0xff;
+      } else {
+	ch = 0;
+      }
+    } else {
+      ch = *MCF5206E_URB(MBAR,uart->chn);
     }
-    else
-        ch = -1;
-    return ch;
+  } else
+    ch = -1;
+  return ch;
 }
 
 /*
@@ -392,17 +362,15 @@ mcfuart_poll_read(mcfuart *uart)
  * RETURNS:
  *     0
  */
-ssize_t
-mcfuart_poll_write(mcfuart *uart, const char *buf, size_t len)
+ssize_t mcfuart_poll_write(mcfuart *uart, const char *buf, size_t len)
 {
   size_t retval = len;
 
-    while (len--)
-    {
-        while ((*MCF5206E_USR(MBAR, uart->chn) & MCF5206E_USR_TXRDY) == 0);
-        *MCF5206E_UTB(MBAR, uart->chn) = *buf++;
-    }
-    return retval;
+  while (len--) {
+    while ((*MCF5206E_USR(MBAR, uart->chn) & MCF5206E_USR_TXRDY) == 0);
+    *MCF5206E_UTB(MBAR, uart->chn) = *buf++;
+  }
+  return retval;
 }
 
 /* mcfuart_interrupt_handler --
@@ -414,95 +382,78 @@ mcfuart_poll_write(mcfuart *uart, const char *buf, size_t len)
  * RETURNS:
  *     none
  */
-static rtems_isr
-mcfuart_interrupt_handler(rtems_vector_number vec)
+static rtems_isr mcfuart_interrupt_handler(rtems_vector_number vec)
 {
-    mcfuart *uart;
-    register uint8_t   usr;
-    register uint8_t   uisr;
-    register int chn;
-    register int bp = 0;
-
-    /* Find UART descriptor from vector number */
-    if (int_driven_uart[0].vec == vec)
-        uart = int_driven_uart[0].uart;
-    else if (int_driven_uart[1].vec == vec)
-        uart = int_driven_uart[1].uart;
-    else
-        return;
-
-    chn = uart->chn;
-
-    uisr = *MCF5206E_UISR(MBAR, chn);
-    if (uisr & MCF5206E_UISR_DB)
-    {
-        *MCF5206E_UCR(MBAR, chn) = MCF5206E_UCR_MISC_RESET_BRK;
+  mcfuart *uart;
+  register uint8_t   usr;
+  register uint8_t   uisr;
+  register int chn;
+  register int bp = 0;
+
+  /* Find UART descriptor from vector number */
+  if (int_driven_uart[0].vec == vec)
+    uart = int_driven_uart[0].uart;
+  else if (int_driven_uart[1].vec == vec)
+    uart = int_driven_uart[1].uart;
+  else
+    return;
+
+  chn = uart->chn;
+
+  uisr = *MCF5206E_UISR(MBAR, chn);
+  if (uisr & MCF5206E_UISR_DB) {
+    *MCF5206E_UCR(MBAR, chn) = MCF5206E_UCR_MISC_RESET_BRK;
+  }
+
+  /* Receiving */
+  while (1) {
+    char buf[32];
+    usr = *MCF5206E_USR(MBAR,chn);
+    if ((bp < sizeof(buf) - 1) && ((usr & MCF5206E_USR_RXRDY) != 0)) {
+      /* Receive character and handle frame/parity errors */
+      if (((usr & (MCF5206E_USR_FE | MCF5206E_USR_PE)) != 0) &&
+	  !(uart->c_iflag & IGNPAR)) {
+	  if (uart->c_iflag & PARMRK) {
+	    buf[bp++] = 0xff;
+	    buf[bp++] = 0x00;
+	  } else {
+	    buf[bp++] = 0x00;
+	  }
+      } else {
+	buf[bp++] = *MCF5206E_URB(MBAR, chn);
+      }
+
+      /* Reset error condition if any errors has been detected */
+      if (usr & (MCF5206E_USR_RB | MCF5206E_USR_FE |
+		 MCF5206E_USR_PE | MCF5206E_USR_OE)) {
+	*MCF5206E_UCR(MBAR, chn) = MCF5206E_UCR_MISC_RESET_ERR;
+      }
+    } else {
+      if (bp != 0)
+	rtems_termios_enqueue_raw_characters(uart->tty, buf, bp);
+      break;
     }
-
-    /* Receiving */
-    while (1)
-    {
-        char buf[32];
-        usr = *MCF5206E_USR(MBAR,chn);
-        if ((bp < sizeof(buf) - 1) && ((usr & MCF5206E_USR_RXRDY) != 0))
-        {
-            /* Receive character and handle frame/parity errors */
-            if (((usr & (MCF5206E_USR_FE | MCF5206E_USR_PE)) != 0) &&
-                !(uart->c_iflag & IGNPAR))
-            {
-                if (uart->c_iflag & PARMRK)
-                {
-                    buf[bp++] = 0xff;
-                    buf[bp++] = 0x00;
-                }
-                else
-                {
-                    buf[bp++] = 0x00;
-                }
-            }
-            else
-            {
-                buf[bp++] = *MCF5206E_URB(MBAR, chn);
-            }
-
-            /* Reset error condition if any errors has been detected */
-            if (usr & (MCF5206E_USR_RB | MCF5206E_USR_FE |
-                       MCF5206E_USR_PE | MCF5206E_USR_OE))
-            {
-                *MCF5206E_UCR(MBAR, chn) = MCF5206E_UCR_MISC_RESET_ERR;
-            }
-        }
-        else
-        {
-            if (bp != 0)
-                rtems_termios_enqueue_raw_characters(uart->tty, buf, bp);
-            break;
-        }
-    }
-
-    /* Transmitting */
-    while (1)
-    {
-        if ((*MCF5206E_USR(MBAR, chn) & MCF5206E_USR_TXRDY) == 0)
-            break;
-        if (uart->tx_buf != NULL)
-        {
-            if (uart->tx_ptr >= uart->tx_buf_len)
-            {
-                register int dequeue = uart->tx_buf_len;
-                *MCF5206E_UIMR(MBAR, uart->chn) = MCF5206E_UIMR_FFULL;
-                uart->tx_buf = NULL;
-                uart->tx_ptr = uart->tx_buf_len = 0;
-                rtems_termios_dequeue_characters(uart->tty, dequeue);
-            }
-            else
-            {
-                *MCF5206E_UTB(MBAR, chn) = uart->tx_buf[uart->tx_ptr++];
-            }
-        }
-        else
-            break;
+  }
+
+  /* Transmitting */
+  while (1) {
+    if ((*MCF5206E_USR(MBAR, chn) & MCF5206E_USR_TXRDY) == 0)
+      break;
+    if (uart->tx_buf != NULL) {
+      if (uart->tx_ptr >= uart->tx_buf_len) {
+	register int dequeue = uart->tx_buf_len;
+
+	*MCF5206E_UIMR(MBAR, uart->chn) = MCF5206E_UIMR_FFULL;
+	uart->tx_buf = NULL;
+	uart->tx_ptr = uart->tx_buf_len = 0;
+	rtems_termios_dequeue_characters(uart->tty, dequeue);
+      } else {
+	*MCF5206E_UTB(MBAR, chn) = uart->tx_buf[uart->tx_ptr++];
+      }
     }
+    else
+      break;
+  }
 }
 
 /* mcfuart_interrupt_write --
@@ -516,24 +467,25 @@ mcfuart_interrupt_handler(rtems_vector_number vec)
  * RETURNS:
  *     0
  */
-ssize_t
-mcfuart_interrupt_write(mcfuart *uart, const char *buf, size_t len)
+ssize_t mcfuart_interrupt_write(
+  mcfuart *uart,
+  const char *buf,
+  size_t len
+)
 {
-    if (len > 0)
-    {
-        uart->tx_buf = buf;
-        uart->tx_buf_len = len;
-        uart->tx_ptr = 0;
-        *MCF5206E_UIMR(MBAR, uart->chn) =
-                MCF5206E_UIMR_FFULL | MCF5206E_UIMR_TXRDY;
-        while (((*MCF5206E_USR(MBAR,uart->chn) & MCF5206E_USR_TXRDY) != 0) &&
-               (uart->tx_ptr < uart->tx_buf_len))
-        {
-            *MCF5206E_UTB(MBAR,uart->chn) = uart->tx_buf[uart->tx_ptr++];
-        }
+  if (len > 0) {
+    uart->tx_buf = buf;
+    uart->tx_buf_len = len;
+    uart->tx_ptr = 0;
+    *MCF5206E_UIMR(MBAR, uart->chn) =
+	    MCF5206E_UIMR_FFULL | MCF5206E_UIMR_TXRDY;
+    while (((*MCF5206E_USR(MBAR,uart->chn) & MCF5206E_USR_TXRDY) != 0) &&
+	   (uart->tx_ptr < uart->tx_buf_len)) {
+	*MCF5206E_UTB(MBAR,uart->chn) = uart->tx_buf[uart->tx_ptr++];
     }
+  }
 
-    return 0;
+  return 0;
 }
 
 /* mcfuart_stop_remote_tx --
@@ -545,11 +497,10 @@ mcfuart_interrupt_write(mcfuart *uart, const char *buf, size_t len)
  * RETURNS:
  *     RTEMS_SUCCESSFUL
  */
-int
-mcfuart_stop_remote_tx(mcfuart *uart)
+int mcfuart_stop_remote_tx(mcfuart *uart)
 {
-    *MCF5206E_UOP0(MBAR, uart->chn) = 1;
-    return RTEMS_SUCCESSFUL;
+  *MCF5206E_UOP0(MBAR, uart->chn) = 1;
+  return RTEMS_SUCCESSFUL;
 }
 
 /* mcfuart_start_remote_tx --
@@ -561,9 +512,8 @@ mcfuart_stop_remote_tx(mcfuart *uart)
  * RETURNS:
  *     RTEMS_SUCCESSFUL
  */
-int
-mcfuart_start_remote_tx(mcfuart *uart)
+int mcfuart_start_remote_tx(mcfuart *uart)
 {
-    *MCF5206E_UOP1(MBAR, uart->chn) = 1;
-    return RTEMS_SUCCESSFUL;
+  *MCF5206E_UOP1(MBAR, uart->chn) = 1;
+  return RTEMS_SUCCESSFUL;
 }
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
index 9c6a5be62d..f70a70e483 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
+++ b/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
@@ -36,7 +36,7 @@ typedef struct mcfmbus {
     rtems_isr_entry        oldisr; /* Old interrupt handler */
     rtems_id               sema; /* MBUS semaphore */
     i2c_transfer_done      done; /* Transfer done function */
-    uint32_t       done_arg_ptr; /* Done function argument ptr */
+    uintptr_t      done_arg_ptr; /* Done function argument ptr */
 } mcfmbus;
 
 /* mcfmbus_initialize --
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
index e919efa082..bd9df5bb56 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
+++ b/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
@@ -34,7 +34,7 @@ typedef struct mcfuart {
                                                 0 if polled I/O */
    void               *tty;              /* termios channel descriptor */
 
-   volatile const uint8_t  *tx_buf;      /* Transmit buffer from termios */
+   volatile const char     *tx_buf;      /* Transmit buffer from termios */
    volatile uint32_t        tx_buf_len;  /* Transmit buffer length */
    volatile uint32_t        tx_ptr;      /* Index of next char to transmit*/
    rtems_isr_entry          old_handler; /* Saved interrupt handler */
diff --git a/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c b/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
index 1df8d95f5d..d9e70089f2 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
+++ b/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
@@ -1,6 +1,8 @@
 /*
  *  MCF5206e MBUS module (I2C bus) driver
- *
+ */
+
+/*
  *  Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia
  *  Author: Victor V. Vengerov <vvv@oktet.ru>
  *
@@ -15,15 +17,15 @@
 
 /* Events of I2C machine */
 typedef enum i2c_event {
-    EVENT_NONE,      /* Spurious event */
-    EVENT_TRANSFER,  /* Start new transfer */
-    EVENT_NEXTMSG,   /* Start processing of next message in transfer */
-    EVENT_ACK,       /* Sending finished with ACK */
-    EVENT_NACK,      /* Sending finished with NACK */
-    EVENT_TIMEOUT,   /* Timeout occured */
-    EVENT_DATA_RECV, /* Data received */
-    EVENT_ARB_LOST,  /* Arbitration lost */
-    EVENT_SLAVE      /* Addressed as a slave */
+  EVENT_NONE,      /* Spurious event */
+  EVENT_TRANSFER,  /* Start new transfer */
+  EVENT_NEXTMSG,   /* Start processing of next message in transfer */
+  EVENT_ACK,       /* Sending finished with ACK */
+  EVENT_NACK,      /* Sending finished with NACK */
+  EVENT_TIMEOUT,   /* Timeout occured */
+  EVENT_DATA_RECV, /* Data received */
+  EVENT_ARB_LOST,  /* Arbitration lost */
+  EVENT_SLAVE      /* Addressed as a slave */
 } i2c_event;
 
 static mcfmbus *mbus;
@@ -109,52 +111,42 @@ static mcfmbus *mbus;
 static i2c_event
 mcfmbus_get_event(mcfmbus *bus)
 {
-    i2c_event event;
-    uint8_t   status, control;
-    rtems_interrupt_level level;
-    rtems_interrupt_disable(level);
-    status = *MCF5206E_MBSR(bus->base);
-    control = *MCF5206E_MBCR(bus->base);
-    if (status & MCF5206E_MBSR_MIF) /* Interrupt occured */
-    {
-        if (status & MCF5206E_MBSR_MAAS)
-        {
-            event = EVENT_SLAVE;
-            *MCF5206E_MBCR(bus->base) = control; /* To clear Addressed As Slave
-                                                    condition */
-        }
-        else if (status & MCF5206E_MBSR_MAL) /* Arbitration lost */
-        {
-            *MCF5206E_MBSR(bus->base) = status & ~MCF5206E_MBSR_MAL;
-            event = EVENT_ARB_LOST;
-        }
-        else if (control & MCF5206E_MBCR_MTX) /* Trasmit mode */
-        {
-            if (status & MCF5206E_MBSR_RXAK)
-                event = EVENT_NACK;
-            else
-                event = EVENT_ACK;
-        }
-        else /* Received */
-        {
-            event = EVENT_DATA_RECV;
-        }
-
-        /* Clear interrupt condition */
-        *MCF5206E_MBSR(bus->base) &= ~MCF5206E_MBSR_MIF;
+  i2c_event event;
+  uint8_t   status, control;
+  rtems_interrupt_level level;
+  rtems_interrupt_disable(level);
+  status = *MCF5206E_MBSR(bus->base);
+  control = *MCF5206E_MBCR(bus->base);
+
+  if (status & MCF5206E_MBSR_MIF) { /* Interrupt occured */
+    if (status & MCF5206E_MBSR_MAAS) {
+      event = EVENT_SLAVE;
+      *MCF5206E_MBCR(bus->base) = control; /* To clear Addressed As Slave
+                                              condition */
+    } else if (status & MCF5206E_MBSR_MAL) { /* Arbitration lost */
+      *MCF5206E_MBSR(bus->base) = status & ~MCF5206E_MBSR_MAL;
+      event = EVENT_ARB_LOST;
     }
-    else
-    {
-        event = EVENT_NONE;
+    else if (control & MCF5206E_MBCR_MTX) { /* Trasmit mode */
+      if (status & MCF5206E_MBSR_RXAK)
+        event = EVENT_NACK;
+      else
+        event = EVENT_ACK;
+    } else { /* Received */
+      event = EVENT_DATA_RECV;
     }
-    rtems_interrupt_enable(level);
-    return event;
+
+    /* Clear interrupt condition */
+    *MCF5206E_MBSR(bus->base) &= ~MCF5206E_MBSR_MIF;
+  } else {
+    event = EVENT_NONE;
+  }
+  rtems_interrupt_enable(level);
+  return event;
 }
 
-static void
-mcfmbus_machine_error(mcfmbus *bus, i2c_event event)
+static void mcfmbus_machine_error(mcfmbus *bus, i2c_event event)
 {
-    return;
 }
 
 /* mcfmbus_machine --
@@ -167,445 +159,407 @@ mcfmbus_machine_error(mcfmbus *bus, i2c_event event)
  * RETURNS:
  *     none
  */
-static void
-mcfmbus_machine(mcfmbus *bus, i2c_event event)
+static void mcfmbus_machine(mcfmbus *bus, i2c_event event)
 {
-    uint8_t   b;
-    switch (bus->state)
-    {
-        case STATE_IDLE:
-            switch (event)
-            {
-                case EVENT_NEXTMSG:  /* Start new message processing */
-                    bus->cmsg++;
-                    /* FALLTHRU */
-
-                case EVENT_TRANSFER: /* Initiate new transfer */
-                    if (bus->cmsg - bus->msg >= bus->nmsg)
-                    {
-                        mcfmbus_stop(bus);
-                        next_state(bus, STATE_IDLE);
-                        bus->msg = bus->cmsg = NULL;
-                        bus->nmsg = bus->byte = 0;
-                        bus->done(bus->done_arg_ptr);
-                        break;
-                    }
-
-                    /* Initiate START or REPEATED START condition on the bus */
-                    if (event == EVENT_TRANSFER)
-                    {
-                        mcfmbus_start(bus);
-                    }
-                    else /* (event == EVENT_NEXTMSG) */
-                    {
-                        mcfmbus_rstart(bus);
-                    }
-
-                    bus->byte = 0;
-                    mcfmbus_tx_mode(bus);
-
-                    /* Initiate slave address sending */
-                    if (bus->cmsg->flags & I2C_MSG_ADDR_10)
-                    {
-                        i2c_address a = bus->cmsg->addr;
-                        b = 0xf0 | (((a >> 8) & 0x03) << 1);
-                        if (bus->cmsg->flags & I2C_MSG_WR)
-                        {
-                            mcfmbus_send(bus, b);
-                            next_state(bus, STATE_ADDR_1_W);
-                        }
-                        else
-                        {
-                            mcfmbus_send(bus, b | 1);
-                            next_state(bus, STATE_ADDR_1_R);
-                        }
-                    }
-                    else
-                    {
-                        b = (bus->cmsg->addr & ~0x01);
-
-                        if (bus->cmsg->flags & I2C_MSG_WR)
-                        {
-                            next_state(bus, STATE_SENDING);
-                        }
-                        else
-                        {
-                            next_state(bus, STATE_ADDR_7);
-                            b |= 1;
-                        }
-
-                        mcfmbus_send(bus, b);
-                    }
-                    break;
-
-                default:
-                    mcfmbus_machine_error(bus, event);
-                    break;
-            }
+  uint8_t   b;
+
+  switch (bus->state) {
+    case STATE_IDLE:
+      switch (event) {
+        case EVENT_NEXTMSG:  /* Start new message processing */
+          bus->cmsg++;
+          /* FALLTHRU */
+
+        case EVENT_TRANSFER: /* Initiate new transfer */
+          if (bus->cmsg - bus->msg >= bus->nmsg) {
+            mcfmbus_stop(bus);
+            next_state(bus, STATE_IDLE);
+            bus->msg = bus->cmsg = NULL;
+            bus->nmsg = bus->byte = 0;
+            bus->done((void *)bus->done_arg_ptr);
             break;
-
-        case STATE_ADDR_7:
-            switch (event)
-            {
-                case EVENT_ACK:
-                    mcfmbus_rx_mode(bus);
-                    if (bus->cmsg->len <= 1)
-                        mcfmbus_send_nack(bus);
-                    else
-                        mcfmbus_send_ack(bus);
-                    next_state(bus, STATE_RECEIVING);
-                    break;
-
-                case EVENT_NACK:
-                    mcfmbus_error(bus, I2C_NO_DEVICE);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                case EVENT_ARB_LOST:
-                    mcfmbus_error(bus, I2C_ARBITRATION_LOST);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                default:
-                    mcfmbus_machine_error(bus, event);
-                    break;
+          }
+
+          /* Initiate START or REPEATED START condition on the bus */
+          if (event == EVENT_TRANSFER) {
+            mcfmbus_start(bus);
+          } else { /* (event == EVENT_NEXTMSG) */
+            mcfmbus_rstart(bus);
+          }
+
+          bus->byte = 0;
+          mcfmbus_tx_mode(bus);
+
+          /* Initiate slave address sending */
+          if (bus->cmsg->flags & I2C_MSG_ADDR_10) {
+            i2c_address a = bus->cmsg->addr;
+            b = 0xf0 | (((a >> 8) & 0x03) << 1);
+            if (bus->cmsg->flags & I2C_MSG_WR) {
+              mcfmbus_send(bus, b);
+              next_state(bus, STATE_ADDR_1_W);
+            } else {
+              mcfmbus_send(bus, b | 1);
+              next_state(bus, STATE_ADDR_1_R);
             }
-            break;
-
-        case STATE_ADDR_1_R:
-        case STATE_ADDR_1_W:
-            switch (event)
-            {
-                case EVENT_ACK:
-                {
-                    uint8_t   b = (bus->cmsg->addr & 0xff);
-                    mcfmbus_send(bus, b);
-                    if (bus->state == STATE_ADDR_1_W)
-                    {
-                        next_state(bus, STATE_SENDING);
-                    }
-                    else
-                    {
-                        i2c_address a;
-                        mcfmbus_rstart(bus);
-                        mcfmbus_tx_mode(bus);
-                        a = bus->cmsg->addr;
-                        b = 0xf0 | (((a >> 8) & 0x03) << 1) | 1;
-                        mcfmbus_send(bus, b);
-                        next_state(bus, STATE_ADDR_7);
-                    }
-                    break;
-                }
-
-                case EVENT_NACK:
-                    mcfmbus_error(bus, I2C_NO_DEVICE);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                case EVENT_ARB_LOST:
-                    mcfmbus_error(bus, I2C_ARBITRATION_LOST);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                default:
-                    mcfmbus_machine_error(bus, event);
-                    break;
+          } else {
+            b = (bus->cmsg->addr & ~0x01);
+
+            if (bus->cmsg->flags & I2C_MSG_WR) {
+              next_state(bus, STATE_SENDING);
+            } else {
+              next_state(bus, STATE_ADDR_7);
+              b |= 1;
             }
-            break;
 
-        case STATE_SENDING:
-            switch (event)
-            {
-                case EVENT_ACK:
-                    if (bus->byte == bus->cmsg->len)
-                    {
-                        next_state(bus, STATE_IDLE);
-                        mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    }
-                    else
-                    {
-                        mcfmbus_send(bus, bus->cmsg->buf[bus->byte++]);
-                        next_state(bus, STATE_SENDING);
-                    }
-                    break;
-
-                case EVENT_NACK:
-                    if (bus->byte == 0)
-                    {
-                        mcfmbus_error(bus, I2C_NO_DEVICE);
-                    }
-                    else
-                    {
-                        mcfmbus_error(bus, I2C_NO_ACKNOWLEDGE);
-                    }
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                case EVENT_ARB_LOST:
-                    mcfmbus_error(bus, I2C_ARBITRATION_LOST);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                default:
-                    mcfmbus_machine_error(bus, event);
-                    break;
+            mcfmbus_send(bus, b);
+          }
+          break;
 
-            }
+        default:
+          mcfmbus_machine_error(bus, event);
             break;
+      }
+      break;
+
+    case STATE_ADDR_7:
+      switch (event) {
+        case EVENT_ACK:
+          mcfmbus_rx_mode(bus);
+          if (bus->cmsg->len <= 1)
+            mcfmbus_send_nack(bus);
+          else
+            mcfmbus_send_ack(bus);
+          next_state(bus, STATE_RECEIVING);
+          break;
+
+        case EVENT_NACK:
+          mcfmbus_error(bus, I2C_NO_DEVICE);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        case EVENT_ARB_LOST:
+          mcfmbus_error(bus, I2C_ARBITRATION_LOST);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        default:
+          mcfmbus_machine_error(bus, event);
+          break;
+      }
+      break;
+
+    case STATE_ADDR_1_R:
+    case STATE_ADDR_1_W:
+      switch (event) {
+        case EVENT_ACK: {
+          uint8_t   b = (bus->cmsg->addr & 0xff);
+          mcfmbus_send(bus, b);
+          if (bus->state == STATE_ADDR_1_W) {
+              next_state(bus, STATE_SENDING);
+          } else {
+              i2c_address a;
+              mcfmbus_rstart(bus);
+              mcfmbus_tx_mode(bus);
+              a = bus->cmsg->addr;
+              b = 0xf0 | (((a >> 8) & 0x03) << 1) | 1;
+              mcfmbus_send(bus, b);
+              next_state(bus, STATE_ADDR_7);
+          }
+          break;
+        }
 
-        case STATE_RECEIVING:
-            switch (event)
-            {
-                case EVENT_DATA_RECV:
-                    if (bus->cmsg->len - bus->byte <= 2)
-                    {
-                        mcfmbus_send_nack(bus);
-                        if (bus->cmsg->len - bus->byte <= 1)
-                        {
-                            if (bus->cmsg - bus->msg + 1 == bus->nmsg)
-                                mcfmbus_stop(bus);
-                            else
-                                mcfmbus_rstart(bus);
-                        }
-                    }
-                    else
-                    {
-                        mcfmbus_send_ack(bus);
-                    }
-                    bus->cmsg->buf[bus->byte++] = *MCF5206E_MBDR(bus->base);
-                    if (bus->cmsg->len == bus->byte)
-                    {
-                        next_state(bus,STATE_IDLE);
-                        mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    }
-                    else
-                    {
-                        next_state(bus,STATE_RECEIVING);
-                    }
-                    break;
-
-                case EVENT_ARB_LOST:
-                    mcfmbus_error(bus, I2C_ARBITRATION_LOST);
-                    next_state(bus, STATE_IDLE);
-                    mcfmbus_machine(bus, EVENT_NEXTMSG);
-                    break;
-
-                default:
-                    mcfmbus_machine_error(bus, event);
-                    break;
-            }
-            break;
+        case EVENT_NACK:
+          mcfmbus_error(bus, I2C_NO_DEVICE);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        case EVENT_ARB_LOST:
+          mcfmbus_error(bus, I2C_ARBITRATION_LOST);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        default:
+          mcfmbus_machine_error(bus, event);
+          break;
     }
+      break;
+
+    case STATE_SENDING:
+      switch (event) {
+        case EVENT_ACK:
+          if (bus->byte == bus->cmsg->len) {
+            next_state(bus, STATE_IDLE);
+            mcfmbus_machine(bus, EVENT_NEXTMSG);
+          } else {
+            mcfmbus_send(bus, bus->cmsg->buf[bus->byte++]);
+            next_state(bus, STATE_SENDING);
+          }
+          break;
+
+        case EVENT_NACK:
+          if (bus->byte == 0) {
+            mcfmbus_error(bus, I2C_NO_DEVICE);
+          } else {
+            mcfmbus_error(bus, I2C_NO_ACKNOWLEDGE);
+          }
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        case EVENT_ARB_LOST:
+          mcfmbus_error(bus, I2C_ARBITRATION_LOST);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        default:
+          mcfmbus_machine_error(bus, event);
+          break;
+      }
+      break;
+
+    case STATE_RECEIVING:
+      switch (event) {
+        case EVENT_DATA_RECV:
+          if (bus->cmsg->len - bus->byte <= 2) {
+            mcfmbus_send_nack(bus);
+            if (bus->cmsg->len - bus->byte <= 1) {
+                if (bus->cmsg - bus->msg + 1 == bus->nmsg)
+                  mcfmbus_stop(bus);
+                else
+                  mcfmbus_rstart(bus);
+            }
+          } else {
+            mcfmbus_send_ack(bus);
+          }
+          bus->cmsg->buf[bus->byte++] = *MCF5206E_MBDR(bus->base);
+          if (bus->cmsg->len == bus->byte) {
+            next_state(bus,STATE_IDLE);
+            mcfmbus_machine(bus, EVENT_NEXTMSG);
+          } else {
+            next_state(bus,STATE_RECEIVING);
+          }
+          break;
+
+        case EVENT_ARB_LOST:
+          mcfmbus_error(bus, I2C_ARBITRATION_LOST);
+          next_state(bus, STATE_IDLE);
+          mcfmbus_machine(bus, EVENT_NEXTMSG);
+          break;
+
+        default:
+          mcfmbus_machine_error(bus, event);
+          break;
+      }
+      break;
+  }
 }
 
 /* mcfmbus_interrupt_handler --
- *     MBUS module interrupt handler routine
- *
- * PARAMETERS:
- *     vector - interrupt vector number (not used)
- *
- * RETURNS:
- *     none
- */
-rtems_isr
-mcfmbus_interrupt_handler(rtems_vector_number vector)
+*     MBUS module interrupt handler routine
+*
+* PARAMETERS:
+*     vector - interrupt vector number (not used)
+*
+* RETURNS:
+*     none
+*/
+static rtems_isr mcfmbus_interrupt_handler(rtems_vector_number vector)
 {
-    i2c_event event;
-    event = mcfmbus_get_event(mbus);
-    mcfmbus_machine(mbus, event);
+  i2c_event event;
+  event = mcfmbus_get_event(mbus);
+  mcfmbus_machine(mbus, event);
 }
 
 /* mcfmbus_poll --
- *     MBUS module poll routine; used to poll events when I2C driver
- *     operates in poll-driven mode.
- *
- * PARAMETERS:
- *     none
- *
- * RETURNS:
- *     none
- */
+*     MBUS module poll routine; used to poll events when I2C driver
+*     operates in poll-driven mode.
+*
+* PARAMETERS:
+*     none
+*
+* RETURNS:
+*     none
+*/
 void
 mcfmbus_poll(mcfmbus *bus)
 {
-    i2c_event event;
-    event = mcfmbus_get_event(bus);
-    if (event != EVENT_NONE)
-        mcfmbus_machine(bus, event);
+  i2c_event event;
+  event = mcfmbus_get_event(bus);
+  if (event != EVENT_NONE)
+      mcfmbus_machine(bus, event);
 }
 
 /* mcfmbus_select_clock_divider --
- *     Select divider for system clock which is used for I2C bus clock
- *     generation. Not each divider can be selected for I2C bus; this
- *     function select nearest larger or equal divider.
- *
- * PARAMETERS:
- *     i2c_bus - pointer to the bus descriptor structure
- *     divider - system frequency divider for I2C serial clock.
- * RETURNS:
- *     RTEMS_SUCCESSFUL, if operation performed successfully, or
- *     RTEMS error code when failed.
- */
+*     Select divider for system clock which is used for I2C bus clock
+*     generation. Not each divider can be selected for I2C bus; this
+*     function select nearest larger or equal divider.
+*
+* PARAMETERS:
+*     i2c_bus - pointer to the bus descriptor structure
+*     divider - system frequency divider for I2C serial clock.
+* RETURNS:
+*     RTEMS_SUCCESSFUL, if operation performed successfully, or
+*     RTEMS error code when failed.
+*/
 rtems_status_code
 mcfmbus_select_clock_divider(mcfmbus *i2c_bus, int divider)
 {
-    int i;
-    int mbc;
-    struct {
-        int divider;
-        int mbc;
-    } dividers[] ={
-        { 20,   0x20 }, { 22,   0x21 }, { 24,   0x22 }, { 26,   0x23 },
-        { 28,   0x00 }, { 30,   0x01 }, { 32,   0x25 }, { 34,   0x02 },
-        { 36,   0x26 }, { 40,   0x03 }, { 44,   0x04 }, { 48,   0x05 },
-        { 56,   0x06 }, { 64,   0x2a }, { 68,   0x07 }, { 72,   0x2B },
-        { 80,   0x08 }, { 88,   0x09 }, { 96,   0x2D }, { 104,  0x0A },
-        { 112,  0x2E }, { 128,  0x0B }, { 144,  0x0C }, { 160,  0x0D },
-        { 192,  0x0E }, { 224,  0x32 }, { 240,  0x0F }, { 256,  0x33 },
-        { 288,  0x10 }, { 320,  0x11 }, { 384,  0x12 }, { 448,  0x36 },
-        { 480,  0x13 }, { 512,  0x37 }, { 576,  0x14 }, { 640,  0x15 },
-        { 768,  0x16 }, { 896,  0x3A }, { 960,  0x17 }, { 1024, 0x3B },
-        { 1152, 0x18 }, { 1280, 0x19 }, { 1536, 0x1A }, { 1792, 0x3E },
-        { 1920, 0x1B }, { 2048, 0x3F }, { 2304, 0x1C }, { 2560, 0x1D },
-        { 3072, 0x1E }, { 3840, 0x1F }
-    };
-
-    if (i2c_bus == NULL)
-        return RTEMS_INVALID_ADDRESS;
-
-    for (i = 0, mbc = -1; i < sizeof(dividers)/sizeof(dividers[0]); i++)
-    {
-        mbc = dividers[i].mbc;
-        if (dividers[i].divider >= divider)
-        {
-            break;
-        }
+  int i;
+  int mbc;
+  struct {
+      int divider;
+      int mbc;
+  } dividers[] ={
+      { 20,   0x20 }, { 22,   0x21 }, { 24,   0x22 }, { 26,   0x23 },
+      { 28,   0x00 }, { 30,   0x01 }, { 32,   0x25 }, { 34,   0x02 },
+      { 36,   0x26 }, { 40,   0x03 }, { 44,   0x04 }, { 48,   0x05 },
+      { 56,   0x06 }, { 64,   0x2a }, { 68,   0x07 }, { 72,   0x2B },
+      { 80,   0x08 }, { 88,   0x09 }, { 96,   0x2D }, { 104,  0x0A },
+      { 112,  0x2E }, { 128,  0x0B }, { 144,  0x0C }, { 160,  0x0D },
+      { 192,  0x0E }, { 224,  0x32 }, { 240,  0x0F }, { 256,  0x33 },
+      { 288,  0x10 }, { 320,  0x11 }, { 384,  0x12 }, { 448,  0x36 },
+      { 480,  0x13 }, { 512,  0x37 }, { 576,  0x14 }, { 640,  0x15 },
+      { 768,  0x16 }, { 896,  0x3A }, { 960,  0x17 }, { 1024, 0x3B },
+      { 1152, 0x18 }, { 1280, 0x19 }, { 1536, 0x1A }, { 1792, 0x3E },
+      { 1920, 0x1B }, { 2048, 0x3F }, { 2304, 0x1C }, { 2560, 0x1D },
+      { 3072, 0x1E }, { 3840, 0x1F }
+  };
+
+  if (i2c_bus == NULL)
+    return RTEMS_INVALID_ADDRESS;
+
+  for (i = 0, mbc = -1; i < sizeof(dividers)/sizeof(dividers[0]); i++) {
+    mbc = dividers[i].mbc;
+    if (dividers[i].divider >= divider) {
+      break;
     }
-    *MCF5206E_MFDR(i2c_bus->base) = mbc;
-    return RTEMS_SUCCESSFUL;
+  }
+  *MCF5206E_MFDR(i2c_bus->base) = mbc;
+  return RTEMS_SUCCESSFUL;
 }
 
 /* mcfmbus_initialize --
- *     Initialize ColdFire MBUS I2C bus controller.
- *
- * PARAMETERS:
- *     i2c_bus - pointer to the bus descriptor structure
- *     base    - ColdFire internal peripherial base address
- *
- * RETURNS:
- *     RTEMS_SUCCESSFUL, or RTEMS error code when initialization failed.
- */
-rtems_status_code
-mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t   base)
+*     Initialize ColdFire MBUS I2C bus controller.
+*
+* PARAMETERS:
+*     i2c_bus - pointer to the bus descriptor structure
+*     base    - ColdFire internal peripherial base address
+*
+* RETURNS:
+*     RTEMS_SUCCESSFUL, or RTEMS error code when initialization failed.
+*/
+rtems_status_code mcfmbus_initialize(mcfmbus *i2c_bus, uint32_t   base)
 {
-    rtems_interrupt_level level;
-    rtems_status_code sc;
-
-    if (mbus != NULL) /* Check if already initialized */
-        return RTEMS_RESOURCE_IN_USE;
-
-    if (i2c_bus == NULL)
-        return RTEMS_INVALID_ADDRESS;
-
-
-    i2c_bus->base = base;
-    i2c_bus->state = STATE_IDLE;
-    i2c_bus->msg = NULL;
-    i2c_bus->cmsg = NULL;
-    i2c_bus->nmsg = 0;
-    i2c_bus->byte = 0;
-
-    sc = rtems_interrupt_catch(
-        mcfmbus_interrupt_handler,
-        24 + ((*MCF5206E_ICR(base, MCF5206E_INTR_MBUS) & MCF5206E_ICR_IL) >>
-                                   MCF5206E_ICR_IL_S),
-        &i2c_bus->oldisr
-    );
-    if (sc != RTEMS_SUCCESSFUL)
-        return sc;
-
-    mbus = i2c_bus;
-    rtems_interrupt_disable(level);
-    *MCF5206E_IMR(base) &= ~MCF5206E_INTR_BIT(MCF5206E_INTR_MBUS);
-    *MCF5206E_MBCR(base) = 0;
-    *MCF5206E_MBSR(base) = 0;
-    *MCF5206E_MBDR(base) = 0x1F; /* Maximum possible divider is 3840 */
-    *MCF5206E_MBCR(base) = MCF5206E_MBCR_MEN | MCF5206E_MBCR_MIEN;
-    rtems_interrupt_enable(level);
-
-    return RTEMS_SUCCESSFUL;
+  rtems_interrupt_level level;
+  rtems_status_code sc;
+
+  if (mbus != NULL) /* Check if already initialized */
+    return RTEMS_RESOURCE_IN_USE;
+
+  if (i2c_bus == NULL)
+    return RTEMS_INVALID_ADDRESS;
+
+
+  i2c_bus->base = base;
+  i2c_bus->state = STATE_IDLE;
+  i2c_bus->msg = NULL;
+  i2c_bus->cmsg = NULL;
+  i2c_bus->nmsg = 0;
+  i2c_bus->byte = 0;
+
+  sc = rtems_interrupt_catch(
+      mcfmbus_interrupt_handler,
+      24 + ((*MCF5206E_ICR(base, MCF5206E_INTR_MBUS) & MCF5206E_ICR_IL) >>
+                                 MCF5206E_ICR_IL_S),
+      &i2c_bus->oldisr
+  );
+  if (sc != RTEMS_SUCCESSFUL)
+    return sc;
+
+  mbus = i2c_bus;
+  rtems_interrupt_disable(level);
+  *MCF5206E_IMR(base) &= ~MCF5206E_INTR_BIT(MCF5206E_INTR_MBUS);
+  *MCF5206E_MBCR(base) = 0;
+  *MCF5206E_MBSR(base) = 0;
+  *MCF5206E_MBDR(base) = 0x1F; /* Maximum possible divider is 3840 */
+  *MCF5206E_MBCR(base) = MCF5206E_MBCR_MEN | MCF5206E_MBCR_MIEN;
+  rtems_interrupt_enable(level);
+
+  return RTEMS_SUCCESSFUL;
 }
 
 /* mcfmbus_i2c_transfer --
- *     Initiate multiple-messages transfer over I2C bus via ColdFire MBUS
- *     controller.
- *
- * PARAMETERS:
- *     bus - pointer to MBUS controller descriptor
- *     nmsg - number of messages
- *     msg - pointer to messages array
- *     done - function which is called when transfer is finished
- *     done_arg_ptr - arbitrary argument ptr passed to done funciton
- *
- * RETURNS:
- *     RTEMS_SUCCESSFUL if transfer initiated successfully, or error
- *     code when failed.
- */
-rtems_status_code
-mcfmbus_i2c_transfer(mcfmbus *bus, int nmsg, i2c_message *msg,
-                     i2c_transfer_done done, void *done_arg_ptr)
+*     Initiate multiple-messages transfer over I2C bus via ColdFire MBUS
+*     controller.
+*
+* PARAMETERS:
+*     bus - pointer to MBUS controller descriptor
+*     nmsg - number of messages
+*     msg - pointer to messages array
+*     done - function which is called when transfer is finished
+*     done_arg_ptr - arbitrary argument ptr passed to done funciton
+*
+* RETURNS:
+*     RTEMS_SUCCESSFUL if transfer initiated successfully, or error
+*     code when failed.
+*/
+rtems_status_code mcfmbus_i2c_transfer(
+  mcfmbus *bus,
+  int nmsg,
+  i2c_message *msg,
+  i2c_transfer_done done,
+  void *done_arg_ptr
+)
 {
-    if (bus != mbus)
-        return RTEMS_NOT_CONFIGURED;
-
-    bus->done = done;
-    bus->done_arg_ptr = done_arg_ptr;
-    bus->cmsg = bus->msg = msg;
-    bus->nmsg = nmsg;
-    bus->byte = 0;
-    bus->state = STATE_IDLE;
-    mcfmbus_machine(bus, EVENT_TRANSFER);
-    return RTEMS_SUCCESSFUL;
+  if (bus != mbus)
+    return RTEMS_NOT_CONFIGURED;
+
+  bus->done = done;
+  bus->done_arg_ptr = (uintptr_t) done_arg_ptr;
+  bus->cmsg = bus->msg = msg;
+  bus->nmsg = nmsg;
+  bus->byte = 0;
+  bus->state = STATE_IDLE;
+  mcfmbus_machine(bus, EVENT_TRANSFER);
+  return RTEMS_SUCCESSFUL;
 }
 
 
 /* mcfmbus_i2c_done --
- *     Close ColdFire MBUS I2C bus controller and release all resources.
- *
- * PARAMETERS:
- *     bus - pointer to MBUS controller descriptor
- *
- * RETURNS:
- *     RTEMS_SUCCESSFUL, if transfer initiated successfully, or error
- *     code when failed.
- */
-rtems_status_code
-mcfmbus_i2c_done(mcfmbus *i2c_bus)
+*     Close ColdFire MBUS I2C bus controller and release all resources.
+*
+* PARAMETERS:
+*     bus - pointer to MBUS controller descriptor
+*
+* RETURNS:
+*     RTEMS_SUCCESSFUL, if transfer initiated successfully, or error
+*     code when failed.
+*/
+rtems_status_code mcfmbus_i2c_done(mcfmbus *i2c_bus)
 {
-    rtems_status_code sc;
-    uint32_t   base;
-    if (mbus == NULL)
-        return RTEMS_NOT_CONFIGURED;
-
-    if (mbus != i2c_bus)
-        return RTEMS_INVALID_ADDRESS;
-
-    base = i2c_bus->base;
-
-    *MCF5206E_IMR(base) |= MCF5206E_INTR_BIT(MCF5206E_INTR_MBUS);
-    *MCF5206E_MBCR(base) = 0;
-
-    sc = rtems_interrupt_catch(
-        i2c_bus->oldisr,
-        24 + ((*MCF5206E_ICR(base, MCF5206E_INTR_MBUS) & MCF5206E_ICR_IL) >>
-                                   MCF5206E_ICR_IL_S),
-        NULL
-    );
-    return sc;
+  rtems_status_code sc;
+  uint32_t   base;
+  if (mbus == NULL)
+    return RTEMS_NOT_CONFIGURED;
+
+  if (mbus != i2c_bus)
+    return RTEMS_INVALID_ADDRESS;
+
+  base = i2c_bus->base;
+
+  *MCF5206E_IMR(base) |= MCF5206E_INTR_BIT(MCF5206E_INTR_MBUS);
+  *MCF5206E_MBCR(base) = 0;
+
+  sc = rtems_interrupt_catch(
+      i2c_bus->oldisr,
+      24 + ((*MCF5206E_ICR(base, MCF5206E_INTR_MBUS) & MCF5206E_ICR_IL) >>
+                                 MCF5206E_ICR_IL_S),
+      NULL
+  );
+  return sc;
 }