Changeset 6a44ee4 in mainline for kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

@@ -44 +44 @@
 #include <arch/asm.h>
 #include <mm/slab.h>
+#include <mm/page.h>
 #include <sysinfo/sysinfo.h>
 #include <str.h>
@@ -59 +60 @@
 }
 
-static void s3c24xx_uart_putchar(outdev_t *dev, wchar_t ch, bool silent)
+static void s3c24xx_uart_putchar(outdev_t *dev, wchar_t ch)
 {
-        if (!silent) {
+        s3c24xx_uart_t *uart =
+            (s3c24xx_uart_t *) dev->data;
+        
+        if ((!uart->parea.mapped) || (console_override)) {
                 if (!ascii_check(ch)) {
                         s3c24xx_uart_sendb(dev, U_SPECIAL);
                 } else {
-                        if (ch == '\n')
+                        if (ch == '\n')
                                 s3c24xx_uart_sendb(dev, (uint8_t) '\r');
                         s3c24xx_uart_sendb(dev, (uint8_t) ch);
@@ -93 +97 @@
 };
 
-outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *io, inr_t inr)
+outdev_t *s3c24xx_uart_init(uintptr_t paddr, inr_t inr)
 {
         outdev_t *uart_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC);
@@ -109 +113 @@
         uart_dev->data = uart;
 
-        uart->io = io;
+        uart->io = (s3c24xx_uart_io_t *) hw_map(paddr, PAGE_SIZE);
         uart->indev = NULL;
 
@@ -127 +131 @@
         pio_write_32(&uart->io->ucon,
             pio_read_32(&uart->io->ucon) & ~UCON_RX_INT_LEVEL);
-
+        
+        link_initialize(&uart->parea.link);
+        uart->parea.pbase = paddr;
+        uart->parea.frames = 1;
+        uart->parea.unpriv = false;
+        uart->parea.mapped = false;
+        ddi_parea_register(&uart->parea);
+        
         if (!fb_exported) {
                 /*
-                 * This is the necessary evil until the userspace driver is entirely
+                 * This is the necessary evil until
+                 * the userspace driver is entirely
                  * self-sufficient.
                  */
                 sysinfo_set_item_val("fb", NULL, true);
                 sysinfo_set_item_val("fb.kind", NULL, 3);
-                sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(io));
+                sysinfo_set_item_val("fb.address.physical", NULL, paddr);
 
                 fb_exported = true;