diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-05-17 06:21:35 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-05-17 06:21:35 +0000 |
| commit | 445efb1e2758e32817497b89c433d1d5331a6fca (patch) | |
| tree | 1994477241e7d92d20e2459ee35a0ffbe18681ef /sys/arch/mvme88k/stand | |
| parent | fe20f8344a8978179ffb6791db70b191919ba2a8 (diff) | |
Delay board type retrieval.
Diffstat (limited to 'sys/arch/mvme88k/stand')
| -rw-r--r-- | sys/arch/mvme88k/stand/libbug/libbug.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/stand/libsa/exec_mvme.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/mvme88k/stand/libbug/libbug.h b/sys/arch/mvme88k/stand/libbug/libbug.h index 005ae94b617..5c9a98d4965 100644 --- a/sys/arch/mvme88k/stand/libbug/libbug.h +++ b/sys/arch/mvme88k/stand/libbug/libbug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libbug.h,v 1.4 2006/05/16 22:51:30 miod Exp $ */ +/* $OpenBSD: libbug.h,v 1.5 2006/05/17 06:21:33 miod Exp $ */ /* * prototypes and such. note that get/put char are in stand.h @@ -7,7 +7,7 @@ void mvmeprom_delay(int); int mvmeprom_diskrd(struct mvmeprom_dskio *); int mvmeprom_diskwr(struct mvmeprom_dskio *); -struct mvmeprom_brdid *mvmeprom_getbrdid(void); +struct mvmeprom_brdid *mvmeprom_brdid(void); int mvmeprom_netfopen(struct mvmeprom_netfopen *); int mvmeprom_netfread(struct mvmeprom_netfread *); void mvmeprom_outln(char *, char *); diff --git a/sys/arch/mvme88k/stand/libsa/exec_mvme.c b/sys/arch/mvme88k/stand/libsa/exec_mvme.c index c67ae2c321b..bc2a787d64e 100644 --- a/sys/arch/mvme88k/stand/libsa/exec_mvme.c +++ b/sys/arch/mvme88k/stand/libsa/exec_mvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_mvme.c,v 1.12 2006/05/16 22:51:30 miod Exp $ */ +/* $OpenBSD: exec_mvme.c,v 1.13 2006/05/17 06:21:34 miod Exp $ */ /*- @@ -66,9 +66,12 @@ exec_mvme(file, flag) char *cp; int *ip; int bootdev; + struct mvmeprom_brdid *id; + + id = mvmeprom_brdid(); #ifdef DEBUG - printf("exec_mvme: file=%s flag=0x%x cputyp=%x\n", file, flag, bugargs.cputyp); + printf("exec_mvme: file=%s flag=0x%x cputyp=%x\n", file, flag, id->model); #endif io = open(file, 0); @@ -194,7 +197,7 @@ exec_mvme(file, flag) bootdev = (bugargs.ctrl_lun << 8) | (bugargs.dev_lun & 0xFF); - (*entry)(flag, bugargs.ctrl_addr, cp, kernel.smini, kernel.emini, bootdev, bugargs.cputyp); + (*entry)(flag, bugargs.ctrl_addr, cp, kernel.smini, kernel.emini, bootdev, id->model); printf("exec: kernel returned!\n"); return; |