diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-11 05:35:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-11 05:35:37 +0000 |
| commit | e511a52691ddb2290f5d3c9ca6e9f0fc3b320289 (patch) | |
| tree | f68510b774a71e2a0879cb013e3abd7a15665abc /sys/arch/sparc/dev/fdvar.h | |
| parent | fc98d7c9a0046f274410f903f952ef6224f68e10 (diff) | |
netbsd port, now we merge our changes back in
Diffstat (limited to 'sys/arch/sparc/dev/fdvar.h')
| -rw-r--r-- | sys/arch/sparc/dev/fdvar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc/dev/fdvar.h b/sys/arch/sparc/dev/fdvar.h index f74d37ce41d..9a74ebcf162 100644 --- a/sys/arch/sparc/dev/fdvar.h +++ b/sys/arch/sparc/dev/fdvar.h @@ -1,5 +1,5 @@ /* - * $NetBSD: fdvar.h,v 1.3 1995/04/07 19:46:15 pk Exp $ + * $NetBSD: fdvar.h,v 1.4 1996/02/01 22:32:29 mycroft Exp $ * * Copyright (c) 1995 Paul Kranenburg * All rights reserved. @@ -36,7 +36,7 @@ #define FDC_NSTATUS 10 -#if !defined(LOCORE) +#ifndef _LOCORE struct fdcio { /* * 82072 (sun4c) and 82077 (sun4m) controllers have different @@ -62,9 +62,9 @@ struct fdcio { /* * Statictics. */ - struct evcnt fdcio_intrcnt; + struct evcnt fdcio_intrcnt; }; -#endif /* LOCORE */ +#endif /* _LOCORE */ /* istate values */ #define ISTATE_IDLE 0 /* No HW interrupt expected */ @@ -72,5 +72,5 @@ struct fdcio { #define ISTATE_SENSEI 2 /* Do SENSEI on next HW interrupt */ #define ISTATE_DMA 3 /* Pseudo-DMA in progress */ -#define SUNOS_FDIOCEJECT _IO('f', 24) +#define FDIOCEJECT _IO('f', 24) |