r523 - in trunk/openbios-devel/arch/ppc: briq mol pearpc

Author: blueswirl
Date: 2009-08-02 13:04:27 +0200 (Sun, 02 Aug 2009)
New Revision: 523

Modified:
   trunk/openbios-devel/arch/ppc/briq/methods.c
   trunk/openbios-devel/arch/ppc/mol/methods.c
   trunk/openbios-devel/arch/ppc/pearpc/methods.c
Log:
update briq/mol/pearpc client interface to use ucell type (Igor Kovalenko)

Modified: trunk/openbios-devel/arch/ppc/briq/methods.c
===================================================================
--- trunk/openbios-devel/arch/ppc/briq/methods.c	2009-08-02 11:03:26 UTC (rev 522)
+++ trunk/openbios-devel/arch/ppc/briq/methods.c	2009-08-02 11:04:27 UTC (rev 523)
@@ -260,15 +260,15 @@
 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 );
    }
 }

Modified: trunk/openbios-devel/arch/ppc/mol/methods.c
===================================================================
--- trunk/openbios-devel/arch/ppc/mol/methods.c	2009-08-02 11:03:26 UTC (rev 522)
+++ trunk/openbios-devel/arch/ppc/mol/methods.c	2009-08-02 11:04:27 UTC (rev 523)
@@ -323,10 +323,10 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 );

Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c
===================================================================
--- trunk/openbios-devel/arch/ppc/pearpc/methods.c	2009-08-02 11:03:26 UTC (rev 522)
+++ trunk/openbios-devel/arch/ppc/pearpc/methods.c	2009-08-02 11:04:27 UTC (rev 523)
@@ -187,12 +187,12 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 );