Changeset fbfe59d in mainline for uspace/lib/c/generic/ddi.c

Timestamp:

2018-06-25T21:45:05Z (7 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/lib/c/generic/ddi.c (modified) (5 diffs)

uspace/lib/c/generic/ddi.c

@@ -220 +220 @@
 /** Enable PIO for specified HW resource wrt. to the PIO window.
  *
- * @param win      PIO window. May be NULL if the resources are known to be
- *                 absolute.
- * @param res      Resources specifying the I/O range wrt. to the PIO window.
- * @param virt     Virtual address for application's PIO operations.
+ * @param win        PIO window. May be NULL if the resources are known to be
+ *                   absolute.
+ * @param res        Resources specifying the I/O range wrt. to the PIO window.
+ * @param[out] virt  Virtual address for application's PIO operations.
+ * @param[out] phys  If non-NULL, physical address of the resource
+ * @param[out] size  If non-NULL, size of the enabled resource.
  *
  * @return EOK on success.
@@ -229 +231 @@
  *
  */
-errno_t pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt)
+errno_t pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt,
+    uintptr_t *phys, size_t *size)
 {
         uintptr_t addr;
-        size_t size;
+        size_t sz;
 
         switch (res->type) {
@@ -242 +245 @@
                         addr += win->io.base;
                 }
-                size = res->res.io_range.size;
+                sz = res->res.io_range.size;
                 break;
         case MEM_RANGE:
@@ -251 +254 @@
                         addr += win->mem.base;
                 }
-                size = res->res.mem_range.size;
+                sz = res->res.mem_range.size;
                 break;
         default:
@@ -257 +260 @@
         }
 
-        return pio_enable((void *) addr, size, virt);
+        if (phys)
+                *phys = addr;
+        if (size)
+                *size = sz;
+
+        return pio_enable((void *) addr, sz, virt);
 }