Changeset 609243f4 in mainline for uspace/lib/drv

Timestamp:

2011-10-07T15:46:01Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2c50e1

Parents:

f51b1d3

Message:

cherrypick general networking improvements from lp:~helenos-nicf/helenos/nicf (after sanitization)
remove obsolete networking drivers
this renders the networking non-functional for the time being

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (2 diffs)
• generic/driver.c (modified) (2 diffs)
• generic/remote_nic.c (added)
• include/ddf/driver.h (modified) (1 diff)
• include/ops/nic.h (added)
• include/remote_nic.h (moved) (moved from uspace/lib/net/include/netif_remote.h ) (2 diffs)

uspace/lib/drv/Makefile

@@ -39 +39 @@
         generic/remote_hw_res.c \
         generic/remote_char_dev.c \
+        generic/remote_nic.c \
         generic/remote_usb.c \
         generic/remote_pci.c \

uspace/lib/drv/generic/dev_iface.c

@@ -41 +41 @@
 #include "remote_hw_res.h"
 #include "remote_char_dev.h"
+#include "remote_nic.h"
 #include "remote_usb.h"
 #include "remote_usbhc.h"
@@ -50 +51 @@
                 &remote_hw_res_iface,
                 &remote_char_dev_iface,
+                &remote_nic_iface,
                 &remote_pci_iface,
                 &remote_usb_iface,

uspace/lib/drv/generic/driver.c

@@ -303 +303 @@
 }
 
+static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall)
+{
+        fibril_mutex_lock(&devices_mutex);
+        ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall));
+        fibril_mutex_unlock(&devices_mutex);
+        
+        if (dev != NULL && driver->driver_ops->device_added != NULL)
+                driver->driver_ops->device_added(dev);
+}
+
 static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -450 +460 @@
                 case DRIVER_DEV_ADD:
                         driver_dev_add(callid, &call);
+                        break;
+                case DRIVER_DEV_ADDED:
+                        async_answer_0(callid, EOK);
+                        driver_dev_added(callid, &call);
                         break;
                 case DRIVER_DEV_REMOVE:

uspace/lib/drv/include/ddf/driver.h

@@ -137 +137 @@
         /** Callback method for passing a new device to the device driver */
         int (*add_device)(ddf_dev_t *);
+        /**
+         * Notification that the device was succesfully added.
+         * The driver can do any blocking operation without
+         * blocking the device manager.
+         */
+        void (*device_added)(ddf_dev_t *dev);
         /** Ask driver to remove a device */
         int (*dev_remove)(ddf_dev_t *);

uspace/lib/drv/include/remote_nic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup libdrv
  * @{
  */
+/** @file
+ */
 
-#ifndef LIBNET_NETIF_REMOTE_H_
-#define LIBNET_NETIF_REMOTE_H_
+#ifndef LIBDRV_REMOTE_NIC_H_
+#define LIBDRV_REMOTE_NIC_H_
 
-#include <ipc/services.h>
-#include <adt/measured_strings.h>
-#include <net/device.h>
-#include <net/packet.h>
-#include <async.h>
-
-extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **,
-    uint8_t **);
-extern int netif_probe_req(async_sess_t *, device_id_t, int, void *);
-extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t);
-extern int netif_start_req(async_sess_t *, device_id_t);
-extern int netif_stop_req(async_sess_t *, device_id_t);
-extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *);
-extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t,
-    async_client_conn_t);
+extern remote_iface_t remote_nic_iface;
 
 #endif
 
-/** @}
+/**
+ * @}
  */