Changeset 792807f in mainline for kernel/generic/include

Timestamp:

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

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8708be3b, 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)

Location:

kernel/generic/include

Files:

• ddi/ddi.h (modified) (1 diff)
• mm/page.h (modified) (1 diff)
• synch/smc.h (modified) (1 diff)
• syscall/syscall.h (modified) (1 diff)

kernel/generic/include/ddi/ddi.h

@@ -55 +55 @@
 extern void ddi_parea_register(parea_t *);
 
-extern sysarg_t sys_physmem_map(sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern sysarg_t sys_physmem_map(uintptr_t, uintptr_t, size_t, unsigned int);
+
+extern sysarg_t sys_dmamem_map(uintptr_t, size_t, unsigned int, unsigned int,
+    void *);
+extern sysarg_t sys_dmamem_unmap(uintptr_t, size_t, unsigned int);
+
 extern sysarg_t sys_iospace_enable(ddi_ioarg_t *);
 

kernel/generic/include/mm/page.h

@@ -66 +66 @@
 extern uintptr_t hw_map(uintptr_t, size_t);
 
-extern sysarg_t sys_page_find_mapping(uintptr_t, uintptr_t *);
+extern int page_find_mapping(uintptr_t, void **);
+extern sysarg_t sys_page_find_mapping(uintptr_t, void *);
 
 #endif

kernel/generic/include/synch/smc.h

@@ -36 +36 @@
 #define KERN_SMC_H_
 
-extern sysarg_t sys_smc_coherence(uintptr_t va, size_t size);
+extern sysarg_t sys_smc_coherence(uintptr_t, size_t);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -45 +45 @@
 extern sysarg_t syscall_handler(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
-extern sysarg_t sys_tls_set(sysarg_t);
+extern sysarg_t sys_tls_set(uintptr_t);
 
 #endif