diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-19 00:44:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-19 00:44:34 +0000 |
| commit | f5ad059401369b1886ff9c2a962effdad1affbda (patch) | |
| tree | 9300c9738f470d5e1786b01d6ef90283d742a308 /sys/dev/ic/iha.h | |
| parent | 0f4561abc15d57fb4ef33e3b9774f2c6ea52e9e5 (diff) | |
Rename a few defines to avoid namespace pollution. The only one used was 'READ' which is now 'NVREAD'.
Potential conflict with SCSI 'READ' spotted by tdeval@.
Diffstat (limited to 'sys/dev/ic/iha.h')
| -rw-r--r-- | sys/dev/ic/iha.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/iha.h b/sys/dev/ic/iha.h index e44c962663f..455471d7759 100644 --- a/sys/dev/ic/iha.h +++ b/sys/dev/ic/iha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iha.h,v 1.14 2003/10/21 18:58:49 jmc Exp $ */ +/* $OpenBSD: iha.h,v 1.15 2004/01/19 00:44:33 krw Exp $ */ /*------------------------------------------------------------------------- * * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -249,9 +249,9 @@ struct iha_nvram { #define TUL_PNVPG 0x5A /* R/W Data port to external BIOS */ #define TUL_EPDATA 0x5C /* R/W EEPROM Data port */ #define TUL_NVRAM 0x5D /* R/W Non-volatile RAM port */ -#define READ 0x80 /* Read from given NVRAM addr */ -#define WRITE 0x40 /* Write to given NVRAM addr */ -#define ENABLE_ERASE 0x30 /* Enable NVRAM Erase/Write */ +#define NVREAD 0x80 /* Read from given NVRAM addr */ +#define NVWRITE 0x40 /* Write to given NVRAM addr */ +#define NVENABLE_ERASE 0x30 /* Enable NVRAM Erase/Write */ #define NVRCS 0x08 /* Select external NVRAM */ #define NVRCK 0x04 /* NVRAM Clock */ #define NVRDO 0x02 /* NVRAM Write Data */ |