From 945a85f7cb09259c04bf34d38ee7eada90c15280 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Thu, 27 Sep 2007 20:45:13 +0000
Subject: [PATCH] - Add uniata.rbuild, adapt .rc to ReactOS - Preliminary
 compilation fixes. - Remove CrossNt stuff for now.

svn path=/trunk/; revision=29260
---
 reactos/drivers/storage/ide/uniata/atapi.h    |  2 +-
 reactos/drivers/storage/ide/uniata/badblock.h |  2 +-
 reactos/drivers/storage/ide/uniata/config.h   |  1 +
 reactos/drivers/storage/ide/uniata/id_queue.h |  2 +-
 reactos/drivers/storage/ide/uniata/id_sata.h  |  2 +-
 reactos/drivers/storage/ide/uniata/idedma.rc  |  7 +------
 .../drivers/storage/ide/uniata/inc/rwlock.h   |  2 +-
 reactos/drivers/storage/ide/uniata/stdafx.h   |  2 +-
 .../drivers/storage/ide/uniata/uniata.rbuild  | 21 +++++++++++++++++++
 9 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 reactos/drivers/storage/ide/uniata/uniata.rbuild

diff --git a/reactos/drivers/storage/ide/uniata/atapi.h b/reactos/drivers/storage/ide/uniata/atapi.h
index edcb54ca103..18278ecc283 100644
--- a/reactos/drivers/storage/ide/uniata/atapi.h
+++ b/reactos/drivers/storage/ide/uniata/atapi.h
@@ -95,7 +95,7 @@ ScsiDebugPrint(
 ULONG
 _cdecl
 DbgPrint(
-    PCH Format,
+    const CHAR * Format,
     ...
     );
 #endif // USE_DBGPRINT_LOGGER
diff --git a/reactos/drivers/storage/ide/uniata/badblock.h b/reactos/drivers/storage/ide/uniata/badblock.h
index 871cf9b0836..f357a499e2f 100644
--- a/reactos/drivers/storage/ide/uniata/badblock.h
+++ b/reactos/drivers/storage/ide/uniata/badblock.h
@@ -75,4 +75,4 @@ CheckIfBadBlock(
     IN ULONG count
     );
 
-#endif // _BADBLOCK_H_INCLUDED_
\ No newline at end of file
+#endif // _BADBLOCK_H_INCLUDED_
diff --git a/reactos/drivers/storage/ide/uniata/config.h b/reactos/drivers/storage/ide/uniata/config.h
index c910a235ca6..a7467afc055 100644
--- a/reactos/drivers/storage/ide/uniata/config.h
+++ b/reactos/drivers/storage/ide/uniata/config.h
@@ -93,6 +93,7 @@
 
  /* ReactOS-specific defines */
  #ifdef USE_REACTOS_DDK
+  #define DDKFASTAPI __attribute__((fastcall))
  #else //USE_REACTOS_DDK
 
   #define DDKAPI          __attribute__((stdcall))
diff --git a/reactos/drivers/storage/ide/uniata/id_queue.h b/reactos/drivers/storage/ide/uniata/id_queue.h
index 01548d31efb..39510b56534 100644
--- 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__
\ No newline at end of file
+#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 96218899da9..c5877f578cd 100644
--- 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__
\ No newline at end of file
+#endif __UNIATA_SATA__H__
diff --git a/reactos/drivers/storage/ide/uniata/idedma.rc b/reactos/drivers/storage/ide/uniata/idedma.rc
index 878166ed757..607a9b5397b 100644
--- a/reactos/drivers/storage/ide/uniata/idedma.rc
+++ b/reactos/drivers/storage/ide/uniata/idedma.rc
@@ -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>
diff --git a/reactos/drivers/storage/ide/uniata/inc/rwlock.h b/reactos/drivers/storage/ide/uniata/inc/rwlock.h
index b304781eddd..b4a52ab0949 100644
--- a/reactos/drivers/storage/ide/uniata/inc/rwlock.h
+++ b/reactos/drivers/storage/ide/uniata/inc/rwlock.h
@@ -36,4 +36,4 @@ typedef struct _LOCK_STATE {
 #define RWLOCK_FOR_WRITE              TRUE
 #define RWLOCK_FOR_READ               FALSE
 
-#endif __CROSS_NT_RWLOCK__H__
+#endif // __CROSS_NT_RWLOCK__H__
diff --git a/reactos/drivers/storage/ide/uniata/stdafx.h b/reactos/drivers/storage/ide/uniata/stdafx.h
index e0f83cc7cac..fbb96991023 100644
--- 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"
diff --git a/reactos/drivers/storage/ide/uniata/uniata.rbuild b/reactos/drivers/storage/ide/uniata/uniata.rbuild
new file mode 100644
index 00000000000..f0817e59f5f
--- /dev/null
+++ b/reactos/drivers/storage/ide/uniata/uniata.rbuild
@@ -0,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>