Changeset 792807f in mainline for uspace/lib/c/include/ddi.h

Timestamp:

2011-12-16T21:16:23Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8708be3, 9fe4db3

Parents:

9916841 (diff), c4be33a (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:

the Intel E1000 is now working and usable on ia32
(other platforms untested so far)

File:

• uspace/lib/c/include/ddi.h (modified) (1 diff)

uspace/lib/c/include/ddi.h

@@ -40 +40 @@
 #include <task.h>
 
-typedef struct {
-        /** Physical memory */
-        void *phys;
-        
-        /** Virtual memory */
-        void *virt;
-        
-        /** Size in pages */
-        size_t size;
-        
-        /** Mapping flags */
-        unsigned int flags;
-} dmamem_t;
+extern int device_assign_devno(void);
 
-extern int device_assign_devno(void);
 extern int physmem_map(void *, void *, size_t, unsigned int);
-extern int dmamem_map(dmamem_t *, size_t, unsigned int, unsigned int);
-extern int dmamem_unmap(dmamem_t *);
-extern int dmamem_lock(void *, void **, size_t);
-extern int dmamem_unlock(void *, size_t);
+
+extern int dmamem_map(void *, size_t, unsigned int, unsigned int, void **);
+extern int dmamem_map_anonymous(size_t, unsigned int, unsigned int, void **,
+    void **);
+extern int dmamem_unmap(void *, size_t, unsigned int);
+extern int dmamem_unmap_anonymous(void *);
+
 extern int iospace_enable(task_id_t, void *, unsigned long);
 extern int pio_enable(void *, size_t, void **);
+
 extern int register_irq(int, int, int, irq_code_t *);
 extern int unregister_irq(int, int);