Author: stepan Date: 2006-06-05 14:35:11 +0200 (Mon, 05 Jun 2006) New Revision: 40
Modified: openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/include/sparc32/io.h Log: -20
Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2006-06-05 10:57:48 UTC (rev 39) +++ openbios-devel/drivers/esp.c 2006-06-05 12:35:11 UTC (rev 40) @@ -263,7 +263,7 @@
fword("my-unit"); id = POP(); - POP(); // unit id is 2 ints but we only need one. + //POP(); // unit id is 2 ints but we only need one. *sd = &global_esp->sd[id];
#ifdef CONFIG_DEBUG_ESP
Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2006-06-05 10:57:48 UTC (rev 39) +++ openbios-devel/drivers/iommu.c 2006-06-05 12:35:11 UTC (rev 40) @@ -195,15 +195,10 @@ return (void *)((unsigned int)va + off); }
-/* - * Switch page tables. - */ void -init_mmu_swift(unsigned long base) +ob_init_mmu(unsigned long base) { extern unsigned int qemu_mem_size; - unsigned int addr, i; - unsigned long pa, va;
push_str("/memory"); fword("find-device"); @@ -264,7 +259,17 @@ fword("encode+"); push_str("available"); fword("property"); +}
+/* + * Switch page tables. + */ +void +init_mmu_swift(unsigned long base) +{ + unsigned int addr, i; + unsigned long pa, va; + mem_init(&cio, (char *)&_end, (char *)&_iomem);
context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int));
Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2006-06-05 10:57:48 UTC (rev 39) +++ openbios-devel/include/sparc32/io.h 2006-06-05 12:35:11 UTC (rev 40) @@ -38,6 +38,7 @@ void *mem_zalloc(struct mem *t, int size, int align); int map_page(unsigned long va, unsigned long epa, int type); void *map_io(unsigned pa, int size); +void ob_init_mmu(unsigned long base); void init_mmu_swift(unsigned long base); void *dvma_alloc(int size, unsigned int *pphys);