Changeset 925a21e in mainline for uspace/srv/hid/fb/port/kchar.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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:

• uspace/srv/hid/fb/port/kchar.c (moved) (moved from uspace/srv/hid/fb/msim.c ) (1 diff)

uspace/srv/hid/fb/port/kchar.c

@@ -28 +28 @@
  */
 
-/** @defgroup msimfb MSIM text console
- * @brief HelenOS MSIM text console.
- * @ingroup fbs
- * @{
- */
 /** @file
  */
 
-#include <async.h>
-#include <libc.h>
+#include <sys/types.h>
+#include <errno.h>
 #include <sysinfo.h>
+#include <ddi.h>
 #include <as.h>
-#include <ddi.h>
-#include <errno.h>
+#include <align.h>
+#include "../ctl/serial.h"
+#include "kchar.h"
 
-#include "serial_console.h"
-#include "msim.h"
+typedef struct {
+        uint8_t *addr;
+} kchar_t;
 
-#define WIDTH 80
-#define HEIGHT 24
+static kchar_t kchar;
 
-static char *virt_addr;
-
-static void msim_putc(const char c)
+static void kchar_putchar(wchar_t ch)
 {
-        *virt_addr = c;
+        if ((ch >= 0) && (ch < 128))
+                *kchar.addr = ch;
+        else
+                *kchar.addr = '?';
 }
 
-int msim_init(void)
+static void kchar_control_puts(const char *str)
 {
-        sysarg_t phys_addr;
-        if (sysinfo_get_value("fb.address.physical", &phys_addr) != EOK)
-                return -1;
+        while (*str)
+                *kchar.addr = *(str++);
+}
+
+int kchar_init(void)
+{
+        sysarg_t present;
+        int rc = sysinfo_get_value("fb", &present);
+        if (rc != EOK)
+                present = false;
         
-        virt_addr = (char *) as_get_mappable_page(1);
+        if (!present)
+                return ENOENT;
         
-        if (physmem_map((void *) phys_addr, virt_addr, 1,
-            AS_AREA_READ | AS_AREA_WRITE) != 0)
-                return -1;
+        sysarg_t kind;
+        rc = sysinfo_get_value("fb.kind", &kind);
+        if (rc != EOK)
+                kind = (sysarg_t) -1;
         
-        serial_console_init(msim_putc, WIDTH, HEIGHT);
+        if (kind != 3)
+                return EINVAL;
         
-        async_set_client_connection(serial_client_connection);
-        return 0;
+        sysarg_t paddr;
+        rc = sysinfo_get_value("fb.address.physical", &paddr);
+        if (rc != EOK)
+                return rc;
+        
+        kchar.addr = as_get_mappable_page(1);
+        if (kchar.addr == NULL)
+                return ENOMEM;
+        
+        rc = physmem_map((void *) paddr, kchar.addr,
+            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        if (rc != EOK)
+                return rc;
+        
+        return serial_init(kchar_putchar, kchar_control_puts);
 }