Changes in uspace/drv/nic/e1k/e1k.c [8820544:99e8fb7b] in mainline

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