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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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) (4 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"
@@ -83 +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;
         }
@@ -96 +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",