Changes in / [84eb4edd:81b9d3e] in mainline

Files:

• boot/arch/ppc32/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/drv/bus/adb/cuda_adb/Makefile (added)
• uspace/drv/bus/adb/cuda_adb/cuda_adb.c (added)
• uspace/drv/bus/adb/cuda_adb/cuda_adb.h (added)
• uspace/drv/bus/adb/cuda_adb/cuda_adb.ma (added)
• uspace/drv/bus/adb/cuda_adb/cuda_hw.h (added)
• uspace/drv/bus/adb/cuda_adb/main.c (added)
• uspace/drv/platform/mac/mac.c (modified) (9 diffs)
• uspace/srv/hid/input/port/adb.c (modified) (1 diff)
• uspace/srv/hid/input/port/adb_mouse.c (modified) (1 diff)
• uspace/srv/hw/bus/cuda_adb/Makefile (deleted)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (deleted)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.h (deleted)
• uspace/srv/hw/bus/cuda_adb/cuda_hw.h (deleted)

boot/arch/ppc32/Makefile.inc

@@ -44 +44 @@
 RD_DRVS_ESSENTIAL += \
         platform/mac \
+        bus/adb/cuda_adb \
         bus/pci/pciintel \
         bus/usb/ohci \

uspace/Makefile

@@ -134 +134 @@
         srv/hid/output \
         srv/hid/remcons \
-        srv/hw/bus/cuda_adb \
         srv/hw/char/s3c24xx_uart \
         srv/hw/irc/apic \
@@ -148 +147 @@
         drv/block/ata_bd \
         drv/block/ddisk \
+        drv/bus/adb/cuda_adb \
         drv/bus/isa \
         drv/bus/pci/pciintel \

uspace/app/init/init.c

@@ -342 +342 @@
         srv_start("/srv/icp-ic");
         srv_start("/srv/obio");
-        srv_start("/srv/cuda_adb");
         srv_start("/srv/s3c24xx_uart");
         srv_start("/srv/s3c24xx_ts");

uspace/drv/platform/mac/mac.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +41 @@
 #include <errno.h>
 #include <ops/hw_res.h>
+#include <ops/pio_window.h>
 #include <stdio.h>
+#include <sysinfo.h>
 
 #define NAME  "mac"
@@ -46 +49 @@
 typedef struct {
         hw_resource_list_t hw_resources;
+        pio_window_t pio_window;
 } mac_fun_t;
+
+static hw_resource_t adb_res[] = {
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0,
+                        .size = 0x2000,
+                        .relative = true,
+                        .endianness = BIG_ENDIAN
+                }
+        },
+        {
+                .type = INTERRUPT,
+                .res.interrupt = {
+                        .irq = 0 /* patched at run time */
+                }
+        },
+};
+
+static mac_fun_t adb_data = {
+        .hw_resources = {
+                sizeof(adb_res) / sizeof(adb_res[0]),
+                adb_res
+        },
+        .pio_window = {
+                .io = {
+                        .base = 0, /* patched at run time */
+                        .size = 0x2000
+                }
+        }
+};
 
 static hw_resource_t pci_conf_regs[] = {
@@ -79 +114 @@
 
 /** Obtain function soft-state from DDF function node */
-static mac_fun_t *mac_fun(ddf_fun_t *fnode)
-{
-        return ddf_fun_data_get(fnode);
+static mac_fun_t *mac_fun(ddf_fun_t *ddf_fun)
+{
+        return ddf_fun_data_get(ddf_fun);
+}
+
+static pio_window_t *mac_get_pio_window(ddf_fun_t *ddf_fun)
+{
+        mac_fun_t *fun = mac_fun(ddf_fun);
+        return &fun->pio_window;
 }
 
@@ -88 +129 @@
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
+        printf("mac: Adding new function '%s'.\n", name);
         
         ddf_fun_t *fnode = NULL;
@@ -114 +156 @@
         }
         
+        printf("mac: Added new function '%s' (str=%s).\n", name, str_match_id);
         return true;
         
@@ -135 +178 @@
 static int mac_dev_add(ddf_dev_t *dev)
 {
+        int rc;
+        uintptr_t cuda_physical;
+        sysarg_t cuda_inr;
 #if 0
         /* Register functions */
-        if (!mac_add_fun(dev, "pci0", "intel_pci", &pci_data))
-                ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
+        if (!mac_add_fun(dev, "pci0", "intel_pci", &pci_data)) {
+                ddf_msg(LVL_ERROR, "Failed to add PCI function for Mac platform.");
+                return EIO;
+        }
 #else
         (void)pci_data;
-        (void)mac_add_fun;
 #endif
-        
+        rc = sysinfo_get_value("cuda.address.physical", &cuda_physical);
+        if (rc != EOK)
+                return EIO;
+        rc = sysinfo_get_value("cuda.inr", &cuda_inr);
+        if (rc != EOK)
+                return EIO;
+
+        adb_data.pio_window.io.base = cuda_physical;
+        adb_res[1].res.interrupt.irq = cuda_inr;
+
+        if (!mac_add_fun(dev, "adb", "cuda_adb", &adb_data)) {
+                ddf_msg(LVL_ERROR, "Failed to add ADB function for Mac platform.");
+                return EIO;
+        }
+
         return EOK;
 }
@@ -173 +234 @@
 }
 
+static pio_window_ops_t fun_pio_window_ops = {
+        .get_pio_window = &mac_get_pio_window
+};
+
 static hw_res_ops_t fun_hw_res_ops = {
         .get_resource_list = &mac_get_resources,
@@ -183 +248 @@
         ddf_log_init(NAME);
         mac_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        mac_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
         return ddf_driver_main(&mac_driver);
 }

uspace/srv/hid/input/port/adb.c

@@ -62 +62 @@
         kbd_dev = kdev;
         
-        const char *dev = "adb/kbd";
+        const char *dev = "devices/\\hw\\adb\\kbd";
         service_id_t service_id;
-        int rc = loc_service_get_id(dev, &service_id, 0);
+        int rc = loc_service_get_id(dev, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return rc;

uspace/srv/hid/input/port/adb_mouse.c

@@ -75 +75 @@
 static int adb_port_init(mouse_dev_t *mdev)
 {
-        const char *dev = "adb/mouse";
+        const char *dev = "devices/\\hw\\adb\\mouse";
         
         mouse_dev = mdev;
         
         service_id_t service_id;
-        int rc = loc_service_get_id(dev, &service_id, 0);
+        int rc = loc_service_get_id(dev, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return rc;