Changeset 87b4baa in mainline for uspace/srv/devman/main.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/devman/main.c (modified) (12 diffs)

uspace/srv/devman/main.c

@@ -74 +74 @@
         
         iid = async_get_call(&icall);
-        if (IPC_GET_METHOD(icall) != DEVMAN_DRIVER_REGISTER) {
+        if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) {
                 ipc_answer_0(iid, EREFUSED);
                 return NULL;
@@ -109 +109 @@
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
                 ipc_answer_0(callid, ENOTSUP);
                 ipc_answer_0(iid, ENOTSUP);
@@ -141 +141 @@
         
         callid = async_get_call(&call);
-        if (DEVMAN_ADD_MATCH_ID != IPC_GET_METHOD(call)) {
+        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
                 printf(NAME ": ERROR: devman_receive_match_id - invalid "
                     "protocol.\n");
@@ -184 +184 @@
  * @return              Zero on success, negative error code otherwise.
  */
-static int devman_receive_match_ids(ipcarg_t match_count,
+static int devman_receive_match_ids(sysarg_t match_count,
     match_id_list_t *match_ids)
 {
@@ -211 +211 @@
 {
         devman_handle_t parent_handle = IPC_GET_ARG1(*call);
-        ipcarg_t match_count = IPC_GET_ARG2(*call);
+        sysarg_t match_count = IPC_GET_ARG2(*call);
         dev_tree_t *tree = &device_tree;
         
@@ -246 +246 @@
 
         /*
-         * Try to find suitable driver and assign it to the device.
-         * We do not want to block current fibril that is used to processing
-         * incoming calls: we will launch a separate fibril to handle
-         * the driver assigning. That is because assign_driver can actually
-         * include task spawning which could take some time.
+         * Try to find a suitable driver and assign it to the device.  We do
+         * not want to block the current fibril that is used for processing
+         * incoming calls: we will launch a separate fibril to handle the
+         * driver assigning. That is because assign_driver can actually include
+         * task spawning which could take some time.
          */
         fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
@@ -367 +367 @@
                 callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -420 +420 @@
                 ipc_callid_t callid = async_get_call(&call);
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -486 +486 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        devmap_handle_t devmap_handle = IPC_GET_METHOD(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
         node_t *dev;
 
@@ -521 +521 @@
          * passes device handle to the driver as an ipc method.)
          */
-        if (IPC_GET_METHOD(*icall) != IPC_M_CONNECT_ME_TO)
+        if (IPC_GET_IMETHOD(*icall) != IPC_M_CONNECT_ME_TO)
                 devman_connection_devmapper(iid, icall);
 
@@ -531 +531 @@
         
         /* Select interface. */
-        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
+        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
         case DEVMAN_DRIVER:
                 devman_connection_driver(iid, icall);
@@ -599 +599 @@
 
         /* Register device manager at naming service. */
-        ipcarg_t phonead;
+        sysarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAN, 0, 0, &phonead) != 0)
                 return -1;