1 files changed, 31 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/arm/shared/arm-pl011.c b/c/src/lib/libbsp/arm/shared/arm-pl011.c
index 9d613cf73f..44a409e551 100644
--- a/c/src/lib/libbsp/arm/shared/arm-pl011.c
+++ b/c/src/lib/libbsp/arm/shared/arm-pl011.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -13,49 +13,44 @@
  */
 
 #include <bsp/arm-pl011.h>
-#include <bsp/arm-pl011-regs.h>
 
-#include <libchip/sersupp.h>
-
-static volatile pl011 *pl011_get_regs(int minor)
+static volatile pl011 *pl011_get_regs(rtems_termios_device_context *base)
 {
-  const console_tbl *ct = Console_Port_Tbl != NULL ?
-    Console_Port_Tbl[minor] : &Console_Configuration_Ports[minor];
+  arm_pl011_context *ctx = (arm_pl011_context *) base;
 
-  return (volatile pl011 *) ct->ulCtrlPort1;
+  return ctx->regs;
 }
 
-static void pl011_initialize(int minor)
+
+bool arm_pl011_probe(rtems_termios_device_context *base)
 {
-  volatile pl011 *regs = pl011_get_regs(minor);
+  volatile pl011 *regs = pl011_get_regs(base);
 
   regs->uartlcr_h = PL011_UARTLCR_H_WLEN(PL011_UARTLCR_H_WLEN_8);
   regs->uartcr = PL011_UARTCR_RXE
     | PL011_UARTCR_TXE
     | PL011_UARTCR_UARTEN;
+
+  return true;
 }
 
-static int pl011_first_open(int major, int minor, void *arg)
+static bool pl011_first_open(
+  struct rtems_termios_tty *tty,
+  rtems_termios_device_context *base,
+  struct termios *term,
+  rtems_libio_open_close_args_t *args
+)
 {
-  rtems_libio_open_close_args_t *oc = (rtems_libio_open_close_args_t *) arg;
-  struct rtems_termios_tty *tty = (struct rtems_termios_tty *) oc->iop->data1;
-  console_data *cd = &Console_Port_Data[minor];
-  const console_tbl *ct = Console_Port_Tbl[minor];
+  arm_pl011_context *ctx = (arm_pl011_context *) base;
 
-  cd->termios_data = tty;
-  rtems_termios_set_initial_baud(tty, (rtems_termios_baud_t) ct->pDeviceParams);
+  rtems_termios_set_initial_baud(tty, ctx->initial_baud);
 
-  return 0;
+  return true;
 }
 
-static int pl011_last_close(int major, int minor, void *arg)
+static int pl011_read_polled(rtems_termios_device_context *base)
 {
-  return 0;
-}
-
-static int pl011_read_polled(int minor)
-{
-  volatile pl011 *regs = pl011_get_regs(minor);
+  volatile pl011 *regs = pl011_get_regs(base);
 
   if ((regs->uartfr & PL011_UARTFR_RXFE) != 0) {
     return -1;
@@ -64,9 +59,9 @@ static int pl011_read_polled(int minor)
   }
 }
 
-static void pl011_write_polled(int minor, char c)
+void arm_pl011_write_polled(rtems_termios_device_context *base, char c)
 {
-  volatile pl011 *regs = pl011_get_regs(minor);
+  volatile pl011 *regs = pl011_get_regs(base);
 
   while ((regs->uartfr & PL011_UARTFR_TXFF) != 0) {
     /* Wait */
@@ -75,34 +70,22 @@ static void pl011_write_polled(int minor, char c)
   regs->uartdr = PL011_UARTDR_DATA(c);
 }
 
-static ssize_t pl011_write_support_polled(
-  int minor,
+static void pl011_write_support_polled(
+  rtems_termios_device_context *base,
   const char *s,
   size_t n
 )
 {
-  ssize_t i = 0;
+  size_t i;
 
   for (i = 0; i < n; ++i) {
-    pl011_write_polled(minor, s[i]);
+    arm_pl011_write_polled(base, s[i]);
   }
-
-  return n;
-}
-
-static int pl011_set_attribues(int minor, const struct termios *term)
-{
-  return -1;
 }
 
-const console_fns arm_pl011_fns = {
-  .deviceProbe = libchip_serial_default_probe,
-  .deviceFirstOpen = pl011_first_open,
-  .deviceLastClose = pl011_last_close,
-  .deviceRead = pl011_read_polled,
-  .deviceWrite = pl011_write_support_polled,
-  .deviceInitialize = pl011_initialize,
-  .deviceWritePolled = pl011_write_polled,
-  .deviceSetAttributes = pl011_set_attribues,
-  .deviceOutputUsesInterrupts = false
+const rtems_termios_device_handler arm_pl011_fns = {
+  .first_open = pl011_first_open,
+  .poll_read = pl011_read_polled,
+  .write = pl011_write_support_polled,
+  .mode = TERMIOS_POLLED
 };