Changeset fbfe59d in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2018-06-25T21:45:05Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8119363

Parents:

2498b95 (diff), e3107e2 (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 branch 'virtio-net'

This commit merges basic support for the virtio-net NIC. As of now, the
driver does not support any advanced features that might be supported by
the device. Also device removal is not yet supported.

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (3 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -738 +738 @@
 
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[0],
-                    (void **) &bus->conf_space)) {
+                    &hw_resources.resources[0], (void **) &bus->conf_space,
+                    NULL, NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to map configuration space.");
@@ -759 +759 @@
 
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[0],
-                    (void **) &bus->conf_addr_reg)) {
+                    &hw_resources.resources[0], (void **) &bus->conf_addr_reg,
+                    NULL, NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to enable configuration ports.");
@@ -767 +767 @@
                 }
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[1],
-                    (void **) &bus->conf_data_reg)) {
+                    &hw_resources.resources[1], (void **) &bus->conf_data_reg,
+                    NULL, NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to enable configuration ports.");