From 35f7d0523c463a6b6cc4d859c2e05234bdb0c6b8 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Tue, 1 Oct 2013 14:41:57 +0800
Subject: [PATCH] Modules/UDI - Fixed kernel-land compile errors

---
 KernelLand/Modules/Interfaces/UDI/Makefile             | 6 ++++++
 KernelLand/Modules/Interfaces/UDI/include/udi_physio.h | 2 +-
 KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c      | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/KernelLand/Modules/Interfaces/UDI/Makefile b/KernelLand/Modules/Interfaces/UDI/Makefile
index dde172c3..57160b4a 100644
--- a/KernelLand/Modules/Interfaces/UDI/Makefile
+++ b/KernelLand/Modules/Interfaces/UDI/Makefile
@@ -17,3 +17,9 @@ OBJ += $(LIB_OBJS:%=udi_lib/%) $(TRANS_OBJS:%=trans/%)
 NAME = UDI
 
 -include ../Makefile.tpl
+
+ifeq ($(ARCHDIR),x86)
+ CPPFLAGS += -DUDI_ABI_is_ia32
+else
+ $(error TODO: Support other UDI ABIs [$(ARCHDIR) unsupported])
+endif
diff --git a/KernelLand/Modules/Interfaces/UDI/include/udi_physio.h b/KernelLand/Modules/Interfaces/UDI/include/udi_physio.h
index 818257e0..84b684b8 100644
--- a/KernelLand/Modules/Interfaces/UDI/include/udi_physio.h
+++ b/KernelLand/Modules/Interfaces/UDI/include/udi_physio.h
@@ -10,7 +10,7 @@
 // DMA Core
 typedef _udi_handle_t	udi_dma_handle_t;
 #define	UDI_NULL_DMA_HANDLE	_NULL_HANDLE
-typedef Uint64	udi_busaddr64_t;	//!< \note Opaque
+typedef uint64_t	udi_busaddr64_t;	//!< \note Opaque
 typedef struct udi_scgth_element_32_s	udi_scgth_element_32_t;
 typedef struct udi_scgth_element_64_s	udi_scgth_element_64_t;
 typedef struct udi_scgth_s	udi_scgth_t;
diff --git a/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c b/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
index 96e1462e..b5869477 100644
--- a/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
+++ b/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
@@ -7,6 +7,7 @@
  */
 #include <udi.h>
 #include <udi_physio.h>
+#include <acess.h>
 #include <drv_pci.h>	// acess
 
 // === MACROS ===
-- 
2.20.1