Changeset 474afc9 in mainline for uspace/drv

Timestamp:

2011-02-04T22:40:13Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4d73d71

Parents:

89acf204 (diff), e29e09cf (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:

development branch changes

Location:

uspace/drv

Files:

• ns8250/ns8250.c (modified) (3 diffs)
• pciintel/pci.c (modified) (2 diffs)
• test2/test2.c (modified) (1 diff)
• uhci-hcd/pci.c (modified) (1 diff)
• usbhid/main.c (modified) (1 diff)
• usbhub/usbhub.c (modified) (2 diffs)
• vhc/conndev.c (modified) (2 diffs)
• vhc/devices.c (modified) (1 diff)
• vhc/hc.c (modified) (1 diff)
• vhc/hcd.c (modified) (1 diff)

uspace/drv/ns8250/ns8250.c

@@ -256 +256 @@
         
         if (dev->parent_phone > 0) {
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 dev->parent_phone = 0;
         }
@@ -888 +888 @@
                 ns8250_get_props(dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
-                ipc_answer_4(callid, EOK, baud_rate, parity, word_length,
+                async_answer_4(callid, EOK, baud_rate, parity, word_length,
                     stop_bits);
                 break;
@@ -899 +899 @@
                 ret = ns8250_set_props(dev, baud_rate, parity, word_length,
                     stop_bits);
-                ipc_answer_0(callid, ret);
+                async_answer_0(callid, ret);
                 break;
                 
         default:
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
         }
 }

uspace/drv/pciintel/pci.c

@@ -478 +478 @@
                     "the device.\n");
                 delete_pci_bus_data(bus_data);
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 return rc;
         }       
@@ -496 +496 @@
                 printf(NAME ": failed to enable configuration ports.\n");
                 delete_pci_bus_data(bus_data);
-                ipc_hangup(dev->parent_phone);
+                async_hangup(dev->parent_phone);
                 hw_res_clean_resource_list(&hw_resources);
                 return EADDRNOTAVAIL;

uspace/drv/test2/test2.c

@@ -103 +103 @@
         if (dev->parent == NULL) {
                 fid_t postpone = fibril_create(postponed_birth, dev);
+                if (postpone == 0) {
+                        printf(NAME ": fibril_create() error\n");
+                        return ENOMEM;
+                }
                 fibril_add_ready(postpone);
         } else {

uspace/drv/uhci-hcd/pci.c

@@ -117 +117 @@
         rc = EOK;
 leave:
-        ipc_hangup(parent_phone);
+        async_hangup(parent_phone);
 
         return rc;

uspace/drv/usbhid/main.c

@@ -83 +83 @@
 
                 if (console_callback_phone != -1) {
-                        ipc_answer_0(icallid, ELIMIT);
+                        async_answer_0(icallid, ELIMIT);
                         return;
                 }
 
                 console_callback_phone = callback;
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
                 return;
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 

uspace/drv/usbhub/usbhub.c

@@ -199 +199 @@
         //ports powered, hub seems to be enabled
 
-        ipc_hangup(hc);
+        async_hangup(hc);
 
         //add the hub to list
@@ -502 +502 @@
                 free(change_bitmap);
 
-                ipc_hangup(hc);
+                async_hangup(hc);
                 fibril_mutex_lock(&usb_hub_list_lock);
         }

uspace/drv/vhc/conndev.c

@@ -90 +90 @@
                     = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
                 if (!dev) {
-                        ipc_answer_0(icallid, EEXISTS);
-                        ipc_hangup(callback);
+                        async_answer_0(icallid, EEXISTS);
+                        async_hangup(callback);
                         return;
                 }
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
 
                 char devname[DEVICE_NAME_MAXLENGTH + 1];
@@ -105 +105 @@
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
 }
 

uspace/drv/vhc/devices.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hc.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>

uspace/drv/vhc/hcd.c

@@ -35 +35 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>