Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-15 08:03:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DDK]

Browse source 
- Move cfg.h and cfgmgr32.h to PSDK, introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones.
[UNIATA]
- DDKAPI -> NTAPI.

svn path=/branches/header-work/; revision=46409
This commit is contained in:
Amine Khaldi 2010-03-24 22:56:18 +00:00
parent f71e0e99fd
commit 0f7b50812f
4 changed files with 3288 additions and 2290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/storage/ide/uniata/id_ata.cpp
View file

@ -94,7 +94,7 @@ BOOLEAN WinVer_WDM_Model = FALSE;
UCHAR g_foo = 0;
BOOLEAN
DDKAPI
NTAPI
AtapiResetController__(
IN PVOID HwDeviceExtension,
IN ULONG PathId,
@ -115,7 +115,7 @@ AtapiHwInitialize__(
#ifndef UNIATA_CORE
VOID
DDKAPI
NTAPI
AtapiCallBack_X(
IN PVOID HwDeviceExtension
);
@ -129,13 +129,13 @@ AtapiCallBack_X(
#endif
RETTYPE_XXableInterrupts
DDKAPI
NTAPI
AtapiInterruptDpc(
IN PVOID HwDeviceExtension
);
RETTYPE_XXableInterrupts
DDKAPI
NTAPI
AtapiEnableInterrupts__(
IN PVOID HwDeviceExtension
);
@ -150,7 +150,7 @@ AtapiQueueTimerDpc(
);
SCSI_ADAPTER_CONTROL_STATUS
DDKAPI
NTAPI
AtapiAdapterControl(
IN PVOID HwDeviceExtension,
IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
@ -1005,7 +1005,7 @@ AtaUmode(PIDENTIFY_DATA2 ident)
#ifndef UNIATA_CORE
VOID
DDKAPI
NTAPI
AtapiTimerDpc(
IN PVOID HwDeviceExtension
)
@ -1856,7 +1856,7 @@ Return Value:
--*/
BOOLEAN
DDKAPI
NTAPI
AtapiResetController(
IN PVOID HwDeviceExtension,
IN ULONG PathId
@ -2598,7 +2598,7 @@ Return Value:
--*/
BOOLEAN
DDKAPI
NTAPI
AtapiHwInitialize(
IN PVOID HwDeviceExtension
)
@ -3210,7 +3210,7 @@ Return Value:
--*/
BOOLEAN
DDKAPI
NTAPI
AtapiInterrupt(
IN PVOID HwDeviceExtension
)
@ -3400,7 +3400,7 @@ AtapiInterrupt2(
} // end AtapiInterrupt2()
RETTYPE_XXableInterrupts
DDKAPI
NTAPI
AtapiInterruptDpc(
IN PVOID HwDeviceExtension
)
@ -3437,7 +3437,7 @@ AtapiInterruptDpc(
RETTYPE_XXableInterrupts
DDKAPI
NTAPI
AtapiEnableInterrupts__(
IN PVOID HwDeviceExtension
)
@ -7251,7 +7251,7 @@ Return Value:
--*/
BOOLEAN
DDKAPI
NTAPI
AtapiStartIo(
IN PVOID HwDeviceExtension,
IN PSCSI_REQUEST_BLOCK Srb
@ -8343,7 +8343,7 @@ Return Value:
--*/
extern "C"
ULONG
DDKAPI
NTAPI
DriverEntry(
IN PVOID DriverObject,
IN PVOID Argument2
@ -9059,7 +9059,7 @@ AtapiRegCheckParameterValue(
SCSI_ADAPTER_CONTROL_STATUS
DDKAPI
NTAPI
AtapiAdapterControl(
IN PVOID HwDeviceExtension,
IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
@ -9152,7 +9152,7 @@ AtapiAdapterControl(
extern "C"
NTHALAPI
VOID
DDKAPI
NTAPI
HalDisplayString (
PUCHAR String
);

2244
include/ddk/cfgmgr32.h
View file

File diff suppressed because it is too large Load diff

95
include/ddk/cfg.h → include/psdk/cfg.h
View file

@ -20,8 +20,7 @@
*
*/
#ifndef _CFG_INCLUDED_
#define _CFG_INCLUDED_
#pragma once
#ifdef __cplusplus
extern "C" {
@ -77,7 +76,26 @@ extern "C" {
#define CM_PROB_DRIVER_BLOCKED 0x00000030
#define CM_PROB_REGISTRY_TOO_LARGE 0x00000031
#define CM_PROB_SETPROPERTIES_FAILED 0x00000032
#define NUM_CM_PROB 0x00000033
#define CM_PROB_WAITING_ON_DEPENDENCY 0x00000033
#define CM_PROB_UNSIGNED_DRIVER 0x00000034
#define NUM_CM_PROB_V1 0x00000025
#define NUM_CM_PROB_V2 0x00000032
#define NUM_CM_PROB_V3 0x00000033
#define NUM_CM_PROB_V4 0x00000034
#define NUM_CM_PROB_V5 0x00000035
#if (NTDDI_VERSION >= NTDDI_WIN7)
#define NUM_CM_PROB NUM_CM_PROB_V5
#elif (NTDDI_VERSION >= NTDDI_WS08)
#define NUM_CM_PROB NUM_CM_PROB_V4
#elif (NTDDI_VERSION >= NTDDI_WS03)
#define NUM_CM_PROB NUM_CM_PROB_V3
#elif (NTDDI_VERSION >= NTDDI_WINXP)
#define NUM_CM_PROB NUM_CM_PROB_V2
#elif (NTDDI_VERSION >= WIN2K)
#define NUM_CM_PROB NUM_CM_PROB_V1
#endif
#define LCPRI_FORCECONFIG 0x00000000
#define LCPRI_BOOTCONFIG 0x00000001
@ -95,24 +113,24 @@ extern "C" {
#define LCPRI_DISABLED 0x0000FFFF
#define MAX_LCPRI 0x0000FFFF
#define DN_ROOT_ENUMERATED 0x00000001 /* Was enumerated by ROOT */
#define DN_DRIVER_LOADED 0x00000002 /* Has Register_Device_Driver */
#define DN_ENUM_LOADED 0x00000004 /* Has Register_Enumerator */
#define DN_STARTED 0x00000008 /* Is currently configured */
#define DN_MANUAL 0x00000010 /* Manually installed */
#define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */
#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config (Win9x only) */
#define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */
#define DN_LIAR 0x00000100 /* Lied about can reconfig once (Win9x only) */
#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately (Win9x only) */
#define DN_HAS_PROBLEM 0x00000400 /* Need device installer */
#define DN_FILTERED 0x00000800 /* Is filtered */
#define DN_MOVED 0x00001000 /* Has been moved (Win9x only) */
#define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */
#define DN_REMOVABLE 0x00004000 /* Can be removed */
#define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */
#define DN_MF_PARENT 0x00010000 /* Multi function parent */
#define DN_MF_CHILD 0x00020000 /* Multi function child */
#define DN_ROOT_ENUMERATED 0x00000001 /* Was enumerated by ROOT */
#define DN_DRIVER_LOADED 0x00000002 /* Has Register_Device_Driver */
#define DN_ENUM_LOADED 0x00000004 /* Has Register_Enumerator */
#define DN_STARTED 0x00000008 /* Is currently configured */
#define DN_MANUAL 0x00000010 /* Manually installed */
#define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */
#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config (Win9x only) */
#define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */
#define DN_LIAR 0x00000100 /* Lied about can reconfig once (Win9x only) */
#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately (Win9x only) */
#define DN_HAS_PROBLEM 0x00000400 /* Need device installer */
#define DN_FILTERED 0x00000800 /* Is filtered */
#define DN_MOVED 0x00001000 /* Has been moved (Win9x only) */
#define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */
#define DN_REMOVABLE 0x00004000 /* Can be removed */
#define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */
#define DN_MF_PARENT 0x00010000 /* Multi function parent */
#define DN_MF_CHILD 0x00020000 /* Multi function child */
#define DN_WILL_BE_REMOVED 0x00040000
#define DN_NOT_FIRST_TIMEE 0x00080000
#define DN_STOP_FREE_RES 0x00100000
@ -128,11 +146,33 @@ extern "C" {
#define DN_NO_SHOW_IN_DM 0x40000000
#define DN_BOOT_LOG_PROB 0x80000000
#define DN_NEED_RESTART DN_LIAR
#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME
#define DN_LEGACY_DRIVER DN_MOVED
#if (NTDDI_VERSION >= NTDDI_WINXP)
#define DN_NEED_RESTART DN_LIAR
#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME
#define DN_LEGACY_DRIVER DN_MOVED
#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK
#elif (NTDDI_VERSION >= NTDDI_WIN2K)
#define DN_NEED_RESTART 0x00000100
#endif
#define DN_CHANGEABLE_FLAGS (DN_NOT_FIRST_TIME + \
DN_HARDWARE_ENUM + \
DN_HAS_MARK + \
DN_DISABLEABLE + \
DN_REMOVABLE + \
DN_MF_CHILD + \
DN_MF_PARENT + \
DN_NOT_FIRST_TIMEE + \
DN_STOP_FREE_RES + \
DN_REBAL_CANDIDATE + \
DN_NT_ENUMERATOR + \
DN_NT_DRIVER + \
DN_SILENT_INSTALL + \
DN_NO_SHOW_IN_DM)
typedef enum _PNP_VETO_TYPE {
PNP_VetoTypeUnknown,
@ -149,14 +189,7 @@ typedef enum _PNP_VETO_TYPE {
PNP_VetoLegacyDriver
} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
#define CM_GLOBAL_STATE_CAN_DO_UI 0x00000001
#define CM_GLOBAL_STATE_ON_BIG_STACK 0x00000002
#define CM_GLOBAL_STATE_SERVICES_AVAILABLE 0x00000004
#define CM_GLOBAL_STATE_SHUTTING_DOWN 0x00000008
#define CM_GLOBAL_STATE_DETECTION_PENDING 0x00000010
#ifdef __cplusplus
}
#endif
#endif /* _CFG_INCLUDED_ */

3209
include/psdk/cfgmgr32.h Normal file
View file

File diff suppressed because it is too large Load diff