Changeset 903bac0a in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (3 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <io/console.h>
 #include <vfs/vfs.h>
@@ -90 +90 @@
         printf(NAME ": S3C24xx touchscreen driver\n");
 
-        rc = devmap_driver_register(NAME, s3c24xx_ts_connection);
+        rc = loc_server_register(NAME, s3c24xx_ts_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -103 +103 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
+        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device %s.\n",