Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be a bit more consistent about returning errors.

This commit is contained in:
eeh 2001-06-21 00:08:02 +00:00
parent d8401d9eac
commit bceb1fab42
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/sparc64/sparc64/ofw_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofw_machdep.c,v 1.14 2000/09/11 22:36:35 eeh Exp $ */
/* $NetBSD: ofw_machdep.c,v 1.15 2001/06/21 00:08:02 eeh Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@ -155,8 +155,8 @@ prom_vtop(vaddr)
args.method = ADR2CELL(&"translate");
args.ihandle = HDL2CELL(mmuh);
args.vaddr = ADR2CELL(vaddr);
if(openfirmware(&args) != 0)
return 0;
if(openfirmware(&args) == -1)
return -1;
#if 0
prom_printf("Called \"translate\", mmuh=%x, vaddr=%x, status=%x %x,\r\n retaddr=%x %x, mode=%x %x, phys_hi=%x %x, phys_lo=%x %x\r\n",
mmuh, vaddr, (int)(args.status>>32), (int)args.status, (int)(args.retaddr>>32), (int)args.retaddr,
@ -201,8 +201,8 @@ prom_claim_virt(vaddr, len)
args.align = 0;
args.len = len;
args.vaddr = ADR2CELL(vaddr);
if (openfirmware(&args) != 0)
return 0;
if (openfirmware(&args) == -1)
return -1;
return (paddr_t)args.retaddr;
}
@ -390,7 +390,7 @@ prom_alloc_phys(len, align)
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
prom_printf("prom_alloc_phys: cannot get memh\r\n");
return 0;
return -1;
}
args.name = ADR2CELL(&"call-method");
args.nargs = 4;
@ -400,7 +400,7 @@ prom_alloc_phys(len, align)
args.align = align;
args.len = len;
if (openfirmware(&args) != 0)
return 0;
return -1;
return (paddr_t)((((paddr_t)args.phys_hi)<<32)|(u_int32_t)args.phys_lo);
}
@ -431,7 +431,7 @@ prom_claim_phys(phys, len)
if (memh == -1 && ((memh = get_memory_handle()) == -1)) {
prom_printf("prom_alloc_phys: cannot get memh\r\n");
return 0;
return -1;
}
args.name = ADR2CELL(&"call-method");
args.nargs = 6;

10
sys/arch/sparc64/sparc64/openfirm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: openfirm.c,v 1.12 2001/05/30 12:28:51 mrg Exp $ */
/* $NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -486,7 +486,8 @@ OF_test_method(service, method)
args.nreturns = 1;
args.service = HDL2CELL(service);
args.method = ADR2CELL(method);
openfirmware(&args);
if (openfirmware(&args) == -1)
return -1;
return args.status;
}
@ -689,7 +690,7 @@ void
args.nreturns = 1;
args.newfunc = ADR2CELL(newfunc);
if (openfirmware(&args) == -1)
return 0;
return (void*)(long)-1;
return (void*)(long)args.oldfunc;
}
@ -747,7 +748,8 @@ OF_milliseconds()
args.name = ADR2CELL(&"milliseconds");
args.nargs = 0;
args.nreturns = 1;
openfirmware(&args);
if (openfirmware(&args) == -1)
return -1;
return (args.ticks);
}