Changeset 16dc887 in mainline for uspace/srv/hw

Timestamp:

2011-08-16T14:00:32Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

278ac72, b112055

Parents:

3751a08 (diff), cc574511 (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 Location service.

Location:

uspace/srv/hw

Files:

• bus/cuda_adb/cuda_adb.c (modified) (5 diffs)
• bus/cuda_adb/cuda_adb.h (modified) (2 diffs)
• char/i8042/i8042.c (modified) (5 diffs)
• char/i8042/i8042.h (modified) (1 diff)
• char/s3c24xx_uart/s3c24xx_uart.c (modified) (3 diffs)
• char/s3c24xx_uart/s3c24xx_uart.h (modified) (1 diff)
• irc/i8259/i8259.c (modified) (1 diff)
• irc/obio/obio.c (modified) (1 diff)

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>
@@ -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) {
@@ -198 +198 @@
         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);
                                 }

uspace/srv/hw/bus/cuda_adb/cuda_adb.h

@@ -38 +38 @@
 
 #include <sys/types.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <fibril_synch.h>
 
@@ -104 +104 @@
 
 typedef struct {
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
         int client_phone;
 } adb_dev_t;

uspace/srv/hw/char/i8042/i8042.c

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <async.h>
 #include <async_obsolete.h>
@@ -135 +135 @@
         printf(NAME ": i8042 PS/2 port driver\n");
 
-        rc = devmap_driver_register(NAME, i8042_connection);
+        rc = loc_server_register(NAME, i8042_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
+                printf(NAME ": Unable to register server.\n");
                 return rc;
         }
@@ -148 +148 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
+                rc = loc_service_register(name, &i8042_port[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -221 +221 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         int retval;
         int dev_id, i;
@@ -228 +228 @@
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        dsid = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].devmap_handle == dh)
+                if (i8042_port[i].service_id == dsid)
                         dev_id = i;
         }

uspace/srv/hw/char/i8042/i8042.h

@@ -52 +52 @@
 /** Softstate structure, one for each serial port (primary and aux). */
 typedef struct {
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
         int client_phone;
 } i8042_port_t;

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>
@@ -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",

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

@@ -87 +87 @@
         int client_phone;
 
-        /** Device handle */
-        devmap_handle_t devmap_handle;
+        /** Service ID */
+        service_id_t service_id;
 } s3c24xx_uart_t;
 

uspace/srv/hw/irc/i8259/i8259.c

@@ -50 +50 @@
 #include <async.h>
 #include <stdio.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 
 #define NAME  "i8259"

uspace/srv/hw/irc/obio/obio.c

@@ -55 +55 @@
 #include <async.h>
 #include <stdio.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 
 #define NAME "obio"