Changeset c431a83 in mainline for uspace/lib/c/generic

Timestamp:

2011-01-21T14:24:05Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c2020f7

Parents:

e8ad0de (diff), aa9f0a4 (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 from usb/development

Location:

uspace/lib/c/generic

Files:

• as.c (modified) (2 diffs)
• net/icmp_common.c (modified) (2 diffs)

uspace/lib/c/generic/as.c

@@ -35 +35 @@
 #include <as.h>
 #include <libc.h>
+#include <errno.h>
 #include <unistd.h>
 #include <align.h>
@@ -128 +129 @@
 }
 
+/** Find mapping to physical address.
+ *
+ * @param address Virtual address in question (virtual).
+ * @param[out] frame Frame address (physical).
+ * @return Error code.
+ * @retval EOK No error, @p frame holds the translation.
+ * @retval ENOENT Mapping not found.
+ */
+int as_get_physical_mapping(void *address, uintptr_t *frame)
+{
+        uintptr_t tmp_frame;
+        uintptr_t virt = (uintptr_t) address;
+        
+        int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,
+            (sysarg_t) virt, (sysarg_t) &tmp_frame);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        if (frame != NULL) {
+                *frame = tmp_frame;
+        }
+        
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/c/generic/net/icmp_common.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libc 
+/** @addtogroup libc
  *  @{
  */
@@ -38 +38 @@
 #include <net/modules.h>
 #include <net/icmp_common.h>
-
 #include <ipc/services.h>
 #include <ipc/icmp.h>
-
 #include <sys/time.h>
 #include <async.h>
 
-/** Connects to the ICMP module.
+/** Connect to the ICMP module.
  *
- * @param service       The ICMP module service. Ignored parameter.
- * @param[in] timeout   The connection timeout in microseconds. No timeout if
- *                      set to zero.
- * @return              The ICMP module phone on success.
- * @return              ETIMEOUT if the connection timeouted.
+ * @param[in] timeout Connection timeout in microseconds, zero
+ *                    for no timeout.
+ *
+ * @return ICMP module phone on success.
+ * @return ETIMEOUT if the connection timeouted.
+ *
  */
-int icmp_connect_module(services_t service, suseconds_t timeout)
+int icmp_connect_module(suseconds_t timeout)
 {
-        int phone;
-
-        phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
-        if (phone >= 0)
-                async_req_0_0(phone, NET_ICMP_INIT);
-
-        return phone;
+        return connect_to_service_timeout(SERVICE_ICMP, timeout);
 }