Adjust mmap to new interface

JIRA: RTOS-665
phoenix-rtos · Nov 2, 2023 · 060a4c8 · 060a4c8
1 parent 894855f
commit 060a4c8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/include/sys/mman.h b/include/sys/mman.h
@@ -21,8 +21,7 @@
 #include <phoenix/mman.h>
 
 
-#define MAP_ANON   MAP_ANONYMOUS
-#define MAP_FAILED (void *)-1
+#define MAP_ANON MAP_ANONYMOUS
 
 
 #ifdef __cplusplus
@@ -39,7 +38,7 @@ extern void meminfo(meminfo_t *info);
 extern int syspageprog(syspageprog_t *prog, int index);
 
 
-extern void *mmap(void *vaddr, size_t size, int prot, int flags, oid_t *oid, offs_t offs);
+extern void *mmap(void *vaddr, size_t size, int prot, int flags, int fildes, off_t offs);
 
 
 extern int munmap(void *vaddr, size_t size);

diff --git a/pthread/pthread.c b/pthread/pthread.c
@@ -237,7 +237,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
 		attrs = attr;
 
 	void *stack = mmap(attrs->stackaddr, attrs->stacksize,
-		PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, NULL, 0);
+		PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	if (stack == MAP_FAILED || stack == NULL)
 		return EAGAIN;

diff --git a/stdio/file.c b/stdio/file.c
@@ -120,7 +120,7 @@ static void *buffAlloc(size_t size)
 	void *ret;
 
 #ifndef NOMMU
-	if ((ret = mmap(NULL, (size + (_PAGE_SIZE - 1)) & ~(_PAGE_SIZE - 1), PROT_READ | PROT_WRITE, MAP_ANONYMOUS, NULL, 0)) == MAP_FAILED) {
+	if ((ret = mmap(NULL, (size + (_PAGE_SIZE - 1)) & ~(_PAGE_SIZE - 1), PROT_READ | PROT_WRITE, MAP_ANONYMOUS, -1, 0)) == MAP_FAILED) {
 		return NULL;
 	}
 #else
@@ -1150,7 +1150,7 @@ FILE *popen(const char *command, const char *mode)
 		goto failed;
 	}
 
-	if ((pf->file.buffer = mmap(NULL, BUFSIZ, PROT_READ | PROT_WRITE, MAP_ANONYMOUS, NULL, 0)) == MAP_FAILED) {
+	if ((pf->file.buffer = mmap(NULL, BUFSIZ, PROT_READ | PROT_WRITE, MAP_ANONYMOUS, -1, 0)) == MAP_FAILED) {
 		goto failed;
 	}
 

diff --git a/stdlib/malloc_dl.c b/stdlib/malloc_dl.c
@@ -312,7 +312,7 @@ static heap_t *_malloc_heapAlloc(size_t size)
 	if (heapSize < size)
 		return NULL;
 
-	heap = mmap(NULL, heapSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, NULL, 0);
+	heap = mmap(NULL, heapSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (heap == MAP_FAILED)
 		return NULL;
 

diff --git a/stdlib/malloc_trivial3.c b/stdlib/malloc_trivial3.c
@@ -57,7 +57,7 @@ static heap_t *_malloc_heapCreate(size_t size)
 	heap_t *heap;
 	chunk_t *chunk;
 
-	if ((heap = mmap((void *)0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, NULL, 0)) == NULL)
+	if ((heap = mmap((void *)0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)) == NULL)
 		return NULL;
 
 	heap->size = size;