Changeset 7de5f12 in mainline for uspace/drv/platform/msim/msim.c

Timestamp:

2017-11-15T20:23:50Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ac1243d, 7f4937e

Parents:

e7a8bd2

Message:

MSIM console driver can use hw_res instead of sysinfo for configuration.

File:

• uspace/drv/platform/msim/msim.c (modified) (4 diffs)

uspace/drv/platform/msim/msim.c

@@ -38 +38 @@
 
 #include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <macros.h>
-
-#include <ddi.h>
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <errno.h>
 #include <ipc/dev_iface.h>
 #include <ops/hw_res.h>
 #include <ops/pio_window.h>
+#include <stdbool.h>
+#include <stdio.h>
 
 #define NAME "msim"
 
-#define MSIM_DISK_BASE  UINT32_C(0x10000200)
-#define MSIM_DISK_SIZE  UINT32_C(0x00000010)
+#define MSIM_DDISK_BASE UINT32_C(0x10000200)
+#define MSIM_DDISK_SIZE UINT32_C(0x00000010)
+#define MSIM_DDISK_IRQ 6
+
+#define MSIM_KBD_ADDRESS UINT32_C(0x10000000)
+#define MSIM_KBD_SIZE 1
+#define MSIM_KBD_IRQ 2
 
 typedef struct msim_fun {
@@ -89 +89 @@
                 .type = INTERRUPT,
                 .res.interrupt = {
-                        .irq = 6
+                        .irq = MSIM_DDISK_IRQ
                 }
         }
@@ -101 +101 @@
         .pio_window = {
                 .mem = {
-                        .base = MSIM_DISK_BASE,
-                        .size = MSIM_DISK_SIZE
+                        .base = MSIM_DDISK_BASE,
+                        .size = MSIM_DDISK_SIZE
+                }
+        }
+};
+
+static hw_resource_t console_regs[] = {
+        {
+                .type = MEM_RANGE,
+                .res.mem_range = {
+                        .address = 0,
+                        .size = 1,
+                        .relative = true,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = INTERRUPT,
+                .res.interrupt = {
+                        .irq = MSIM_KBD_IRQ
+                }
+        }
+};
+
+static msim_fun_t console_data = {
+        .hw_resources = {
+                sizeof(console_regs) / sizeof(console_regs[0]),
+                console_regs
+        },
+        .pio_window = {
+                .mem = {
+                        .base = MSIM_KBD_ADDRESS,
+                        .size = MSIM_KBD_SIZE
                 }
         }
@@ -194 +225 @@
         if (!msim_add_fun(dev, "disk0", "msim/ddisk", &disk_data))
                 return false;
-        if (!msim_add_fun(dev, "console", "msim/console", &disk_data))
+        if (!msim_add_fun(dev, "console", "msim/console", &console_data))
                 return false;
         return true;