Adapt base-codezero to new ports mechanism

Fixes #1425
This commit is contained in:
Norman Feske
2015-03-02 12:16:36 +01:00
parent 54ef87c979
commit f9269f5cb1
14 changed files with 58 additions and 125 deletions

View File

@ -1,7 +1,5 @@
diff --git a/src/api/map.c b/src/api/map.c
index 1d15086..6139b4c 100644
--- a/src/api/map.c
+++ b/src/api/map.c
--- src/kernel/codezero/src/api/map.c
+++ src/kernel/codezero/src/api/map.c
@@ -78,6 +78,6 @@ int sys_unmap(unsigned long virtual, unsigned long npages, unsigned int tid)
retval = ret;
}
@ -10,10 +8,8 @@ index 1d15086..6139b4c 100644
+ return retval;
}
diff --git a/src/api/thread.c b/src/api/thread.c
index 985c425..579e4fb 100644
--- a/src/api/thread.c
+++ b/src/api/thread.c
--- src/kernel/codezero/src/api/thread.c
+++ src/kernel/codezero/src/api/thread.c
@@ -497,7 +497,7 @@ out_err:
*/
int sys_thread_control(unsigned int flags, struct task_ids *ids)
@ -32,10 +28,8 @@ index 985c425..579e4fb 100644
/*
* Caller may operate on a thread if it shares
* the same address space with that thread's pager
diff --git a/src/arch/arm/mapping-common.c b/src/arch/arm/mapping-common.c
index 385f7c2..55b4bea 100644
--- a/src/arch/arm/mapping-common.c
+++ b/src/arch/arm/mapping-common.c
--- src/kernel/codezero/src/arch/arm/mapping-common.c
+++ src/kernel/codezero/src/arch/arm/mapping-common.c
@@ -313,12 +313,11 @@ int check_mapping(unsigned long vaddr, unsigned long size,
int remove_mapping_space(struct address_space *space, unsigned long vaddr)
{
@ -50,10 +44,8 @@ index 385f7c2..55b4bea 100644
pmd_i = PMD_INDEX(vaddr);
/*
diff --git a/src/glue/arm/init.c b/src/glue/arm/init.c
index 2373c66..43c6fda 100644
--- a/src/glue/arm/init.c
+++ b/src/glue/arm/init.c
--- src/kernel/codezero/src/glue/arm/init.c
+++ src/kernel/codezero/src/glue/arm/init.c
@@ -68,8 +68,6 @@ void print_sections(void)
/* The kip is non-standard, using 0xBB to indicate mine for now ;-) */
void kip_init()
@ -73,10 +65,8 @@ index 2373c66..43c6fda 100644
add_boot_mapping(virt_to_phys(&kip), USER_KIP_PAGE, PAGE_SIZE,
MAP_USR_RO);
printk("%s: Kernel built on %s, %s\n", __KERNELNAME__,
diff --git a/loader/libs/elf/src/elf.c b/loader/libs/elf/src/elf.c
index 4a1b5e0..f97273b 100644
--- a/loader/libs/elf/src/elf.c
+++ b/loader/libs/elf/src/elf.c
--- src/kernel/codezero/loader/libs/elf/src/elf.c
+++ src/kernel/codezero/loader/libs/elf/src/elf.c
@@ -339,16 +339,12 @@ elf_loadFile(void *elfFile, bool phys)
{
int i;
@ -103,10 +93,8 @@ index 4a1b5e0..f97273b 100644
// Comment
printf("Copying to range from 0x%x to 0x%x of size: 0x%x\n", (unsigned int)dest, (unsigned int)dest + (unsigned int)len, (unsigned int)len);
memcpy((void*) (uintptr_t) dest, (void*) (uintptr_t) src, len);
diff --git a/loader/libs/elf/src/elf32.c b/loader/libs/elf/src/elf32.c
index 2d13798..78bbf33 100644
--- a/loader/libs/elf/src/elf32.c
+++ b/loader/libs/elf/src/elf32.c
--- src/kernel/codezero/loader/libs/elf/src/elf32.c
+++ src/kernel/codezero/loader/libs/elf/src/elf32.c
@@ -248,7 +248,6 @@ elf32_fprintf(FILE *f, struct Elf32_Header *file, int size, const char *name, in
struct Elf32_Shdr *sections;
unsigned numSections;
@ -123,10 +111,8 @@ index 2d13798..78bbf33 100644
printf("Section Headers:\n");
printf(" [Nr] Name Type Addr Off\n");
diff --git a/src/generic/capability.c b/src/generic/capability.c
index 0860ea5..ef44445 100644
--- a/src/generic/capability.c
+++ b/src/generic/capability.c
--- src/kernel/codezero/src/generic/capability.c
+++ src/kernel/codezero/src/generic/capability.c
@@ -403,7 +403,7 @@ struct capability *cap_match_mem(struct capability *cap,
{
struct sys_map_args *args = args_ptr;
@ -144,10 +130,8 @@ index 0860ea5..ef44445 100644
pfn_point = pfn;
if (start > pfn_point || cap->end < pfn_point + args->npages)
return 0;
diff --git a/loader/main.c b/loader/main.c
index 7d21a4c..8d7d6db 100644
--- a/loader/main.c
+++ b/loader/main.c
--- src/kernel/codezero/loader/main.c
+++ src/kernel/codezero/loader/main.c
@@ -26,7 +26,6 @@ int load_elf_image(unsigned long **entry, void *filebuf);
int load_container_image(void *cont_section)
{