Author: fireball Date: Fri Sep 28 15:01:10 2007 New Revision: 29276
URL: http://svn.reactos.org/svn/reactos?rev=29276&view=rev Log: - Reenable CrossNT stuff. - Fix some #else BLAH / #endif BLAH warnings. - Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now).
Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h
Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 15:01:10 2007 @@ -4061,7 +4061,7 @@
#ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4109,7 +4109,7 @@ } #ifndef UNIATA_CORE goto CallTimerDpc2; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); #endif //UNIATA_CORE } @@ -4304,7 +4304,7 @@ 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 @@ 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 @@ TimerValue = 100; #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -5018,7 +5018,7 @@ TimerValue = 2000; #ifndef UNIATA_CORE goto CallTimerDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -8057,10 +8057,10 @@ ((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 @@ // 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"));
Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h Fri Sep 28 15:01:10 2007 @@ -38,4 +38,4 @@ IN PHW_CHANNEL chan );
-#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__ +#endif //__UNIATA_COMMAND_QUEUE_SUPPORT__H__
Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h Fri Sep 28 15:01:10 2007 @@ -33,4 +33,4 @@ IN ULONG Action );
-#endif __UNIATA_SATA__H__ +#endif //__UNIATA_SATA__H__
Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Fri Sep 28 15:01:10 2007 @@ -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 @@ SystemUnloadGdiDriverInformation, SystemTimeAdjustmentInformation, SystemSummaryMemoryInformation, - SystemNextEventIdInformation, - SystemEventIdsInformation, - SystemCrashDumpInformation, + SystemMirrorMemoryInformation, + SystemPerformanceTraceInformation, + SystemObsolete0, SystemExceptionInformation, SystemCrashDumpStateInformation, SystemKernelDebuggerInformation, @@ -44,12 +45,64 @@ 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 @@ -105,7 +158,7 @@ } 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 @@ */ } 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 @@ DWORD AddressOfNames; // RVA from base of image DWORD AddressOfNameOrdinals; // RVA from base of image } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY; +#endif
NTHALAPI VOID
Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h Fri Sep 28 15:01:10 2007 @@ -6,7 +6,7 @@ #include "stddef.h" #include "stdarg.h"
-//#include "inc\CrossNt.h" +#include "inc/CrossNt.h"
#include "atapi.h" // includes scsi.h #include "ntdddisk.h"