Changeset 8ff0bd2 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2011-09-04T11:30:58Z (14 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/char/s3c24xx_uart/s3c24xx_uart.c (modified) (6 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <ipc/char.h>
 #include <async.h>
@@ -52 +52 @@
 
 // FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 
 #define NAME "s3c24ser"
@@ -71 +71 @@
 static s3c24xx_uart_t *uart;
 
-static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
 static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 static int s3c24xx_uart_init(s3c24xx_uart_t *uart);
@@ -82 +83 @@
         printf(NAME ": S3C24xx on-chip UART driver\n");
 
-        rc = devmap_driver_register(NAME, s3c24xx_uart_connection);
+        rc = loc_server_register(NAME, s3c24xx_uart_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return -1;
         }
@@ -95 +96 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
+        rc = loc_service_register(NAMESPACE "/" NAME, &uart->service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device %s.\n",
@@ -113 +114 @@
 
 /** Character device connection handler. */
-static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         ipc_callid_t callid;