* include/ddk/hidusage.h: Remove unneccessary #pragma pack's.
* include/ddk/miniport.h (EMULATOR_PORT_ACCESS_TYPE): Define before using. (VIDEO_ACCESS_RANGE): Guard against prior definition. * include/ddk/minitape.h (INQUIRYDATA): Guard against prior definition. * include/ddk/ndis.h (DECLARE_UNKNOWN_PROTOTYPE): Correct macro. * include/ddk/ndisguid.h: Remove unneccessary #pragma pack's. * include/ddk/scsi.h (INQUIRYDATA): Guard against prior definition. * include/ddk/scsiwmi.h (GUID): Define if not already done. (LPCGUID): Likewise. * include/ddk/tdi.h: Close "Listen flags" comment. * include/ddk/tdistat.h: Remove unneccessary #pragma pack's. * include/ddk/video.h: Add #pragma pack(push,4) to balance. (VIDEO_ACCESS_RANGE): Guard against prior definition. * include/ddk/videoagp.h:Add #pragma pack(push,4) to balance. * include/ddk/win2k.h: Likewise. * include/ddk/winddi.h: Likewise. * include/ddk/winddk.h: Likewise. * include/ddk/winnt4.h: Likewise. * include/ddk/ws2san.h: Likewise. * include/ddk/xfilter.h: Remove unbalanced #pragma pack(pop). * include/ddk/video.h: Don't process rest of file ifdef __WINDDI_H. * include/ddk/winddi.h: Don't process rest of file ifdef __VIDEO_H. * include/ddk/usb.h: Don't process rest of file ifdef __USBDI_H. * include/ddk/usbdi.h: Don't process rest of file ifdef __USB_H. * include/ddk/usbcamdi.h: Don't process rest of file if !defined(__USB_H) && !defined(__USBDI_H)
This commit is contained in:
@ -39,6 +39,13 @@ extern "C" {
|
||||
#define EMULATOR_READ_ACCESS 0x01
|
||||
#define EMULATOR_WRITE_ACCESS 0x02
|
||||
|
||||
typedef enum _EMULATOR_PORT_ACCESS_TYPE {
|
||||
Uchar,
|
||||
Ushort,
|
||||
Ulong
|
||||
} EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE;
|
||||
|
||||
|
||||
typedef struct _EMULATOR_ACCESS_ENTRY {
|
||||
ULONG BasePort;
|
||||
ULONG NumConsecutivePorts;
|
||||
@ -48,12 +55,8 @@ typedef struct _EMULATOR_ACCESS_ENTRY {
|
||||
PVOID Routine;
|
||||
} EMULATOR_ACCESS_ENTRY, *PEMULATOR_ACCESS_ENTRY;
|
||||
|
||||
typedef enum _EMULATOR_PORT_ACCESS_TYPE {
|
||||
Uchar,
|
||||
Ushort,
|
||||
Ulong
|
||||
} EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE;
|
||||
|
||||
#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in video.h */
|
||||
#define VIDEO_ACCESS_RANGE_DEFINED
|
||||
typedef struct _VIDEO_ACCESS_RANGE {
|
||||
PHYSICAL_ADDRESS RangeStart;
|
||||
ULONG RangeLength;
|
||||
@ -62,6 +65,7 @@ typedef struct _VIDEO_ACCESS_RANGE {
|
||||
UCHAR RangeShareable;
|
||||
UCHAR RangePassive;
|
||||
} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
|
||||
#endif
|
||||
|
||||
typedef VOID DDKAPI
|
||||
(*PBANKED_SECTION_ROUTINE)(
|
||||
|
Reference in New Issue
Block a user