Changeset 15d0046 in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (11 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -27 +27 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <assert.h>
 #include <errno.h>
@@ -35 +32 @@
 #include <byteorder.h>
 #include <libarch/barrier.h>
-
 #include <as.h>
 #include <ddf/log.h>
@@ -42 +38 @@
 #include <nic.h>
 #include <pci_dev_iface.h>
-
-#include <ipc/irc.h>
-#include <sysinfo.h>
-#include <ipc/ns.h>
-
+#include <irc.h>
+#include <stdio.h>
 #include <str.h>
 
@@ -859 +852 @@
 /** Handle device interrupt
  *
- *  @param dev    The rtl8139 device
- *  @param iid    The IPC call id
- *  @param icall  The IPC call structure
- */
-static void rtl8139_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
-    ipc_call_t *icall)
+ * @param iid    The IPC call id
+ * @param icall  The IPC call structure
+ * @param dev    The rtl8139 device
+ *
+ */
+static void rtl8139_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         assert(dev);
@@ -960 +954 @@
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
         rtl8139_hw_int_enable(rtl8139);
-        nic_enable_interrupt(nic_data, rtl8139->irq);
+
+        int rc = irc_enable_interrupt(rtl8139->irq);
+        if (rc != EOK) {
+                rtl8139_on_stopped(nic_data);
+                return rc;
+        }
 
         ddf_msg(LVL_DEBUG, "Device activated, interrupt %d registered", rtl8139->irq);
@@ -1141 +1140 @@
 
         ddf_msg(LVL_DEBUG, "Creating buffers");
-
+        
+        rtl8139->tx_buff_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, DMAMEM_4GiB,
             AS_AREA_WRITE, 0, &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);
@@ -1161 +1161 @@
         ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes",
             RxBUF_TOT_LENGTH);
-
+        
+        rtl8139->rx_buff_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, DMAMEM_4GiB,
             AS_AREA_READ, 0, &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);
@@ -1323 +1324 @@
                 goto err_pio;
 
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
-                goto err_irq;
-        }
-
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
         if (fun == NULL) {
@@ -1334 +1329 @@
                 goto err_srv;
         }
+
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &rtl8139_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
 
         rc = ddf_fun_bind(fun);
@@ -1359 +1354 @@
         ddf_fun_destroy(fun);
 err_srv:
-        /* XXX Disconnect from services */
-err_irq:
         unregister_interrupt_handler(dev, rtl8139->irq);
 err_pio:
@@ -2178 +2171 @@
 int main(void)
 {
+        printf("%s: HelenOS RTL8139 network adapter driver\n", NAME);
+
         int rc = nic_driver_init(NAME);
         if (rc != EOK)
                 return rc;
-        nic_driver_implement(
-                &rtl8139_driver_ops, &rtl8139_dev_ops, &rtl8139_nic_iface);
+
+        nic_driver_implement(&rtl8139_driver_ops, &rtl8139_dev_ops,
+            &rtl8139_nic_iface);
 
         ddf_log_init(NAME);
-        ddf_msg(LVL_NOTE, "HelenOS RTL8139 driver started");
         return ddf_driver_main(&rtl8139_driver);
 }