From a5f7b08edfe04a8c9f924aed53157c848829c7d2 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 29 Mar 2010 09:15:47 +0000 Subject: [PATCH] Move IoAttachDeviceToDeviceStackSafe to ntddk.h svn path=/trunk/; revision=46565 --- reactos/drivers/serial/serial/serial.h | 9 --------- reactos/include/ddk/ntddk.h | 8 ++++++++ reactos/include/ddk/ntifs.h | 9 --------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/reactos/drivers/serial/serial/serial.h b/reactos/drivers/serial/serial/serial.h index de94b291138..b6ed661226c 100644 --- a/reactos/drivers/serial/serial/serial.h +++ b/reactos/drivers/serial/serial/serial.h @@ -17,15 +17,6 @@ #define PST_RS232 1 #define COMMPROP_INITIALIZED 0xE73CF52E -#ifndef _NTIFS_ -/* Why is it only defined in ntifs.h file? */ -NTSTATUS NTAPI -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); -#endif - typedef enum { dsStopped, diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h index 0475b3acc85..4e27091d5c6 100644 --- a/reactos/include/ddk/ntddk.h +++ b/reactos/include/ddk/ntddk.h @@ -2394,6 +2394,14 @@ IoWritePartitionTableEx( IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX *DriveLayout); +NTKERNELAPI +NTSTATUS +NTAPI +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ /** Kernel debugger routines **/ diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index 5f032726d38..87d0470888c 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -8933,15 +8933,6 @@ FsRtlUninitializeOplock ( IN OUT POPLOCK Oplock ); -NTKERNELAPI -NTSTATUS -NTAPI -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject -); - NTKERNELAPI NTSTATUS NTAPI