Changes in uspace/drv/nic/rtl8139/driver.c [8820544:d87561c] in mainline

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -27 +27 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <assert.h>
 #include <errno.h>
@@ -32 +35 @@
 #include <byteorder.h>
 #include <libarch/barrier.h>
+
 #include <as.h>
 #include <ddf/log.h>
@@ -37 +41 @@
 #include <io/log.h>
 #include <nic.h>
-#include <pci_dev_iface.h>
-#include <irc.h>
-#include <stdio.h>
+#include <device/pci.h>
+
+#include <ipc/irc.h>
+#include <sysinfo.h>
+#include <ipc/ns.h>
+
 #include <str.h>
 
@@ -183 +190 @@
         return;
 }
+
+#include <device/pci.h>
 
 /** Set PmEn (Power management enable) bit value
@@ -852 +861 @@
 /** Handle device interrupt
  *
- * @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)
+ *  @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)
 {
         assert(dev);
@@ -954 +962 @@
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
         rtl8139_hw_int_enable(rtl8139);
-
-        int rc = irc_enable_interrupt(rtl8139->irq);
-        if (rc != EOK) {
-                rtl8139_on_stopped(nic_data);
-                return rc;
-        }
+        nic_enable_interrupt(nic_data, rtl8139->irq);
 
         ddf_msg(LVL_DEBUG, "Device activated, interrupt %d registered", rtl8139->irq);
@@ -1084 +1087 @@
         ddf_msg(LVL_DEBUG, "%s device: irq 0x%x assigned", ddf_dev_get_name(dev), rtl8139->irq);
 
-        rtl8139->io_addr = IOADDR_TO_PTR(RNGABS(hw_resources->io_ranges.ranges[0]));
+        rtl8139->io_addr = IOADDR_TO_PTR(hw_resources->io_ranges.ranges[0].address);
         if (hw_resources->io_ranges.ranges[0].size < RTL8139_IO_SIZE) {
                 ddf_msg(LVL_ERROR, "i/o range assigned to the device "
@@ -1140 +1143 @@
 
         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);
+
+        rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, AS_AREA_WRITE, 0,
+            &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Can not allocate transmitter buffers.");
@@ -1161 +1163 @@
         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);
+
+        rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, AS_AREA_READ, 0,
+            &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Can not allocate receive buffer.");
@@ -1324 +1325 @@
                 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) {
@@ -1329 +1336 @@
                 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);
@@ -1354 +1361 @@
         ddf_fun_destroy(fun);
 err_srv:
+        /* XXX Disconnect from services */
+err_irq:
         unregister_interrupt_handler(dev, rtl8139->irq);
 err_pio:
@@ -2171 +2180 @@
 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);
 }