Changeset 46b881c in mainline for uspace/drv

Timestamp:

2011-01-29T11:36:41Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a, 8add9ca5

Parents:

e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

• The async framework could use different communication style under the hood, but keeping the same high-level API
• The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
• The async_serialize_start()/_end() can be deprecated more easily

Location:

uspace/drv

Files:

• ns8250/ns8250.c (modified) (3 diffs)
• pciintel/pci.c (modified) (2 diffs)

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;