Merge branch 'ppos' of github.com:gparmer/Composite into ppos

gwsystems · Feb 13, 2017 · 23980df · 23980df
2 parents 30f32dd + 88a7d6e
commit 23980df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/components/implementation/no_interface/new_boot/boot_deps.h b/src/components/implementation/no_interface/new_boot/boot_deps.h
@@ -33,7 +33,7 @@ enum {
 static vaddr_t
 boot_deps_map_sect(int spdid, vaddr_t dest_daddr)
 {
-	vaddr_t addr = cos_page_bump_alloc(&boot_info);
+	vaddr_t addr = (vaddr_t) cos_page_bump_alloc(&boot_info);
 	assert(addr);
 
 	if (cos_mem_alias_at(new_comp_cap_info[spdid].compinfo, dest_daddr, &boot_info, addr)) BUG();
@@ -76,7 +76,7 @@ boot_compinfo_init(int spdid, captblcap_t *ct, pgtblcap_t *pt, u32_t vaddr)
 }
 
 static void
-boot_newcomp_create(int spdid, struct comp_cap_info *comp_info)
+boot_newcomp_create(int spdid, struct cos_compinfo *comp_info)
 {
 	compcap_t   cc;
 	captblcap_t ct = new_comp_cap_info[spdid].compinfo->captbl_cap;
@@ -100,7 +100,7 @@ boot_newcomp_create(int spdid, struct comp_cap_info *comp_info)
 	assert(main_thd);
 
 	/* Add created component to "scheduling" array */		
-	while (schedule[i] != NULL) i++;
+	while (schedule[i] != 0) i++;
 	schedule[i] = main_thd;
 }
 
@@ -126,7 +126,7 @@ boot_thd_done(void)
 {
 	sched_cur++;
 
-	if (schedule[sched_cur] != NULL) {
+	if (schedule[sched_cur] != 0) {
 		printc("Initializing comp: %d\n", sched_cur);
 	       	cos_thd_switch(schedule[sched_cur]);
 	} else {

diff --git a/src/components/implementation/no_interface/new_boot/ppos_booter.c b/src/components/implementation/no_interface/new_boot/ppos_booter.c
@@ -64,7 +64,7 @@ boot_comp_map_memory(struct cobj_header *h, spdid_t spdid, pgtblcap_t pt)
 	/* We'll map the component into booter's heap. */
 	new_comp_cap_info[spdid].vaddr_mapped_in_booter = (vaddr_t)cos_get_heap_ptr();
 
-	for (i = 0 ; i < h->nsect ; i++) {
+	for (i = 0 ; i < (int)h->nsect ; i++) {
 		int left;
 
 		sect = cobj_sect_get(h, i);
@@ -112,7 +112,7 @@ boot_spd_symbs(struct cobj_header *h, spdid_t spdid, vaddr_t *comp_info)
 {
 	int i = 0;
 
-	for (i = 0 ; i < h->nsymb ; i++) {
+	for (i = 0 ; i < (int)h->nsymb ; i++) {
 		struct cobj_symb *symb;
 
 		symb = cobj_symb_get(h, i);
@@ -208,7 +208,7 @@ boot_comp_map_populate(struct cobj_header *h, spdid_t spdid, vaddr_t comp_info,
 			ci = (struct cos_component_information*)(start_addr + (comp_info-init_daddr));
 			new_comp_cap_info[h->id].upcall_entry = ci->cos_upcall_entry;
 
-			vaddr_t begin =start_addr + ((ci->cos_upcall_entry) - init_daddr); 
+			vaddr_t begin = (vaddr_t) start_addr + ((ci->cos_upcall_entry) - init_daddr); 
 		}
 	}
 
@@ -228,7 +228,7 @@ boot_init_sched(void)
 {
 	int i;
 
-	for (i = 0 ; i < MAX_NUM_SPDS ; i++) schedule[i] = NULL;
+	for (i = 0 ; i < MAX_NUM_SPDS ; i++) schedule[i] = 0;
 	sched_cur = 0;
 }