Changeset 6843a9c in mainline for uspace/lib/nic/src/nic_ev.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/nic/src/nic_ev.c (moved) (moved from uspace/lib/net/include/adt/module_map.h ) (2 diffs)

uspace/lib/nic/src/nic_ev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/**
+ * @addtogroup libnic
  * @{
  */
-
-/** @file
- * Character string to module map.
+/**
+ * @file
+ * @brief
  */
 
-#ifndef LIBNET_MODULES_MAP_H_
-#define LIBNET_MODULES_MAP_H_
+#include <async.h>
+#include <device/nic.h>
+#include <errno.h>
+#include "nic_ev.h"
 
-#include <task.h>
-#include <async.h>
-#include <net/modules.h>
-#include <adt/generic_char_map.h>
+/** Device address changed. */
+int nic_ev_addr_changed(async_sess_t *sess, const nic_address_t *addr)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
 
-/** Type definition of the module structure.
- * @see module_struct
- */
-typedef struct module_struct module_t;
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, NIC_EV_ADDR_CHANGED, &answer);
+        sysarg_t retval = async_data_write_start(exch, addr,
+            sizeof(nic_address_t));
 
-/** Module map.
- * Sorted by module names.
- * @see generic_char_map.h
- */
-GENERIC_CHAR_MAP_DECLARE(modules, module_t)
+        async_exchange_end(exch);
 
-/** Module structure. */
-struct module_struct {
-        /** Module task identifier if running. */
-        task_id_t task_id;
-        /** Module service identifier. */
-        services_t service;
-        /** Module session if running and connected. */
-        async_sess_t *sess;
-        /** Usage counter. */
-        int usage;
-        /** Module name. */
-        const uint8_t *name;
-        /** Module full path filename. */
-        const uint8_t *filename;
-        /** Connecting function. */
-        connect_module_t *connect_module;
-};
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
 
-extern int add_module(module_t **, modules_t *, const uint8_t *,
-    const uint8_t *, services_t, task_id_t, connect_module_t *);
-extern module_t *get_running_module(modules_t *, uint8_t *);
-extern task_id_t net_spawn(const uint8_t *);
+        async_wait_for(req, &retval);
+        return retval;
+}
 
-#endif
+/** Device state changed. */
+int nic_ev_device_state(async_sess_t *sess, sysarg_t state)
+{
+        int rc;
+
+        async_exch_t *exch = async_exchange_begin(sess);
+        rc = async_req_1_0(exch, NIC_EV_DEVICE_STATE, state);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
+/** Frame received. */
+int nic_ev_received(async_sess_t *sess, void *data, size_t size)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, NIC_EV_RECEIVED, &answer);
+        sysarg_t retval = async_data_write_start(exch, data, size);
+
+        async_exchange_end(exch);
+
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        return retval;
+}
 
 /** @}