Author: fireball Date: Fri Sep 28 00:45:13 2007 New Revision: 29260
URL: http://svn.reactos.org/svn/reactos?rev=29260&view=rev Log: - Add uniata.rbuild, adapt .rc to ReactOS - Preliminary compilation fixes. - Remove CrossNt stuff for now.
Added: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (with props) Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/idedma.rc trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h
Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h Fri Sep 28 00:45:13 2007 @@ -95,7 +95,7 @@ ULONG _cdecl DbgPrint( - PCH Format, + const CHAR * Format, ... ); #endif // USE_DBGPRINT_LOGGER
Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/badblock.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/badblock.h Fri Sep 28 00:45:13 2007 @@ -75,4 +75,4 @@ IN ULONG count );
-#endif // _BADBLOCK_H_INCLUDED_ +#endif // _BADBLOCK_H_INCLUDED_
Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h Fri Sep 28 00:45:13 2007 @@ -93,6 +93,7 @@
/* ReactOS-specific defines */ #ifdef USE_REACTOS_DDK + #define DDKFASTAPI __attribute__((fastcall)) #else //USE_REACTOS_DDK
#define DDKAPI __attribute__((stdcall))
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 00:45:13 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 00:45:13 2007 @@ -33,4 +33,4 @@ IN ULONG Action );
-#endif __UNIATA_SATA__H__ +#endif __UNIATA_SATA__H__
Modified: trunk/reactos/drivers/storage/ide/uniata/idedma.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/idedma.rc (original) +++ trunk/reactos/drivers/storage/ide/uniata/idedma.rc Fri Sep 28 00:45:13 2007 @@ -1,8 +1,3 @@ -#include <windows.h> - -#include <ntverp.h> -#include "uniata_ver.h" - #undef VERSION #define VERSION "0." UNIATA_VER_STR #define VER_FILETYPE VFT_DRV @@ -24,4 +19,4 @@
#define VER_LANGNEUTRAL
-#include "common.ver" +#include <reactos/version.rc>
Modified: trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/rwlock.h Fri Sep 28 00:45:13 2007 @@ -36,4 +36,4 @@ #define RWLOCK_FOR_WRITE TRUE #define RWLOCK_FOR_READ FALSE
-#endif __CROSS_NT_RWLOCK__H__ +#endif // __CROSS_NT_RWLOCK__H__
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 00:45:13 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"
Added: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (added) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Fri Sep 28 00:45:13 2007 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> + <define name="_DEBUG" /> + <include base="uniata">.</include> + <include base="uniata">inc</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>scsiport</library> + <file>id_ata.cpp</file> + <file>id_badblock.cpp</file> + <file>id_dma.cpp</file> + <file>id_init.cpp</file> + <file>id_probe.cpp</file> + <file>id_queue.cpp</file> + <file>id_sata.cpp</file> + <file>stdafx.cpp</file> + <file>idedma.rc</file> +</module>
Propchange: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild ------------------------------------------------------------------------------ svn:eol-style = native