Changeset c07481c7 in rtems for c/src/lib/libbsp/sparc/leon3/console/console.c

Timestamp:

10/20/15 09:16:12 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

7b07ac2

Parents:

e29f1f5

git-author:

Sebastian Huber <sebastian.huber@…> (10/20/15 09:16:12)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/20/15 09:29:57)

Message:

bsp/leon3: Fix Termios context usage

Only the context of the console device was used and this is wrong in
case more than one APBUART device is available.

File:

• c/src/lib/libbsp/sparc/leon3/console/console.c (modified) (2 diffs)

c/src/lib/libbsp/sparc/leon3/console/console.c

@@ -45 +45 @@
 static int uarts = 0;
 
-static rtems_termios_device_context *leon3_console_get_context(int minor)
+static rtems_termios_device_context *leon3_console_get_context(int index)
 {
-  struct apbuart_context *uart;
-
-  if (minor == 0)
-    uart = &apbuarts[syscon_uart_index];
-  else
-    uart = &apbuarts[minor - 1];
+  struct apbuart_context *uart = &apbuarts[index];
 
   rtems_termios_device_context_initialize(&uart->base, "APBUART");
@@ -160 +155 @@
       handler,
       NULL,
-      leon3_console_get_context(syscon_uart_index)
+      leon3_console_get_context(i)
     );
   }