Changeset 8ff0bd2 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/hw/bus/cuda_adb/cuda_adb.c (modified) (6 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -43 +43 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sysinfo.h>
 #include <errno.h>
@@ -53 +53 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "cuda_adb"
 
-static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static int cuda_init(void);
 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call);
@@ -147 +147 @@
 int main(int argc, char *argv[])
 {
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
         int rc;
         int i;
@@ -155 +155 @@
         for (i = 0; i < ADB_MAX_ADDR; ++i) {
                 adb_dev[i].client_phone = -1;
-                adb_dev[i].devmap_handle = 0;
-        }
-
-        rc = devmap_driver_register(NAME, cuda_connection);
+                adb_dev[i].service_id = 0;
+        }
+
+        rc = loc_server_register(NAME, cuda_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return rc;
         }
 
-        rc = devmap_device_register("adb/kbd", &devmap_handle);
+        rc = loc_service_register("adb/kbd", &service_id);
         if (rc != EOK) {
-                printf(NAME ": Unable to register device %s.\n", "adb/kdb");
+                printf(NAME ": Unable to register service %s.\n", "adb/kdb");
                 return rc;
         }
 
-        adb_dev[2].devmap_handle = devmap_handle;
-        adb_dev[8].devmap_handle = devmap_handle;
-
-        rc = devmap_device_register("adb/mouse", &devmap_handle);
+        adb_dev[2].service_id = service_id;
+        adb_dev[8].service_id = service_id;
+
+        rc = loc_service_register("adb/mouse", &service_id);
         if (rc != EOK) {
-                printf(NAME ": Unable to register device %s.\n", "adb/mouse");
+                printf(NAME ": Unable to register servise %s.\n", "adb/mouse");
                 return rc;
         }
 
-        adb_dev[9].devmap_handle = devmap_handle;
+        adb_dev[9].service_id = service_id;
 
         if (cuda_init() < 0) {
@@ -193 +193 @@
 
 /** Character device connection handler */
-static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         int retval;
         int dev_addr, i;
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        dsid = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         dev_addr = -1;
         for (i = 0; i < ADB_MAX_ADDR; i++) {
-                if (adb_dev[i].devmap_handle == dh)
+                if (adb_dev[i].service_id == dsid)
                         dev_addr = i;
         }
@@ -242 +242 @@
                          */
                         for (i = 0; i < ADB_MAX_ADDR; ++i) {
-                                if (adb_dev[i].devmap_handle == dh) {
+                                if (adb_dev[i].service_id == dsid) {
                                         adb_dev[i].client_phone = IPC_GET_ARG5(call);
                                 }