Changeset d7ff048 in mainline for uspace/drv

Timestamp:

2011-10-08T13:08:53Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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

Location:

uspace/drv

Files:

• bus/usb/usbhub/Makefile (modified) (2 diffs)
• bus/usb/usbhub/main.c (modified) (6 diffs)
• bus/usb/usbhub/port.c (added)
• bus/usb/usbhub/port.h (moved) (moved from uspace/drv/bus/usb/usbhub/ports.h ) (5 diffs)
• bus/usb/usbhub/port_status.h (deleted)
• bus/usb/usbhub/ports.c (deleted)
• bus/usb/usbhub/status.h (added)
• bus/usb/usbhub/usbhub.c (modified) (14 diffs)
• bus/usb/usbhub/usbhub.h (modified) (5 diffs)
• bus/usb/usbhub/usbhub_private.h (deleted)
• bus/usb/usbhub/utils.c (deleted)
• bus/usb/usbmast/main.c (modified) (5 diffs)
• infrastructure/rootvirt/devices.def (modified) (3 diffs)
• nic/lo/Makefile (moved) (moved from uspace/lib/packet/Makefile ) (2 diffs)
• nic/lo/lo.c (added)
• nic/lo/lo.ma (added)
• nic/ne2k/Makefile (moved) (moved from uspace/srv/net/netif/lo/Makefile ) (2 diffs)
• nic/ne2k/dp8390.c (moved) (moved from uspace/srv/hw/netif/ne2000/dp8390.c ) (20 diffs)
• nic/ne2k/dp8390.h (moved) (moved from uspace/srv/hw/netif/ne2000/dp8390.h ) (6 diffs)
• nic/ne2k/ne2k.c (added)
• nic/ne2k/ne2k.ma (added)

uspace/drv/bus/usb/usbhub/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2011 Jan Vesely
 # All rights reserved.
 #
@@ -43 +44 @@
 SOURCES = \
         main.c \
-        utils.c \
         usbhub.c \
-        ports.c
+        port.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/bus/usb/usbhub/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/classes.h>
+#include <usb/debug.h>
 
 #include "usbhub.h"
-#include "usbhub_private.h"
 
 /** Hub status-change endpoint description.
@@ -56 +57 @@
 
 /**
- * usb hub driver operations
+ * USB hub driver operations
  *
  * The most important one is add_device, which is set to usb_hub_add_device.
@@ -64 +65 @@
 };
 
-/**
- * hub endpoints, excluding control endpoint
- */
+/** Hub endpoints, excluding control endpoint. */
 static usb_endpoint_description_t *usb_hub_endpoints[] = {
         &hub_status_change_endpoint_description,
-        NULL
+        NULL,
 };
-
-/**
- * static usb hub driver information
- */
+/** Static usb hub driver information. */
 static usb_driver_t usb_hub_driver = {
         .name = NAME,
@@ -85 +81 @@
 {
         printf(NAME ": HelenOS USB hub driver.\n");
-
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
@@ -94 +89 @@
  * @}
  */
-

uspace/drv/bus/usb/usbhub/port.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup drvusbhub
  * @{
@@ -33 +33 @@
  * Hub ports related functions.
  */
-#ifndef DRV_USBHUB_PORTS_H
-#define DRV_USBHUB_PORTS_H
+#ifndef DRV_USBHUB_PORT_H
+#define DRV_USBHUB_PORT_H
 
 #include <usb/dev/driver.h>
 #include <usb/dev/hub.h>
+#include <usb/classes/hub.h>
 
 typedef struct usb_hub_info_t usb_hub_info_t;
@@ -43 +44 @@
 /** Information about single port on a hub. */
 typedef struct {
-        /** Mutex needed by CV for checking port reset. */
-        fibril_mutex_t reset_mutex;
+        size_t port_number;
+        usb_pipe_t *control_pipe;
+        /** Mutex needed not only by CV for checking port reset. */
+        fibril_mutex_t mutex;
         /** CV for waiting to port reset completion. */
         fibril_condvar_t reset_cv;
@@ -62 +65 @@
  * @param port Port to be initialized.
  */
-static inline void usb_hub_port_init(usb_hub_port_t *port) {
+static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number,
+    usb_pipe_t *control_pipe)
+{
+        assert(port);
         port->attached_device.address = -1;
         port->attached_device.handle = 0;
-        fibril_mutex_initialize(&port->reset_mutex);
+        port->port_number = port_number;
+        port->control_pipe = control_pipe;
+        fibril_mutex_initialize(&port->mutex);
         fibril_condvar_initialize(&port->reset_cv);
 }
 
-
-void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
-        uint16_t port);
-
-
+void usb_hub_port_reset_fail(usb_hub_port_t *port);
+void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub);
+int usb_hub_port_clear_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
+int usb_hub_port_set_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
 
 #endif

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <str_error.h>
 #include <inttypes.h>
-
-#include <usb_iface.h>
+#include <stdio.h>
+
+#include <usb/usb.h>
+#include <usb/debug.h>
+#include <usb/dev/pipes.h>
+#include <usb/classes/classes.h>
 #include <usb/ddfiface.h>
 #include <usb/descriptor.h>
@@ -46 +51 @@
 #include <usb/classes/hub.h>
 #include <usb/dev/poll.h>
-#include <stdio.h>
+#include <usb_iface.h>
 
 #include "usbhub.h"
-#include "usbhub_private.h"
-#include "port_status.h"
-#include <usb/usb.h>
-#include <usb/dev/pipes.h>
-#include <usb/classes/classes.h>
-
-
+#include "status.h"
+
+#define HUB_FNC_NAME "hub"
+
+/** Standard get hub global status request */
+static const usb_device_request_setup_packet_t get_hub_status_request = {
+        .request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS,
+        .request = USB_HUB_REQUEST_GET_STATUS,
+        .index = 0,
+        .value = 0,
+        .length = sizeof(usb_hub_status_t),
+};
+
+static int usb_set_first_configuration(usb_device_t *usb_device);
 static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev);
-
 static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info);
-
-static int usb_hub_set_configuration(usb_hub_info_t *hub_info);
-
-static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info);
-
-static int usb_process_hub_over_current(usb_hub_info_t *hub_info,
+static void usb_hub_over_current(const usb_hub_info_t *hub_info,
     usb_hub_status_t status);
-
-static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info,
-    usb_hub_status_t status);
-
-static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info);
-
+static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info);
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data);
 
-
-//*********************************************
-//
-//  hub driver code, initialization
-//
-//*********************************************
-
 /**
  * Initialize hub device driver fibril
  *
- * Creates hub representation and fibril that periodically checks hub`s status.
+ * Creates hub representation and fibril that periodically checks hub's status.
  * Hub representation is passed to the fibril.
  * @param usb_dev generic usb device information
  * @return error code
  */
-int usb_hub_add_device(usb_device_t *usb_dev) {
-        if (!usb_dev) return EINVAL;
+int usb_hub_add_device(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        /* Create driver soft-state structure */
         usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev);
-        //create hc connection
+        if (hub_info == NULL) {
+                usb_log_error("Failed to create hun driver structure.\n");
+                return ENOMEM;
+        }
+
+        /* Create hc connection */
         usb_log_debug("Initializing USB wire abstraction.\n");
         int opResult = usb_hc_connection_initialize_from_device(
-            &hub_info->connection,
-            hub_info->usb_device->ddf_dev);
-        if (opResult != EOK) {
-                usb_log_error("Could not initialize connection to device, "
-                    " %s\n",
-                    str_error(opResult));
-                free(hub_info);
-                return opResult;
-        }
-
-        //set hub configuration
-        opResult = usb_hub_set_configuration(hub_info);
-        if (opResult != EOK) {
-                usb_log_error("Could not set hub configuration, %s\n",
-                    str_error(opResult));
-                free(hub_info);
-                return opResult;
-        }
+            &hub_info->connection, hub_info->usb_device->ddf_dev);
+        if (opResult != EOK) {
+                usb_log_error("Could not initialize connection to device: %s\n",
+                    str_error(opResult));
+                free(hub_info);
+                return opResult;
+        }
+
+        /* Set hub's first configuration. (There should be only one) */
+        opResult = usb_set_first_configuration(usb_dev);
+        if (opResult != EOK) {
+                usb_log_error("Could not set hub configuration: %s\n",
+                    str_error(opResult));
+                free(hub_info);
+                return opResult;
+        }
+
         //get port count and create attached_devs
         opResult = usb_hub_process_hub_specific_info(hub_info);
@@ -123 +123 @@
         }
 
-        usb_log_debug("Creating 'hub' function in DDF.\n");
+        usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
         ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
-            fun_exposed, "hub");
-        assert(hub_fun != NULL);
-        hub_fun->ops = NULL;
+            fun_exposed, HUB_FNC_NAME);
+        if (hub_fun == NULL) {
+                usb_log_error("Failed to create hub function.\n");
+                free(hub_info);
+                return ENOMEM;
+        }
 
         opResult = ddf_fun_bind(hub_fun);
-        assert(opResult == EOK);
-
-        opResult = usb_hub_start_hub_fibril(hub_info);
-        if (opResult != EOK)
-                free(hub_info);
-        return opResult;
-}
-
+        if (opResult != EOK) {
+                usb_log_error("Failed to bind hub function: %s.\n",
+                   str_error(opResult));
+                free(hub_info);
+                ddf_fun_destroy(hub_fun);
+                return opResult;
+        }
+
+        opResult = usb_device_auto_poll(hub_info->usb_device, 0,
+            hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1,
+            usb_hub_polling_terminated_callback, hub_info);
+        if (opResult != EOK) {
+                ddf_fun_destroy(hub_fun);
+                free(hub_info);
+                usb_log_error("Failed to create polling fibril: %s.\n",
+                    str_error(opResult));
+                return opResult;
+        }
+        usb_log_info("Controlling hub '%s' (%zu ports).\n",
+            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
+
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Callback for polling hub for changes.
  *
@@ -147 +166 @@
  */
 bool hub_port_changes_callback(usb_device_t *dev,
-    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) {
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
+{
         usb_log_debug("hub_port_changes_callback\n");
-        usb_hub_info_t *hub = (usb_hub_info_t *) arg;
-
-        /* FIXME: check that we received enough bytes. */
+        usb_hub_info_t *hub = arg;
+        assert(hub);
+
+        /* It is an error condition if we didn't receive enough data */
         if (change_bitmap_size == 0) {
-                goto leave;
-        }
-
-        bool change;
-        change = ((uint8_t*) change_bitmap)[0] & 1;
+                return false;
+        }
+
+        /* Lowest bit indicates global change */
+        const bool change = change_bitmap[0] & 1;
         if (change) {
-                usb_hub_process_global_interrupt(hub);
-        }
-
-        size_t port;
-        for (port = 1; port < hub->port_count + 1; port++) {
-                bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
+                usb_hub_global_interrupt(hub);
+        }
+
+        /* N + 1 bit indicates change on port N */
+        size_t port = 1;
+        for (; port < hub->port_count + 1; port++) {
+                const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
                 if (change) {
-                        usb_hub_process_port_interrupt(hub, port);
+                        usb_hub_port_process_interrupt(&hub->ports[port], hub);
                 }
         }
-leave:
-        /* FIXME: proper interval. */
-        async_usleep(1000 * 250);
-
         return true;
 }
-
-
-//*********************************************
-//
-//  support functions
-//
-//*********************************************
-
+/*----------------------------------------------------------------------------*/
 /**
  * create usb_hub_info_t structure
@@ -190 +201 @@
  * @return basic usb_hub_info_t structure
  */
-static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) {
-        usb_hub_info_t * result = malloc(sizeof (usb_hub_info_t));
-        if (!result) return NULL;
-        result->usb_device = usb_dev;
-        result->status_change_pipe = usb_dev->pipes[0].pipe;
-        result->control_pipe = &usb_dev->ctrl_pipe;
-        result->is_default_address_used = false;
-
-        result->ports = NULL;
-        result->port_count = (size_t) - 1;
-        fibril_mutex_initialize(&result->port_mutex);
-
-        fibril_mutex_initialize(&result->pending_ops_mutex);
-        fibril_condvar_initialize(&result->pending_ops_cv);
-        result->pending_ops_count = 0;
-        return result;
-}
-
+static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        usb_hub_info_t *info = malloc(sizeof(usb_hub_info_t));
+        if (!info)
+            return NULL;
+
+        info->usb_device = usb_dev;
+
+        info->ports = NULL;
+        info->port_count = -1;
+        fibril_mutex_initialize(&info->pending_ops_mutex);
+        fibril_condvar_initialize(&info->pending_ops_cv);
+        info->pending_ops_count = 0;
+
+        return info;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * Load hub-specific information into hub_info structure and process if needed
  *
- * Particularly read port count and initialize structure holding port
- * information. If there are non-removable devices, start initializing them.
+ * Read port count and initialize structures holding per port information.
+ * If there are any non-removable devices, start initializing them.
  * This function is hub-specific and should be run only after the hub is
- * configured using usb_hub_set_configuration function.
+ * configured using usb_set_first_configuration function.
  * @param hub_info hub representation
  * @return error code
  */
-int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
-{
-        // get hub descriptor
+static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
+{
+        assert(hub_info);
+
+        /* Get hub descriptor. */
         usb_log_debug("Retrieving descriptor\n");
-        uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
-        int opResult;
-
+        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+
+        usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        opResult = usb_request_get_descriptor(hub_info->control_pipe,
+        int opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
-            USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
-
+            USB_DESCTYPE_HUB, 0, 0, &descriptor,
+            sizeof(usb_hub_descriptor_t), &received_size);
         if (opResult != EOK) {
                 usb_log_error("Failed to receive hub descriptor: %s.\n",
@@ -236 +248 @@
                 return opResult;
         }
-        usb_log_debug2("Parsing descriptor\n");
-        usb_hub_descriptor_t descriptor;
-        opResult = usb_deserialize_hub_desriptor(
-                serialized_descriptor, received_size, &descriptor);
-        if (opResult != EOK) {
-                usb_log_error("Could not parse descriptor: %s\n",
-                    str_error(opResult));
-                return opResult;
-        }
-        usb_log_debug("Setting port count to %d.\n", descriptor.ports_count);
-        hub_info->port_count = descriptor.ports_count;
-
+
+        usb_log_debug("Setting port count to %d.\n", descriptor.port_count);
+        hub_info->port_count = descriptor.port_count;
+
+        // TODO: +1 hack is no longer necessary
         hub_info->ports =
             malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1));
@@ -256 +261 @@
         size_t port;
         for (port = 0; port < hub_info->port_count + 1; ++port) {
-                usb_hub_port_init(&hub_info->ports[port]);
+                usb_hub_port_init(&hub_info->ports[port], port, control_pipe);
         }
 
         const bool is_power_switched =
-            !(descriptor.hub_characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG);
+            !(descriptor.characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG);
         if (is_power_switched) {
                 usb_log_debug("Hub power switched\n");
-                const bool per_port_power = descriptor.hub_characteristics
+                const bool per_port_power = descriptor.characteristics
                     & HUB_CHAR_POWER_PER_PORT_FLAG;
 
                 for (port = 1; port <= hub_info->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
-                        opResult = usb_hub_set_port_feature(
-                            hub_info->control_pipe,
-                            port, USB_HUB_FEATURE_PORT_POWER);
+                        opResult = usb_hub_port_set_feature(
+                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_error("Cannot power on port %zu: %s.\n",
@@ -283 +287 @@
                         }
                 }
-
         } else {
-                usb_log_debug("Power not switched, not going to be powered\n");
+                usb_log_debug("Power not switched, ports always powered\n");
         }
         return EOK;
 }
-
-/**
- * Set configuration of hub
+/*----------------------------------------------------------------------------*/
+/**
+ * Set configuration of and USB device
  *
  * Check whether there is at least one configuration and sets the first one.
  * This function should be run prior to running any hub-specific action.
- * @param hub_info hub representation
+ * @param usb_device usb device representation
  * @return error code
  */
-static int usb_hub_set_configuration(usb_hub_info_t *hub_info) {
-        //device descriptor
-        usb_standard_device_descriptor_t *std_descriptor
-            = &hub_info->usb_device->descriptors.device;
-        usb_log_debug("Hub has %d configurations\n",
-            std_descriptor->configuration_count);
-        if (std_descriptor->configuration_count < 1) {
+static int usb_set_first_configuration(usb_device_t *usb_device)
+{
+        assert(usb_device);
+        /* Get number of possible configurations from device descriptor */
+        const size_t configuration_count =
+            usb_device->descriptors.device.configuration_count;
+        usb_log_debug("Hub has %zu configurations.\n", configuration_count);
+
+        if (configuration_count < 1) {
                 usb_log_error("There are no configurations available\n");
                 return EINVAL;
         }
 
+        // TODO: Make sure that there is enough data and the cast is correct
         usb_standard_configuration_descriptor_t *config_descriptor
             = (usb_standard_configuration_descriptor_t *)
-            hub_info->usb_device->descriptors.configuration;
-
-        /* Set configuration. */
-        int opResult = usb_request_set_configuration(
-            &hub_info->usb_device->ctrl_pipe,
-            config_descriptor->configuration_number);
-
+            usb_device->descriptors.configuration;
+
+        /* Set configuration. Use the configuration that was in
+         * usb_device->descriptors.configuration i.e. The first one. */
+        const int opResult = usb_request_set_configuration(
+            &usb_device->ctrl_pipe, config_descriptor->configuration_number);
         if (opResult != EOK) {
                 usb_log_error("Failed to set hub configuration: %s.\n",
                     str_error(opResult));
-                return opResult;
-        }
-        usb_log_debug("\tUsed configuration %d\n",
-            config_descriptor->configuration_number);
-
-        return EOK;
-}
-
-/**
- * create and start fibril with hub control loop
- *
- * Before the fibril is started, the control pipe and host controller
- * connection of the hub is open.
- *
- * @param hub_info hub representing structure
- * @return error code
- */
-static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info) {
-        int rc;
-
-        rc = usb_device_auto_poll(hub_info->usb_device, 0,
-            hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1,
-            usb_hub_polling_terminated_callback, hub_info);
-        if (rc != EOK) {
-                usb_log_error("Failed to create polling fibril: %s.\n",
-                    str_error(rc));
-                free(hub_info);
-                return rc;
-        }
-
-        usb_log_info("Controlling hub `%s' (%zu ports).\n",
-            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
-        return EOK;
-}
-
-//*********************************************
-//
-//  change handling functions
-//
-//*********************************************
-
-/**
- * process hub over current change
+        } else {
+                usb_log_debug("\tUsed configuration %d\n",
+                    config_descriptor->configuration_number);
+        }
+        return opResult;
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Process hub over current change
  *
  * This means either to power off the hub or power it on.
@@ -370 +341 @@
  * @return error code
  */
-static int usb_process_hub_over_current(usb_hub_info_t *hub_info,
-    usb_hub_status_t status) {
-        int opResult;
-        if (usb_hub_is_status(status, USB_HUB_FEATURE_HUB_OVER_CURRENT)) {
-                //poweroff all ports
-                unsigned int port;
+static void usb_hub_over_current(const usb_hub_info_t *hub_info,
+    usb_hub_status_t status)
+{
+        if (status & USB_HUB_STATUS_OVER_CURRENT) {
+                /* Hub should remove power from all ports if it detects OC */
+                usb_log_warning("Detected hub over-current condition, "
+                    "all ports should be powered off.");
+        } else {
+                /* Over-current condition is gone, it is safe to turn the
+                 * ports on. */
+                size_t port;
                 for (port = 1; port <= hub_info->port_count; ++port) {
-                        opResult = usb_hub_clear_port_feature(
-                            hub_info->control_pipe, port,
-                            USB_HUB_FEATURE_PORT_POWER);
+                        const int opResult = usb_hub_port_set_feature(
+                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_warning(
-                                    "Cannot power off port %d;  %s\n",
+                                    "HUB OVER-CURRENT GONE: Cannot power on "
+                                    "port %zu;  %s\n",
                                     port, str_error(opResult));
                         }
                 }
-        } else {
-                //power all ports
-                unsigned int port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
-                        opResult = usb_hub_set_port_feature(
-                            hub_info->control_pipe, port,
-                            USB_HUB_FEATURE_PORT_POWER);
-                        if (opResult != EOK) {
-                                usb_log_warning(
-                                    "Cannot power off port %d;  %s\n",
-                                    port, str_error(opResult));
-                        }
-                }
-        }
-        return opResult;
-}
-
-/**
- * process hub local power change
- *
- * This change is ignored.
+        }
+        const int opResult = usb_request_clear_feature(
+            &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
+            USB_REQUEST_RECIPIENT_DEVICE,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
+        if (opResult != EOK) {
+                usb_log_error(
+                    "Failed to clear hub over-current change flag: %s.\n",
+                    str_error(opResult));
+        }
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Process hub interrupts.
+ *
+ * The change can be either in the over-current condition or local-power change.
  * @param hub_info hub instance
- * @param status hub status bitmask
- * @return error code
- */
-static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info,
-    usb_hub_status_t status) {
-        int opResult = EOK;
-        opResult = usb_hub_clear_feature(hub_info->control_pipe,
-            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
-        if (opResult != EOK) {
-                usb_log_error("Cannnot clear hub power change flag: "
-                    "%s\n",
-                    str_error(opResult));
-        }
-        return opResult;
-}
-
-/**
- * process hub interrupts
- *
- * The change can be either in the over-current condition or
- * local-power change.
- * @param hub_info hub instance
- */
-static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info) {
+ */
+static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info)
+{
+        assert(hub_info);
+        assert(hub_info->usb_device);
         usb_log_debug("Global interrupt on a hub\n");
-        usb_pipe_t *pipe = hub_info->control_pipe;
-        int opResult;
-
-        usb_port_status_t status;
+        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+
+        usb_hub_status_t status;
         size_t rcvd_size;
-        usb_device_request_setup_packet_t request;
-        //int opResult;
-        usb_hub_set_hub_status_request(&request);
-        //endpoint 0
-
-        opResult = usb_pipe_control_read(
-            pipe,
-            &request, sizeof (usb_device_request_setup_packet_t),
-            &status, 4, &rcvd_size
-            );
+        /* NOTE: We can't use standard USB GET_STATUS request, because
+         * hubs reply is 4byte instead of 2 */
+        const int opResult = usb_pipe_control_read(control_pipe,
+            &get_hub_status_request, sizeof(get_hub_status_request),
+            &status, sizeof(usb_hub_status_t), &rcvd_size);
         if (opResult != EOK) {
                 usb_log_error("Could not get hub status: %s\n",
@@ -453 +399 @@
                 return;
         }
-        if (rcvd_size != sizeof (usb_port_status_t)) {
+        if (rcvd_size != sizeof(usb_hub_status_t)) {
                 usb_log_error("Received status has incorrect size\n");
                 return;
         }
-        //port reset
-        if (
-            usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT)) {
-                usb_process_hub_over_current(hub_info, status);
-        }
-        if (
-            usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) {
-                usb_process_hub_local_power_change(hub_info, status);
-        }
-}
-
+
+        /* Handle status changes */
+        if (status & USB_HUB_STATUS_C_OVER_CURRENT) {
+                usb_hub_over_current(hub_info, status);
+        }
+
+        if (status & USB_HUB_STATUS_C_LOCAL_POWER) {
+                /* NOTE: Handling this is more complicated.
+                 * If the transition is from bus power to local power, all
+                 * is good and we may signal the parent hub that we don't
+                 * need the power.
+                 * If the transition is from local power to bus power
+                 * the hub should turn off all the ports and devices need
+                 * to be reinitialized taking into account the limited power
+                 * that is now available.
+                 * There is no support for power distribution in HelenOS,
+                 * (or other OSes/hub devices that I've seen) so this is not
+                 * implemented.
+                 * Just ACK the change.
+                 */
+                const int opResult = usb_request_clear_feature(
+                    control_pipe, USB_REQUEST_TYPE_CLASS,
+                    USB_REQUEST_RECIPIENT_DEVICE,
+                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
+                if (opResult != EOK) {
+                        usb_log_error(
+                            "Failed to clear hub power change flag: %s.\n",
+                            str_error(opResult));
+                }
+        }
+}
+/*----------------------------------------------------------------------------*/
 /**
  * callback called from hub polling fibril when the fibril terminates
@@ -477 +444 @@
  */
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
-    bool was_error, void *data) {
-        usb_hub_info_t * hub = data;
+    bool was_error, void *data)
+{
+        usb_hub_info_t *hub = data;
         assert(hub);
 
@@ -492 +460 @@
          */
         if (hub->pending_ops_count > 0) {
-                fibril_mutex_lock(&hub->port_mutex);
                 size_t port;
                 for (port = 0; port < hub->port_count; port++) {
-                        usb_hub_port_t *the_port = hub->ports + port;
-                        fibril_mutex_lock(&the_port->reset_mutex);
-                        the_port->reset_completed = true;
-                        the_port->reset_okay = false;
-                        fibril_condvar_broadcast(&the_port->reset_cv);
-                        fibril_mutex_unlock(&the_port->reset_mutex);
+                        usb_hub_port_reset_fail(&hub->ports[port]);
                 }
-                fibril_mutex_unlock(&hub->port_mutex);
         }
         /* And now wait for them. */
@@ -516 +477 @@
         free(hub);
 }
-
-
-
-
 /**
  * @}

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup drvusbhub
  * @{
@@ -49 +49 @@
 #define NAME "usbhub"
 
-#include "ports.h"
+#include "port.h"
 
 /** Information about attached hub. */
@@ -56 +56 @@
         size_t port_count;
 
-        /** attached device handles, for each port one */
+        /** Attached device handles, for each port one */
         usb_hub_port_t *ports;
 
-        fibril_mutex_t port_mutex;
-
-        /** connection to hcd */
+        /** Connection to hcd */
         usb_hc_connection_t connection;
 
-        /** default address is used indicator
-         *
-         * If default address is requested by this device, it cannot
-         * be requested by the same hub again, otherwise a deadlock will occur.
-         */
-        bool is_default_address_used;
-
-        /** convenience pointer to status change pipe
-         *
-         * Status change pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * status_change_pipe;
-
-        /** convenience pointer to control pipe
-         *
-         * Control pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * control_pipe;
-
-        /** generic usb device data*/
-        usb_device_t * usb_device;
+        /** Generic usb device data*/
+        usb_device_t *usb_device;
 
         /** Number of pending operations on the mutex to prevent shooting
@@ -101 +76 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
-
 };
 

uspace/drv/bus/usb/usbmast/main.c

@@ -94 +94 @@
 
         /* Allocate softstate */
-        mdev = calloc(1, sizeof(usbmast_dev_t));
+        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -125 +124 @@
 error:
         /* XXX Destroy functions */
-        if (mdev != NULL)
-                free(mdev);
         return rc;
 }
@@ -158 +155 @@
         }
 
-        free(fun_name);
-
         /* Allocate soft state */
-        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
+        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
         if (mfun == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -171 +166 @@
         mfun->lun = lun;
 
-        fun_name = NULL;
-
         /* Set up a connection handler. */
         fun->conn_handler = usbmast_bd_connection;
-        fun->driver_data = mfun;
 
         usb_log_debug("Inquire...\n");
@@ -219 +211 @@
                 goto error;
         }
+
+        free(fun_name);
 
         return EOK;

uspace/drv/infrastructure/rootvirt/devices.def

@@ -4 +4 @@
  * Unless the list is empty, the last item shall be followed by a comma.
  */
+
+/* Loopback network interface */
+{
+    .name = "lo",
+    .match_id = "virtual&loopback"
+},
+
 #ifdef CONFIG_TEST_DRIVERS
+
 {
         .name = "test1",
@@ -25 +33 @@
         .match_id = "virtual&test3"
 },
+
 #endif
+
 #ifdef CONFIG_RUN_VIRTUAL_USB_HC
+
 /* Virtual USB host controller. */
 {
@@ -32 +43 @@
         .match_id = "usb&hc=vhc"
 },
+
 #endif

uspace/drv/nic/lo/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2011 Radim Vansa
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -Iinclude
-LIBRARY = libpacket
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include
+BINARY = lo
 
 SOURCES = \
-        generic/packet_server.c
+        lo.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/nic/ne2k/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2011 Radim Vansa
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
-
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
-
--include $(COMMON_MAKEFILE)
--include $(CONFIG_MAKEFILE)
-
-BINARY = lo
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include
+BINARY = ne2k
 
 SOURCES = \
-        lo.c
+        dp8390.c \
+        ne2k.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/nic/ne2k/dp8390.c

@@ -2 +2 @@
  * Copyright (c) 2009 Lukas Mejdrech
  * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -38 +39 @@
  */
 
-/** @addtogroup ne2000
- *  @{
- */
-
-/** @file
+/**
+ * @addtogroup drv_ne2k
+ * @{
+ */
+
+/**
+ * @file
+ * @brief NE2000 driver core
  *
  * NE2000 (based on DP8390) network interface core implementation.
@@ -65 +69 @@
 #define SQ_PAGES  6
 
-/* NE2000 implementation. */
-
-/** NE2000 Data Register */
-#define NE2K_DATA  0x0010
-
-/** NE2000 Reset register */
-#define NE2K_RESET  0x001f
-
-/** NE2000 data start */
-#define NE2K_START  0x4000
-
-/** NE2000 data size */
-#define NE2K_SIZE  0x4000
-
-/** NE2000 retry count */
-#define NE2K_RETRY  0x1000
-
-/** NE2000 error messages rate limiting */
-#define NE2K_ERL  10
-
-/** Minimum Ethernet packet size in bytes */
-#define ETH_MIN_PACK_SIZE  60
-
-/** Maximum Ethernet packet size in bytes */
-#define ETH_MAX_PACK_SIZE_TAGGED  1518
-
 /** Type definition of the receive header
  *
@@ -216 +194 @@
  *
  */
-int ne2k_probe(ne2k_t *ne2k, void *port, int irq)
+int ne2k_probe(ne2k_t *ne2k)
 {
         unsigned int i;
-        
-        /* General initialization */
-        ne2k->port = port;
-        ne2k->data_port = ne2k->port + NE2K_DATA;
-        ne2k->irq = irq;
-        ne2k->probed = false;
-        ne2k->up = false;
         
         ne2k_init(ne2k);
@@ -247 +218 @@
         
         for (i = 0; i < ETH_ADDR; i++)
-                ne2k->mac[i] = pio_read_16(ne2k->data_port);
-        
-        ne2k->probed = true;
+                ne2k->mac.address[i] = pio_read_16(ne2k->data_port);
+        
         return EOK;
+}
+
+void ne2k_set_physical_address(ne2k_t *ne2k, const nic_address_t *address)
+{
+        memcpy(&ne2k->mac, address, sizeof(nic_address_t));
+        
+        pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STP);
+        
+        pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1);
+        pio_write_8(ne2k->port + DP_RBCR1, 0);
+        pio_write_8(ne2k->port + DP_RSAR0, 0);
+        pio_write_8(ne2k->port + DP_RSAR1, 0);
+        pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA);
+
+        size_t i;
+        for (i = 0; i < ETH_ADDR; i++)
+                pio_write_16(ne2k->data_port, ne2k->mac.address[i]);
+
+        //pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA);
 }
 
@@ -304 +293 @@
         
         /* Step 4: */
-        pio_write_8(ne2k->port + DP_RCR, RCR_AB);
+        pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration);
         
         /* Step 5: */
@@ -324 +313 @@
         pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP);
         
-        pio_write_8(ne2k->port + DP_PAR0, ne2k->mac[0]);
-        pio_write_8(ne2k->port + DP_PAR1, ne2k->mac[1]);
-        pio_write_8(ne2k->port + DP_PAR2, ne2k->mac[2]);
-        pio_write_8(ne2k->port + DP_PAR3, ne2k->mac[3]);
-        pio_write_8(ne2k->port + DP_PAR4, ne2k->mac[4]);
-        pio_write_8(ne2k->port + DP_PAR5, ne2k->mac[5]);
-        
-        pio_write_8(ne2k->port + DP_MAR0, 0xff);
-        pio_write_8(ne2k->port + DP_MAR1, 0xff);
-        pio_write_8(ne2k->port + DP_MAR2, 0xff);
-        pio_write_8(ne2k->port + DP_MAR3, 0xff);
-        pio_write_8(ne2k->port + DP_MAR4, 0xff);
-        pio_write_8(ne2k->port + DP_MAR5, 0xff);
-        pio_write_8(ne2k->port + DP_MAR6, 0xff);
-        pio_write_8(ne2k->port + DP_MAR7, 0xff);
+        pio_write_8(ne2k->port + DP_PAR0, ne2k->mac.address[0]);
+        pio_write_8(ne2k->port + DP_PAR1, ne2k->mac.address[1]);
+        pio_write_8(ne2k->port + DP_PAR2, ne2k->mac.address[2]);
+        pio_write_8(ne2k->port + DP_PAR3, ne2k->mac.address[3]);
+        pio_write_8(ne2k->port + DP_PAR4, ne2k->mac.address[4]);
+        pio_write_8(ne2k->port + DP_PAR5, ne2k->mac.address[5]);
+        
+        pio_write_8(ne2k->port + DP_MAR0, 0);
+        pio_write_8(ne2k->port + DP_MAR1, 0);
+        pio_write_8(ne2k->port + DP_MAR2, 0);
+        pio_write_8(ne2k->port + DP_MAR3, 0);
+        pio_write_8(ne2k->port + DP_MAR4, 0);
+        pio_write_8(ne2k->port + DP_MAR5, 0);
+        pio_write_8(ne2k->port + DP_MAR6, 0);
+        pio_write_8(ne2k->port + DP_MAR7, 0);
         
         pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1);
@@ -372 +361 @@
 }
 
+static void ne2k_reset(ne2k_t *ne2k)
+{
+        unsigned int i;
+
+        fibril_mutex_lock(&ne2k->sq_mutex);
+
+        /* Stop the chip */
+        pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT);
+        pio_write_8(ne2k->port + DP_RBCR0, 0);
+        pio_write_8(ne2k->port + DP_RBCR1, 0);
+
+        for (i = 0; i < NE2K_RETRY; i++) {
+                if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0)
+                        break;
+        }
+
+        pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST);
+        pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT);
+        pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL);
+
+        /* Acknowledge the ISR_RDC (remote DMA) interrupt */
+        for (i = 0; i < NE2K_RETRY; i++) {
+                if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0)
+                        break;
+        }
+
+        uint8_t val = pio_read_8(ne2k->port + DP_ISR);
+        pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC);
+
+        /*
+         * Reset the transmit ring. If we were transmitting a frame,
+         * we pretend that the packet is processed. Higher layers will
+         * retransmit if the packet wasn't actually sent.
+         */
+        ne2k->sq.dirty = false;
+
+        fibril_mutex_unlock(&ne2k->sq_mutex);
+}
+
 /** Send a frame.
  *
@@ -378 +406 @@
  *
  */
-void ne2k_send(ne2k_t *ne2k, packet_t *packet)
-{
+void ne2k_send(nic_t *nic_data, packet_t *packet)
+{
+        ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
+
         assert(ne2k->probed);
         assert(ne2k->up);
-        
+
         fibril_mutex_lock(&ne2k->sq_mutex);
         
-        while (ne2k->sq.dirty)
+        while (ne2k->sq.dirty) {
                 fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex);
-        
+        }
         void *buf = packet_get_data(packet);
         size_t size = packet_get_data_length(packet);
@@ -393 +423 @@
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
                 fibril_mutex_unlock(&ne2k->sq_mutex);
-                fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n",
-                    NAME, size);
                 return;
         }
-        
+
         /* Upload the frame to the ethernet card */
         ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size);
         ne2k->sq.dirty = true;
         ne2k->sq.size = size;
-        
+
         /* Initialize the transfer */
         pio_write_8(ne2k->port + DP_TPSR, ne2k->sq.page);
@@ -408 +436 @@
         pio_write_8(ne2k->port + DP_TBCR1, (size >> 8) & 0xff);
         pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA);
-        
         fibril_mutex_unlock(&ne2k->sq_mutex);
-}
-
-static void ne2k_reset(ne2k_t *ne2k)
-{
-        unsigned int i;
-        
-        /* Stop the chip */
-        pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT);
-        pio_write_8(ne2k->port + DP_RBCR0, 0);
-        pio_write_8(ne2k->port + DP_RBCR1, 0);
-        
-        for (i = 0; i < NE2K_RETRY; i++) {
-                if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0)
-                        break;
-        }
-        
-        pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST);
-        pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT);
-        pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL);
-        
-        /* Acknowledge the ISR_RDC (remote DMA) interrupt */
-        for (i = 0; i < NE2K_RETRY; i++) {
-                if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0)
-                        break;
-        }
-        
-        uint8_t val = pio_read_8(ne2k->port + DP_ISR);
-        pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC);
-        
-        /*
-         * Reset the transmit ring. If we were transmitting a frame,
-         * we pretend that the packet is processed. Higher layers will
-         * retransmit if the packet wasn't actually sent.
-         */
-        fibril_mutex_lock(&ne2k->sq_mutex);
-        ne2k->sq.dirty = false;
-        fibril_mutex_unlock(&ne2k->sq_mutex);
-}
-
-static frame_t *ne2k_receive_frame(ne2k_t *ne2k, uint8_t page, size_t length)
-{
-        frame_t *frame = (frame_t *) malloc(sizeof(frame_t));
+
+        /* Relase packet */
+        nic_release_packet(nic_data, packet);
+}
+
+static nic_frame_t *ne2k_receive_frame(nic_t *nic_data, uint8_t page,
+        size_t length)
+{
+        ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
+
+        nic_frame_t *frame = nic_alloc_frame(nic_data, length);
         if (frame == NULL)
                 return NULL;
-        
-        link_initialize(&frame->link);
-        
-        frame->packet = netif_packet_get_1(length);
-        if (frame->packet == NULL) {
-                free(frame);
-                return NULL;
-        }
         
         void *buf = packet_suffix(frame->packet, length);
@@ -470 +458 @@
                 size_t left = (ne2k->stop_page - page) * DP_PAGE
                     - sizeof(recv_header_t);
-                
                 ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t),
                     left);
                 ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE,
                     length - left);
-        } else
+        } else {
                 ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t),
                     length);
-        
-        ne2k->stats.receive_packets++;
+        }
         return frame;
 }
 
-static list_t *ne2k_receive(ne2k_t *ne2k)
-{
+static void ne2k_receive(nic_t *nic_data)
+{
+        ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
         /*
          * Allocate memory for the list of received frames.
@@ -490 +477 @@
          * frames from the network, but they will be lost.
          */
-        list_t *frames = (list_t *) malloc(sizeof(list_t));
-        if (frames != NULL)
-                list_initialize(frames);
-        
-        while (true) {
+        nic_frame_list_t *frames = nic_alloc_frame_list();
+        size_t frames_count = 0;
+
+        /* We may block sending in this loop - after so many received frames there
+         * must be some interrupt pending (for the frames not yet downloaded) and
+         * we will continue in its handler. */
+        while (frames_count < 16) {
+                //TODO: isn't some locking necessary here?
                 uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1;
                 
@@ -503 +493 @@
                 uint8_t current = pio_read_8(ne2k->port + DP_CURR);
                 pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA);
-                
                 if (current == boundary)
                         /* No more frames to process */
@@ -520 +509 @@
                 
                 pio_read_buf_16(ne2k->data_port, (void *) &header, size);
-                
+
                 size_t length =
                     (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size;
@@ -527 +516 @@
                 if ((length < ETH_MIN_PACK_SIZE)
                     || (length > ETH_MAX_PACK_SIZE_TAGGED)) {
-                        fprintf(stderr, "%s: Rant frame (%zu bytes)\n", NAME, length);
                         next = current;
                 } else if ((header.next < ne2k->start_page)
                     || (header.next > ne2k->stop_page)) {
-                        fprintf(stderr, "%s: Malformed next frame %u\n", NAME,
-                            header.next);
                         next = current;
                 } else if (header.status & RSR_FO) {
@@ -539 +525 @@
                          * reset the buffers.
                          */
-                        fprintf(stderr, "%s: FIFO overrun\n", NAME);
                         ne2k->overruns++;
                         next = current;
                 } else if ((header.status & RSR_PRX) && (ne2k->up)) {
                         if (frames != NULL) {
-                                frame_t *frame = ne2k_receive_frame(ne2k, boundary, length);
-                                if (frame != NULL)
-                                        list_append(&frame->link, frames);
-                        }
+                                nic_frame_t *frame =
+                                        ne2k_receive_frame(nic_data, boundary, length);
+                                if (frame != NULL) {
+                                        nic_frame_list_append(frames, frame);
+                                        frames_count++;
+                                } else {
+                                        break;
+                                }
+                        } else
+                                break;
                 }
                 
@@ -560 +551 @@
                 else
                         next--;
-                
                 pio_write_8(ne2k->port + DP_BNRY, next);
         }
-        
-        return frames;
-}
-
-list_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr)
-{
-        /* List of received frames */
-        list_t *frames = NULL;
-        
+        nic_received_frame_list(nic_data, frames);
+}
+
+void ne2k_interrupt(nic_t *nic_data, uint8_t isr, uint8_t tsr)
+{
+        ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
+
         if (isr & (ISR_PTX | ISR_TXE)) {
-                if (isr & ISR_TXE)
-                        ne2k->stats.send_errors++;
-                else {
-                        if (tsr & TSR_PTX)
-                                ne2k->stats.send_packets++;
-                        
-                        if (tsr & TSR_COL)
-                                ne2k->stats.collisions++;
-                        
-                        if (tsr & TSR_ABT)
-                                ne2k->stats.send_aborted_errors++;
-                        
-                        if (tsr & TSR_CRS)
-                                ne2k->stats.send_carrier_errors++;
-                        
-                        if (tsr & TSR_FU) {
-                                ne2k->underruns++;
-                                if (ne2k->underruns < NE2K_ERL)
-                                        fprintf(stderr, "%s: FIFO underrun\n", NAME);
-                        }
-                        
-                        if (tsr & TSR_CDH) {
-                                ne2k->stats.send_heartbeat_errors++;
-                                if (ne2k->stats.send_heartbeat_errors < NE2K_ERL)
-                                        fprintf(stderr, "%s: CD heartbeat failure\n", NAME);
-                        }
-                        
-                        if (tsr & TSR_OWC)
-                                ne2k->stats.send_window_errors++;
+                if (tsr & TSR_COL) {
+                        nic_report_collisions(nic_data,
+                                pio_read_8(ne2k->port + DP_NCR) & 15);
                 }
-                
+
+                if (tsr & TSR_PTX) {
+                        // TODO: fix number of sent bytes (but how?)
+                        nic_report_send_ok(nic_data, 1, 0);
+                } else if (tsr & TSR_ABT) {
+                        nic_report_send_error(nic_data, NIC_SEC_ABORTED, 1);
+                } else if (tsr & TSR_CRS) {
+                        nic_report_send_error(nic_data, NIC_SEC_CARRIER_LOST, 1);
+                } else if (tsr & TSR_FU) {
+                        ne2k->underruns++;
+                        // if (ne2k->underruns < NE2K_ERL) {
+                        // }
+                } else if (tsr & TSR_CDH) {
+                        nic_report_send_error(nic_data, NIC_SEC_HEARTBEAT, 1);
+                        // if (nic_data->stats.send_heartbeat_errors < NE2K_ERL) {
+                        // }
+                } else if (tsr & TSR_OWC) {
+                        nic_report_send_error(nic_data, NIC_SEC_WINDOW_ERROR, 1);
+                }
+
                 fibril_mutex_lock(&ne2k->sq_mutex);
-                
                 if (ne2k->sq.dirty) {
                         /* Prepare the buffer for next packet */
@@ -615 +595 @@
                 } else {
                         ne2k->misses++;
-                        if (ne2k->misses < NE2K_ERL)
-                                fprintf(stderr, "%s: Spurious PTX interrupt\n", NAME);
+                        // if (ne2k->misses < NE2K_ERL) {
+                        // }
                 }
-                
                 fibril_mutex_unlock(&ne2k->sq_mutex);
         }
-        
-        if (isr & ISR_RXE)
-                ne2k->stats.receive_errors++;
-        
+
         if (isr & ISR_CNT) {
-                ne2k->stats.receive_crc_errors +=
-                    pio_read_8(ne2k->port + DP_CNTR0);
-                ne2k->stats.receive_frame_errors +=
-                    pio_read_8(ne2k->port + DP_CNTR1);
-                ne2k->stats.receive_missed_errors +=
-                    pio_read_8(ne2k->port + DP_CNTR2);
-        }
-        
-        if (isr & ISR_PRX)
-                frames = ne2k_receive(ne2k);
-        
+                unsigned int errors;
+                for (errors = pio_read_8(ne2k->port + DP_CNTR0); errors > 0; --errors)
+                        nic_report_receive_error(nic_data, NIC_REC_CRC, 1);
+                for (errors = pio_read_8(ne2k->port + DP_CNTR1); errors > 0; --errors)
+                        nic_report_receive_error(nic_data, NIC_REC_FRAME_ALIGNMENT, 1);
+                for (errors = pio_read_8(ne2k->port + DP_CNTR2); errors > 0; --errors)
+                        nic_report_receive_error(nic_data, NIC_REC_MISSED, 1);
+        }
+        if (isr & ISR_PRX) {
+                ne2k_receive(nic_data);
+        }
         if (isr & ISR_RST) {
                 /*
@@ -648 +624 @@
         pio_write_8(ne2k->port + DP_IMR,
             IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE);
-        
-        return frames;
+}
+
+void ne2k_set_accept_bcast(ne2k_t *ne2k, int accept)
+{
+        if (accept)
+                ne2k->receive_configuration |= RCR_AB;
+        else
+                ne2k->receive_configuration &= ~RCR_AB;
+        
+        pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration);
+}
+
+void ne2k_set_accept_mcast(ne2k_t *ne2k, int accept)
+{
+        if (accept)
+                ne2k->receive_configuration |= RCR_AM;
+        else
+                ne2k->receive_configuration &= ~RCR_AM;
+        
+        pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration);
+}
+
+void ne2k_set_promisc_phys(ne2k_t *ne2k, int promisc)
+{
+        if (promisc)
+                ne2k->receive_configuration |= RCR_PRO;
+        else
+                ne2k->receive_configuration &= ~RCR_PRO;
+        
+        pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration);
+}
+
+void ne2k_set_mcast_hash(ne2k_t *ne2k, uint64_t hash)
+{
+        /* Select Page 1 and stop all transfers */
+        pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP);
+        
+        pio_write_8(ne2k->port + DP_MAR0, (uint8_t) hash);
+        pio_write_8(ne2k->port + DP_MAR1, (uint8_t) (hash >> 8));
+        pio_write_8(ne2k->port + DP_MAR2, (uint8_t) (hash >> 16));
+        pio_write_8(ne2k->port + DP_MAR3, (uint8_t) (hash >> 24));
+        pio_write_8(ne2k->port + DP_MAR4, (uint8_t) (hash >> 32));
+        pio_write_8(ne2k->port + DP_MAR5, (uint8_t) (hash >> 40));
+        pio_write_8(ne2k->port + DP_MAR6, (uint8_t) (hash >> 48));
+        pio_write_8(ne2k->port + DP_MAR7, (uint8_t) (hash >> 56));
+        
+        /* Select Page 0 and resume transfers */
+        pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA);
 }
 

uspace/drv/nic/ne2k/dp8390.h

@@ -2 +2 @@
  * Copyright (c) 2009 Lukas Mejdrech
  * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -38 +39 @@
  */
 
-/** @addtogroup ne2000
+/** @addtogroup drv_ne2k
  *  @{
  */
@@ -50 +51 @@
 
 #include <fibril_synch.h>
-#include <adt/list.h>
-#include <net/packet.h>
-#include <netif_skel.h>
-
-/** Module name */
-#define NAME  "ne2000"
+#include <nic.h>
+#include <ddf/interrupt.h>
 
 /** Input/output size */
 #define NE2K_IO_SIZE  0x0020
 
-/** Ethernet address length */
-#define ETH_ADDR  6
+/* NE2000 implementation. */
+
+/** NE2000 Data Register */
+#define NE2K_DATA  0x0010
+
+/** NE2000 Reset register */
+#define NE2K_RESET  0x001f
+
+/** NE2000 data start */
+#define NE2K_START  0x4000
+
+/** NE2000 data size */
+#define NE2K_SIZE  0x4000
+
+/** NE2000 retry count */
+#define NE2K_RETRY  0x1000
+
+/** NE2000 error messages rate limiting */
+#define NE2K_ERL  10
+
+/** Minimum Ethernet packet size in bytes */
+#define ETH_MIN_PACK_SIZE  60
+
+/** Maximum Ethernet packet size in bytes */
+#define ETH_MAX_PACK_SIZE_TAGGED  1518
 
 /* National Semiconductor DP8390 Network Interface Controller. */
@@ -204 +224 @@
 typedef struct {
         /* Device configuration */
+        void *base_port; /**< Port assigned from ISA configuration **/
         void *port;
         void *data_port;
         int irq;
-        uint8_t mac[ETH_ADDR];
+        nic_address_t mac;
         
         uint8_t start_page;  /**< Ring buffer start page */
@@ -224 +245 @@
         bool probed;
         bool up;
-        
+
+        /* Irq code with assigned addresses for this device */
+        irq_code_t code;
+
+        /* Copy of the receive configuration register */
+        uint8_t receive_configuration;
+
         /* Device statistics */
-        device_stats_t stats;
+        // TODO: shouldn't be these directly in device.h - nic_device_stats?
         uint64_t misses;     /**< Receive frame misses */
         uint64_t underruns;  /**< FIFO underruns */
@@ -232 +259 @@
 } ne2k_t;
 
-typedef struct {
-        link_t link;
-        packet_t *packet;
-} frame_t;
-
-extern int ne2k_probe(ne2k_t *, void *, int);
+extern int ne2k_probe(ne2k_t *);
 extern int ne2k_up(ne2k_t *);
 extern void ne2k_down(ne2k_t *);
-extern void ne2k_send(ne2k_t *, packet_t *);
-extern list_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t);
+extern void ne2k_send(nic_t *, packet_t *);
+extern void ne2k_interrupt(nic_t *, uint8_t, uint8_t);
+extern packet_t *ne2k_alloc_packet(nic_t *, size_t);
+
+extern void ne2k_set_accept_mcast(ne2k_t *, int);
+extern void ne2k_set_accept_bcast(ne2k_t *, int);
+extern void ne2k_set_promisc_phys(ne2k_t *, int);
+extern void ne2k_set_mcast_hash(ne2k_t *, uint64_t);
+extern void ne2k_set_physical_address(ne2k_t *, const nic_address_t *address);
 
 #endif