diff options
| author | chuck <chuck@cvs.openbsd.org> | 1996-05-16 02:14:03 +0000 |
|---|---|---|
| committer | chuck <chuck@cvs.openbsd.org> | 1996-05-16 02:14:03 +0000 |
| commit | 8240271442f78dff5c0325e9c64c5eb2ed0649a7 (patch) | |
| tree | ae99055bbce57c29d3921e51b089d442104c6503 /sys/arch/mvme68k | |
| parent | ce1d3b10f86b2ea904d4cd28262ffd46f2ee3781 (diff) | |
add two more defines for the way the bug "NBO" command passes in args
add network boot and cputyp to bugargs (for new bootblocks)
Diffstat (limited to 'sys/arch/mvme68k')
| -rw-r--r-- | sys/arch/mvme68k/include/prom.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/include/prom.h b/sys/arch/mvme68k/include/prom.h index f1949467191..eac1f31cbbc 100644 --- a/sys/arch/mvme68k/include/prom.h +++ b/sys/arch/mvme68k/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.5 1996/05/10 03:19:34 chuck Exp $ */ +/* $OpenBSD: prom.h,v 1.6 1996/05/16 02:14:02 chuck Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -148,6 +148,9 @@ struct mvmeprom_args { u_int conf_blk; char *arg_start; char *arg_end; + char *nbarg_start; + char *nbarg_end; + u_int cputyp; }; #endif @@ -160,11 +163,16 @@ struct mvmeprom_args { asm volatile ("movel %0, sp@-"::"d" (arg)) #define MVMEPROM_ARG2(arg) \ asm volatile ("movel %0, sp@-"::"d" (arg)) +#define MVMEPROM_GETRES(ret) \ + asm volatile ("movel sp@+,%0": "=d" (ret):) #define MVMEPROM_RETURN(ret) \ - asm volatile ("movel sp@+,%0": "=d" (ret):); \ - return (ret); /* return a value */ + MVMEPROM_GETRES(ret); \ + return (ret); /* return a value (int) */ +#define MVMEPROM_RETURN_BYTE(ret) \ + MVMEPROM_GETRES(ret); \ + return((ret >> 24) & 0xff); /* return a byte, ret must be int */ #define MVMEPROM_STATRET(ret) \ - asm volatile ("movew ccr,%0": "=d" (ret)); \ + MVMEPROM_GETRES(ret); \ return (!(ret & 0x4)); /* return a 'status' */ #define MVMEPROM_REG_DEVLUN "d0" @@ -173,5 +181,7 @@ struct mvmeprom_args { #define MVMEPROM_REG_CTRLADDR "a0" #define MVMEPROM_REG_ENTRY "a1" #define MVMEPROM_REG_CONFBLK "a2" +#define MVMEPROM_REG_NBARGSTART "a3" +#define MVMEPROM_REG_NBARGEND "a4" #define MVMEPROM_REG_ARGSTART "a5" #define MVMEPROM_REG_ARGEND "a6" |