This commit is contained in:
martin 2005-06-03 07:11:20 +00:00
parent 88aa783dd0
commit c111fbbb32
2 changed files with 9 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bootxx.c,v 1.12 2005/04/28 12:47:45 martin Exp $ */
/* $NetBSD: bootxx.c,v 1.13 2005/06/03 07:11:20 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -75,7 +75,8 @@ void loadboot __P((struct open_file *, caddr_t));
int
main()
{
char *dummy;
char *dummy1;
const char *dummy;
void (*entry)__P((void *)) = (void (*)__P((void *)))PROM_LOADADDR;
void *arg;
@ -90,7 +91,7 @@ main()
if (dummy && *dummy != '\0')
strcpy(prom_bootdevice, dummy);
io.f_flags = F_RAW;
if (devopen(&io, 0, &dummy)) {
if (devopen(&io, 0, &dummy1)) {
panic("%s: can't open device `%s'", progname,
prom_bootdevice != NULL ? prom_bootdevice : "unknown");
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: promlib.c,v 1.3 2003/02/26 17:39:08 pk Exp $ */
/* $NetBSD: promlib.c,v 1.4 2005/06/03 07:11:20 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -65,8 +65,8 @@
static void obp_v2_putchar __P((int));
static int obp_v2_seek __P((int, u_quad_t));
static char *obp_v0_getbootpath __P((void));
static char *obp_v2_getbootpath __P((void));
static const char *obp_v0_getbootpath __P((void));
static const char *obp_v2_getbootpath __P((void));
/*
* PROM entry points.
@ -114,14 +114,14 @@ obp_v2_seek(handle, offset)
* is NULL but `*promvec->pv_v2bootargs.v2_bootargs' points to
* "netbsd -s" or whatever.
*/
char *
const char *
obp_v0_getbootpath()
{
struct v0bootargs *ba = promops.po_bootcookie;
return (ba->ba_argv[0]);
}
char *
const char *
obp_v2_getbootpath()
{
struct v2bootargs *ba = promops.po_bootcookie;