Changeset 8fb1bf82 in mainline for uspace/lib/c/include/devman.h

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/lib/c/include/devman.h (moved) (moved from uspace/srv/net/il/ip/ip_local.h ) (2 diffs)

uspace/lib/c/include/devman.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2010 Lenka Trochtova 
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup ip
+/** @addtogroup libc
  * @{
  */
+/** @file
+ */
 
-#ifndef NET_IP_LOCAL_H_
-#define NET_IP_LOCAL_H_
+#ifndef LIBC_DEVMAN_H_
+#define LIBC_DEVMAN_H_
 
+#include <ipc/devman.h>
 #include <async.h>
-#include <ipc/services.h>
+#include <bool.h>
 
-#include <net/ip_codes.h>
-#include <net/inet.h>
-#include <net/in.h>
 
-extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
-    services_t);
-extern int ip_set_gateway_req_local(int, device_id_t, in_addr_t);
-extern int ip_packet_size_req_local(int, device_id_t, packet_dimension_ref);
-extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t,
-    services_t);
-extern int ip_device_req_local(int, device_id_t, services_t);
-extern int ip_add_route_req_local(int, device_id_t, in_addr_t, in_addr_t,
-    in_addr_t);
-extern int ip_send_msg_local(int, device_id_t, packet_t, services_t,
-    services_t);
-extern int ip_get_route_req_local(int, ip_protocol_t, const struct sockaddr *,
-    socklen_t, device_id_t *, void **, size_t *);
+extern int devman_get_phone(devman_interface_t, unsigned int);
+extern void devman_hangup_phone(devman_interface_t);
+
+extern int devman_driver_register(const char *, async_client_conn_t);
+extern int devman_child_device_register(const char *, match_id_list_t *,
+    devman_handle_t, devman_handle_t *);
+
+extern int devman_device_connect(devman_handle_t, unsigned int);
+extern int devman_parent_device_connect(devman_handle_t, unsigned int);
+
+extern int devman_device_get_handle(const char *, devman_handle_t *,
+    unsigned int);
+
+extern int devman_add_device_to_class(devman_handle_t, const char *);
 
 #endif