diff options
Diffstat (limited to 'usr/src/uts/common/pcmcia/sys/cis.h')
| -rw-r--r-- | usr/src/uts/common/pcmcia/sys/cis.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/uts/common/pcmcia/sys/cis.h b/usr/src/uts/common/pcmcia/sys/cis.h index cb64eac794..d1a42630b8 100644 --- a/usr/src/uts/common/pcmcia/sys/cis.h +++ b/usr/src/uts/common/pcmcia/sys/cis.h @@ -26,8 +26,6 @@ #ifndef _CIS_H #define _CIS_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This is the Card Services Card Information Structure (CIS) interpreter * header file. CIS information in this file is based on the @@ -90,7 +88,7 @@ extern "C" { #define CISTPL_DEVICE_OA 0x01d /* other op conditions AM device info */ #define CISTPL_DEVICEGEO 0x01e /* Common Memory device geometry */ #define CISTPL_DEVICEGEO_A 0x01f /* Attribute Memory device geometry */ -#define CISTPL_MANFID 0x020 /* manufacturer identification */ +#define CISTPL_MANFID 0x020 /* manufacturer identification */ #define CISTPL_FUNCID 0x021 /* function identification */ #define CISTPL_FUNCE 0x022 /* function extension */ @@ -216,7 +214,7 @@ typedef struct cisptr_t { #define NEXT_CIS_ADDR(ptr) \ (((ptr->flags&CISTPLF_AM_SPACE)?(ptr->offset += 2): \ (ptr->offset++)), \ - ((ptr->offset > ptr->size)?(NULL):ptr->offset)) + ((ptr->offset > ptr->size)?(0):ptr->offset)) #define GET_CIS_DATA(ptr) csx_Get8(ptr->handle, ptr->offset) #define GET_CIS_ADDR(tp) ((cisdata_t *)(uintptr_t)(tp)->offset) #define BAD_CIS_ADDR 0x080000000 /* read past end of mapped CIS error */ |