[ros-diffs] [reactos] 01/01: [UNIATA] Fix uniata on x64

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a71a6531ef157fb39d29171cff6fc59a47e2c4be

commit a71a6531ef157fb39d29171cff6fc59a47e2c4be
Author:     Timo Kreuzer <timo.kreu...@reactos.org>
AuthorDate: Wed Aug 8 12:29:07 2018 +0200
Commit:     Timo Kreuzer <timo.kreu...@reactos.org>
CommitDate: Sun Sep 8 10:39:01 2019 +0200

    [UNIATA] Fix uniata on x64
---
 drivers/storage/ide/uniata/bsmaster.h  | 4 ++++
 drivers/storage/ide/uniata/id_sata.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/drivers/storage/ide/uniata/bsmaster.h 
b/drivers/storage/ide/uniata/bsmaster.h
index ed42cc7ba97..4b748b4981b 100644
--- a/drivers/storage/ide/uniata/bsmaster.h
+++ b/drivers/storage/ide/uniata/bsmaster.h
@@ -1003,7 +1003,11 @@ struct _HW_LU_EXTENSION;
 
 typedef struct _IORES {
     union {
+#ifdef __REACTOS__
+        ULONG_PTR Addr;      /* Base address*/
+#else
         ULONG Addr;          /* Base address*/
+#endif
         PVOID pAddr;         /* Base address in pointer form */
     };
     ULONG MemIo:1;       /* Memory mapping (1) vs IO ports (0) */
diff --git a/drivers/storage/ide/uniata/id_sata.cpp 
b/drivers/storage/ide/uniata/id_sata.cpp
index 2c67131983c..edd7289e3ed 100644
--- a/drivers/storage/ide/uniata/id_sata.cpp
+++ b/drivers/storage/ide/uniata/id_sata.cpp
@@ -650,7 +650,11 @@ UniataAhciInit(
     ULONG c, i;
     PHW_CHANNEL chan;
     ULONG offs;
+#ifdef __REACTOS__
+    ULONG_PTR BaseMemAddress;
+#else
     ULONG BaseMemAddress;
+#endif
     ULONG PI;
     ULONG CAP;
     ULONG CAP2;