From a6678aafb5c5382735245ae9f0b7c7b4b690389f Mon Sep 17 00:00:00 2001 From: mp Date: Thu, 20 Sep 2001 00:48:30 +0000 Subject: [PATCH] Use BATL/BATU macros instead of hardcoded hex constants. --- sys/powerpc/aim/mmu_oea.c | 13 ++++--------- sys/powerpc/powerpc/mmu_oea.c | 13 ++++--------- sys/powerpc/powerpc/pmap.c | 13 ++++--------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 7b3f3e785705..03b89d913c9d 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -600,21 +600,16 @@ void pmap_bootstrap() { int i; + u_int32_t batl, batu; /* * Initialize kernel pmap and hardware. */ kernel_pmap = &kernel_pmap_store; - { - int batu, batl; - - batu = 0x80001ffe; - batl = 0x80000012; - - __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); - } - + batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); + batl = BATL(0x80000000, BAT_M, BAT_PP_RW); + __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); #if NPMAPS >= KERNEL_SEGMENT / 16 usedsr[KERNEL_SEGMENT / 16 / (sizeof usedsr[0] * 8)] diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 7b3f3e785705..03b89d913c9d 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -600,21 +600,16 @@ void pmap_bootstrap() { int i; + u_int32_t batl, batu; /* * Initialize kernel pmap and hardware. */ kernel_pmap = &kernel_pmap_store; - { - int batu, batl; - - batu = 0x80001ffe; - batl = 0x80000012; - - __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); - } - + batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); + batl = BATL(0x80000000, BAT_M, BAT_PP_RW); + __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); #if NPMAPS >= KERNEL_SEGMENT / 16 usedsr[KERNEL_SEGMENT / 16 / (sizeof usedsr[0] * 8)] diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c index 7b3f3e785705..03b89d913c9d 100644 --- a/sys/powerpc/powerpc/pmap.c +++ b/sys/powerpc/powerpc/pmap.c @@ -600,21 +600,16 @@ void pmap_bootstrap() { int i; + u_int32_t batl, batu; /* * Initialize kernel pmap and hardware. */ kernel_pmap = &kernel_pmap_store; - { - int batu, batl; - - batu = 0x80001ffe; - batl = 0x80000012; - - __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); - } - + batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); + batl = BATL(0x80000000, BAT_M, BAT_PP_RW); + __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r" (batu), "r" (batl)); #if NPMAPS >= KERNEL_SEGMENT / 16 usedsr[KERNEL_SEGMENT / 16 / (sizeof usedsr[0] * 8)]