- Reenable CrossNT stuff.

- Fix some #else BLAH / #endif BLAH warnings.
- Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now).

svn path=/trunk/; revision=29276

diff --git a/reactos/drivers/storage/ide/uniata/id_ata.cpp b/reactos/drivers/storage/ide/uniata/id_ata.cpp
index 50ea1d8..4f18cbd 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/id_ata.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_ata.cpp
@@ -4061,7 +4061,7 @@ try_dpc_wait:
 
 #ifndef UNIATA_CORE
                 goto PostToDpc;
-#else UNIATA_CORE
+#else //UNIATA_CORE
                 AtapiStallExecution(TimerValue);
                 goto ServiceInterrupt;
 #endif //UNIATA_CORE
@@ -4109,7 +4109,7 @@ try_dpc_wait:
                     }
 #ifndef UNIATA_CORE
                     goto CallTimerDpc2;
-#else UNIATA_CORE
+#else //UNIATA_CORE
                     AtapiStallExecution(TimerValue);
 #endif //UNIATA_CORE
                 }
@@ -4304,7 +4304,7 @@ PIO_wait_DRQ0:
                         KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (drq0)\n"));
 #ifndef UNIATA_CORE
                         goto PostToDpc;
-#else UNIATA_CORE
+#else //UNIATA_CORE
                         AtapiStallExecution(TimerValue);
                         goto ServiceInterrupt;
 #endif //UNIATA_CORE
@@ -4815,7 +4815,7 @@ PIO_wait_busy:
                     KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (busy)\n"));
 #ifndef UNIATA_CORE
                     goto PostToDpc;
-#else UNIATA_CORE
+#else //UNIATA_CORE
                     AtapiStallExecution(TimerValue);
                     goto ServiceInterrupt;
 #endif //UNIATA_CORE
@@ -4873,7 +4873,7 @@ PIO_wait_DRQ:
                         TimerValue = 100;
 #ifndef UNIATA_CORE
                         goto PostToDpc;
-#else UNIATA_CORE
+#else //UNIATA_CORE
                         AtapiStallExecution(TimerValue);
                         goto ServiceInterrupt;
 #endif //UNIATA_CORE
@@ -5018,7 +5018,7 @@ IntrCompleteReq:
             TimerValue = 2000;
 #ifndef UNIATA_CORE
             goto CallTimerDpc;
-#else UNIATA_CORE
+#else //UNIATA_CORE
             AtapiStallExecution(TimerValue);
             goto ServiceInterrupt;
 #endif //UNIATA_CORE
@@ -8057,10 +8057,10 @@ DriverEntry(
       ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k));
 
     // Set entry points.
-    hwInitializationData.comm.HwInitialize = AtapiHwInitialize;
-    hwInitializationData.comm.HwResetBus = AtapiResetController;
-    hwInitializationData.comm.HwStartIo = AtapiStartIo;
-    hwInitializationData.comm.HwInterrupt = AtapiInterrupt;
+    hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize;
+    hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController;
+    hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo;
+    hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt;
 
     // Specify size of extensions.
     hwInitializationData.comm.DeviceExtensionSize     = sizeof(HW_DEVICE_EXTENSION);
@@ -8072,7 +8072,7 @@ DriverEntry(
     // Set PnP-specific API
     if(WinVer_Id() > WinVer_NT) {
         hwInitializationData.comm.NeedPhysicalAddresses = TRUE;
-        hwInitializationData.w2k.HwAdapterControl = AtapiAdapterControl;
+        hwInitializationData.w2k.HwAdapterControl = (PHW_ADAPTER_CONTROL)AtapiAdapterControl;
     }
 
     KdPrint2((PRINT_PREFIX "\n\nATAPI IDE enum supported BusMaster Devices\n"));

diff --git a/reactos/drivers/storage/ide/uniata/id_queue.h b/reactos/drivers/storage/ide/uniata/id_queue.h
index 39510b5..d82c9e7 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/id_queue.h
+++ b/reactos/drivers/storage/ide/uniata/id_queue.h
@@ -38,4 +38,4 @@ UniataGetNextChannel(
     IN PHW_CHANNEL chan
     );
 
-#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__
+#endif //__UNIATA_COMMAND_QUEUE_SUPPORT__H__

diff --git a/reactos/drivers/storage/ide/uniata/id_sata.h b/reactos/drivers/storage/ide/uniata/id_sata.h
index c5877f5..ef6bc21 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/id_sata.h
+++ b/reactos/drivers/storage/ide/uniata/id_sata.h
@@ -33,4 +33,4 @@ UniataSataEvent(
     IN ULONG Action
     );
 
-#endif __UNIATA_SATA__H__
+#endif //__UNIATA_SATA__H__

diff --git a/reactos/drivers/storage/ide/uniata/ntddk_ex.h b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
index a01a6b1..071f7b9 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/ntddk_ex.h
+++ b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
@@ -1,12 +1,13 @@
 #ifndef __NTDDK_EX__H__
 #define __NTDDK_EX__H__
 
-typedef enum _SYSTEM_INFORMATION_CLASS {
+typedef enum _SYSTEM_INFORMATION_CLASS
+{
     SystemBasicInformation,
     SystemProcessorInformation,
     SystemPerformanceInformation,
     SystemTimeOfDayInformation,
-    SystemPathInformation,
+    SystemPathInformation, /// Obsolete: Use KUSER_SHARED_DATA
     SystemProcessInformation,
     SystemCallCountInformation,
     SystemDeviceInformation,
@@ -32,9 +33,9 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
     SystemUnloadGdiDriverInformation,
     SystemTimeAdjustmentInformation,
     SystemSummaryMemoryInformation,
-    SystemNextEventIdInformation,
-    SystemEventIdsInformation,
-    SystemCrashDumpInformation,
+    SystemMirrorMemoryInformation,
+    SystemPerformanceTraceInformation,
+    SystemObsolete0,
     SystemExceptionInformation,
     SystemCrashDumpStateInformation,
     SystemKernelDebuggerInformation,
@@ -44,13 +45,65 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
     SystemPrioritySeperation,
     SystemPlugPlayBusInformation,
     SystemDockInformation,
-    SystemPowerInformation,
+    SystemPowerInformationNative,
     SystemProcessorSpeedInformation,
     SystemCurrentTimeZoneInformation,
-    SystemLookasideInformation
+    SystemLookasideInformation,
+    SystemTimeSlipNotification,
+    SystemSessionCreate,
+    SystemSessionDetach,
+    SystemSessionInformation,
+    SystemRangeStartInformation,
+    SystemVerifierInformation,
+    SystemAddVerifier,
+    SystemSessionProcessesInformation,
+    SystemLoadGdiDriverInSystemSpaceInformation,
+    SystemNumaProcessorMap,
+    SystemPrefetcherInformation,
+    SystemExtendedProcessInformation,
+    SystemRecommendedSharedDataAlignment,
+    SystemComPlusPackage,
+    SystemNumaAvailableMemory,
+    SystemProcessorPowerInformation,
+    SystemEmulationBasicInformation,
+    SystemEmulationProcessorInformation,
+    SystemExtendedHanfleInformation,
+    SystemLostDelayedWriteInformation,
+    SystemBigPoolInformation,
+    SystemSessionPoolTagInformation,
+    SystemSessionMappedViewInformation,
+    SystemHotpatchInformation,
+    SystemObjectSecurityMode,
+    SystemWatchDogTimerHandler,
+    SystemWatchDogTimerInformation,
+    SystemLogicalProcessorInformation,
+    SystemWo64SharedInformationObosolete,
+    SystemRegisterFirmwareTableInformationHandler,
+    SystemFirmwareTableInformation,
+    SystemModuleInformationEx,
+    SystemVerifierTriageInformation,
+    SystemSuperfetchInformation,
+    SystemMemoryListInformation,
+    SystemFileCacheInformationEx,
+    SystemThreadPriorityClientIdInformation,
+    SystemProcessorIdleCycleTimeInformation,
+    SystemVerifierCancellationInformation,
+    SystemProcessorPowerInformationEx,
+    SystemRefTraceInformation,
+    SystemSpecialPoolInformation,
+    SystemProcessIdInformation,
+    SystemErrorPortInformation,
+    SystemBootEnvironmentInformation,
+    SystemHypervisorInformation,
+    SystemVerifierInformationEx,
+    SystemTimeZoneInformation,
+    SystemImageFileExecutionOptionsInformation,
+    SystemCoverageInformation,
+    SystemPrefetchPathInformation,
+    SystemVerifierFaultsInformation,
+    MaxSystemInfoClass,
 } SYSTEM_INFORMATION_CLASS;
 
-
 NTSYSAPI
 NTSTATUS
 NTAPI
@@ -105,7 +158,7 @@ typedef struct _SYSTEM_MODULE_INFORMATION
 } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
 
 typedef unsigned short  WORD;
-typedef unsigned int    BOOL;
+//typedef unsigned int    BOOL;
 typedef unsigned long   DWORD;
 typedef unsigned char   BYTE;
 
@@ -438,6 +491,7 @@ typedef struct _KTHREAD_HDR {
 */
 } KTHREAD_HDR, *PKTHREAD_HDR;
 
+#ifdef __REACTOS__
 typedef struct _IMAGE_DOS_HEADER {      // DOS .EXE header
     WORD   e_magic;                     // Magic number
     WORD   e_cblp;                      // Bytes on last page of file
@@ -543,6 +597,7 @@ typedef struct _IMAGE_EXPORT_DIRECTORY {
     DWORD   AddressOfNames;         // RVA from base of image
     DWORD   AddressOfNameOrdinals;  // RVA from base of image
 } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY;
+#endif
 
 NTHALAPI
 VOID

diff --git a/reactos/drivers/storage/ide/uniata/stdafx.h b/reactos/drivers/storage/ide/uniata/stdafx.h
index fbb9699..6c2f834 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/stdafx.h
+++ b/reactos/drivers/storage/ide/uniata/stdafx.h
@@ -6,7 +6,7 @@ extern "C" {
 #include "stddef.h"
 #include "stdarg.h"
 
-//#include "inc\CrossNt.h"
+#include "inc/CrossNt.h"
 
 #include "atapi.h"               // includes scsi.h
 #include "ntdddisk.h"