From 75cbf028bb113bdce866b0cd79d1d46c1d65ee16 Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 2 Aug 2009 11:04:27 +0000
Subject: [PATCH] update briq/mol/pearpc client interface to use ucell type
 (Igor Kovalenko)

git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@523 f158a5a8-5612-0410-a976-696ce0be7e32
---
 arch/ppc/briq/methods.c   |  8 +++----
 arch/ppc/mol/methods.c    | 42 ++++++++++++++++++-------------------
 arch/ppc/pearpc/methods.c | 44 +++++++++++++++++++--------------------
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/arch/ppc/briq/methods.c b/arch/ppc/briq/methods.c
index 89410df..3209693 100644
--- a/arch/ppc/briq/methods.c
+++ b/arch/ppc/briq/methods.c
@@ -260,15 +260,15 @@ mmu_unmap( void )
 static void
 mmu_translate( void )
 {
-	ulong mode;
-	int virt = POP();
-	int phys = ofmem_translate( virt, &mode );
+	ucell mode;
+	ucell virt = POP();
+	ucell phys = ofmem_translate( virt, &mode );
 
 	if( phys == -1 ) {
 		PUSH( 0 );
 	} else {
 		PUSH( phys );
-		PUSH( (int)mode );
+		PUSH( mode );
 		PUSH( -1 );
 	}
 }
diff --git a/arch/ppc/mol/methods.c b/arch/ppc/mol/methods.c
index 056ffb7..139211c 100644
--- a/arch/ppc/mol/methods.c
+++ b/arch/ppc/mol/methods.c
@@ -323,10 +323,10 @@ DECLARE_NODE( mmu_ciface, 0, 0, "/packages/client-iface" );
 static void
 mem_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int phys = POP();
-	int ret = ofmem_claim_phys( phys, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell phys = POP();
+	ucell ret = ofmem_claim_phys( phys, size, align );
 
 	if( ret == -1 ) {
 		printk("MEM: claim failure\n");
@@ -347,10 +347,10 @@ mem_release( void )
 static void
 mmu_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int phys = POP();
-	int ret = ofmem_claim_virt( phys, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell phys = POP();
+	ucell ret = ofmem_claim_virt( phys, size, align );
 
 	if( ret == -1 ) {
 		printk("MMU: CLAIM failure\n");
@@ -371,11 +371,11 @@ mmu_release( void )
 static void
 mmu_map( void )
 {
-	int mode = POP();
-	int size = POP();
-	int virt = POP();
-	int phys = POP();
-	int ret;
+	ucell mode = POP();
+	ucell size = POP();
+	ucell virt = POP();
+	ucell phys = POP();
+	ucell ret;
 
 	/* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */
 	ret = ofmem_map( phys, virt, size, mode );
@@ -398,15 +398,15 @@ mmu_unmap( void )
 static void
 mmu_translate( void )
 {
-	ulong mode;
-	int virt = POP();
-	int phys = ofmem_translate( virt, &mode );
+	ucell mode;
+	ucell virt = POP();
+	ucell phys = ofmem_translate( virt, &mode );
 
 	if( phys == -1 ) {
 		PUSH( 0 );
 	} else {
 		PUSH( phys );
-		PUSH( (int)mode );
+		PUSH( mode );
 		PUSH( -1 );
 	}
 }
@@ -415,10 +415,10 @@ mmu_translate( void )
 static void
 ciface_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int virt = POP();
-	int ret = ofmem_claim( virt, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell virt = POP();
+	ucell ret = ofmem_claim( virt, size, align );
 
 	/* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */
 	PUSH( ret );
diff --git a/arch/ppc/pearpc/methods.c b/arch/ppc/pearpc/methods.c
index 5cf5c5f..31fd6f3 100644
--- a/arch/ppc/pearpc/methods.c
+++ b/arch/ppc/pearpc/methods.c
@@ -187,12 +187,12 @@ DECLARE_NODE( mmu_ciface, 0, 0, "/packages/client-iface" );
 static void
 mem_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int phys = POP();
-	int ret = ofmem_claim_phys( phys, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell phys = POP();
+	ucell ret = ofmem_claim_phys( phys, size, align );
 
-	if( ret == -1 ) {
+	if( ret == (ucell)-1 ) {
 		printk("MEM: claim failure\n");
 		throw( -13 );
 		return;
@@ -211,10 +211,10 @@ mem_release( void )
 static void
 mmu_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int phys = POP();
-	int ret = ofmem_claim_virt( phys, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell phys = POP();
+	ucell ret = ofmem_claim_virt( phys, size, align );
 
 	if( ret == -1 ) {
 		printk("MMU: CLAIM failure\n");
@@ -235,11 +235,11 @@ mmu_release( void )
 static void
 mmu_map( void )
 {
-	int mode = POP();
-	int size = POP();
-	int virt = POP();
-	int phys = POP();
-	int ret;
+	ucell mode = POP();
+	ucell size = POP();
+	ucell virt = POP();
+	ucell phys = POP();
+	ucell ret;
 
 	/* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */
 	ret = ofmem_map( phys, virt, size, mode );
@@ -262,15 +262,15 @@ mmu_unmap( void )
 static void
 mmu_translate( void )
 {
-	ulong mode;
-	int virt = POP();
-	int phys = ofmem_translate( virt, &mode );
+	ucell mode;
+	ucell virt = POP();
+	ucell phys = ofmem_translate( virt, &mode );
 
 	if( phys == -1 ) {
 		PUSH( 0 );
 	} else {
 		PUSH( phys );
-		PUSH( (int)mode );
+		PUSH( mode );
 		PUSH( -1 );
 	}
 }
@@ -279,10 +279,10 @@ mmu_translate( void )
 static void
 ciface_claim( void )
 {
-	int align = POP();
-	int size = POP();
-	int virt = POP();
-	int ret = ofmem_claim( virt, size, align );
+	ucell align = POP();
+	ucell size = POP();
+	ucell virt = POP();
+	ucell ret = ofmem_claim( virt, size, align );
 
 	/* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */
 	PUSH( ret );