Changeset 8e7c9fe in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/drv/nic/e1k/e1k.c (modified) (15 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -33 +33 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <assert.h>
 #include <stdio.h>
@@ -42 +39 @@
 #include <align.h>
 #include <byteorder.h>
-#include <sysinfo.h>
-#include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <irc.h>
+#include <as.h>
 #include <ddi.h>
-#include <as.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -76 +71 @@
 /** ddf_fun_t * -> nic_driver_data_t* cast */
 #define NIC_DATA_FUN(fun) \
-        ((nic_t *) ddf_fun_data_get(fun))
+        ((nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun)))
 
 /** ddf_dev_t * -> nic_driver_data_t* cast */
@@ -1234 +1229 @@
 /** Handle device interrupt
  *
- * @param dev   E1000 device
  * @param iid   IPC call id
  * @param icall IPC call structure
- *
- */
-static void e1000_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
-    ipc_call_t *icall)
+ * @param dev   E1000 device
+ *
+ */
+static void e1000_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         uint32_t icr = (uint32_t) IPC_GET_ARG2(*icall);
@@ -1375 +1370 @@
         fibril_mutex_lock(&e1000->rx_lock);
         
+        e1000->rx_ring_virt = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(
             E1000_RX_FRAME_COUNT * sizeof(e1000_rx_descriptor_t),
@@ -1396 +1392 @@
         }
         
-        size_t i;
-        uintptr_t frame_phys;
-        void *frame_virt;
-        
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+                uintptr_t frame_phys;
+                void *frame_virt = AS_AREA_ANY;
+                
                 rc = dmamem_map_anonymous(E1000_MAX_SEND_FRAME_SIZE,
                     DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
@@ -1412 +1407 @@
         
         /* Write descriptor */
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++)
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++)
                 e1000_fill_new_rx_descriptor(nic, i);
         
@@ -1421 +1416 @@
         
 error:
-        for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
+        for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) {
                 if (e1000->rx_frame_virt[i] != NULL) {
                         dmamem_unmap_anonymous(e1000->rx_frame_virt[i]);
@@ -1571 +1566 @@
         
         e1000->tx_ring_phys = 0;
-        e1000->tx_ring_virt = NULL;
+        e1000->tx_ring_virt = AS_AREA_ANY;
         
         e1000->tx_frame_phys = NULL;
@@ -1597 +1592 @@
         
         for (i = 0; i < E1000_TX_FRAME_COUNT; i++) {
+                e1000->tx_frame_virt[i] = AS_AREA_ANY;
                 rc = dmamem_map_anonymous(E1000_MAX_SEND_FRAME_SIZE,
                     DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
@@ -1757 +1753 @@
         e1000_enable_interrupts(e1000);
         
-        nic_enable_interrupt(nic, e1000->irq);
+        int rc = irc_enable_interrupt(e1000->irq);
+        if (rc != EOK) {
+                e1000_disable_interrupts(e1000);
+                fibril_mutex_unlock(&e1000->ctrl_lock);
+                fibril_mutex_unlock(&e1000->tx_lock);
+                fibril_mutex_unlock(&e1000->rx_lock);
+                return rc;
+        }
         
         e1000_clear_rx_ring(e1000);
@@ -1795 +1798 @@
         e1000_disable_rx(e1000);
         
-        nic_disable_interrupt(nic, e1000->irq);
+        irc_disable_interrupt(e1000->irq);
         e1000_disable_interrupts(e1000);
         
@@ -2147 +2150 @@
         nic_set_ddf_fun(nic, fun);
         ddf_fun_set_ops(fun, &e1000_dev_ops);
-        ddf_fun_data_implant(fun, nic);
         
         rc = e1000_register_int_handler(nic);
         if (rc != EOK)
                 goto err_fun_create;
-        
-        rc = nic_connect_to_services(nic);
-        if (rc != EOK)
-                goto err_irq;
         
         rc = e1000_initialize_rx_structure(nic);
@@ -2378 +2376 @@
 int main(void)
 {
-        int rc = nic_driver_init(NAME);
-        if (rc != EOK)
-                return rc;
+        printf("%s: HelenOS E1000 network adapter driver\n", NAME);
+        
+        if (nic_driver_init(NAME) != EOK)
+                return 1;
         
         nic_driver_implement(&e1000_driver_ops, &e1000_dev_ops,
@@ -2386 +2385 @@
         
         ddf_log_init(NAME);
-        ddf_msg(LVL_NOTE, "HelenOS E1000 driver started");
         return ddf_driver_main(&e1000_driver);
 }