Changeset b0b4592e in mainline for contrib/arch/uspace/app/kio/kio.adl

Timestamp:

2014-03-15T19:21:53Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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:

• contrib/arch/uspace/app/kio/kio.adl (moved) (moved from contrib/arch/uspace/app/klog/klog.adl ) (1 diff)

contrib/arch/uspace/app/kio/kio.adl

@@ -1 @@
-frame klog {
+frame kio {
         requires:
                 naming_service ns;
                 [/uspace/lib/libc/requires]
         initialization:
-                !ns.ipc_m_share_in /* SERVICE_MEM_KLOG */
+                !ns.ipc_m_share_in /* SERVICE_MEM_KIO */
         protocol:
                 [/uspace/lib/libc/protocol]