From: John Hodge <tpg@mutabah.net>
Date: Mon, 17 Oct 2011 03:08:57 +0000 (+0800)
Subject: Modules - Added DEPS variable for inter-module includes
X-Git-Tag: rel0.13~48
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=6b71b6d8b62bc72fa91f6bc87b39185705f66f6c;p=tpg%2Facess2.git

Modules - Added DEPS variable for inter-module includes
---

diff --git a/Kernel/include/dma.h b/Kernel/include/dma.h
deleted file mode 100644
index b1a6d1a6..00000000
--- a/Kernel/include/dma.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Acess2 DMA Driver
- */
-#ifndef _DMA_H_
-#define _DMA_H_
-
-extern void	DMA_SetChannel(int channel, int length, int read);
-extern int	DMA_ReadData(int channel, int count, void *buffer);
-extern int	DMA_WriteData(int channel, int count, void *buffer);
-
-#endif
diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 36445f68..b31943e6 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -6,7 +6,7 @@ _CPPFLAGS := $(CPPFLAGS)
 
 -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
 
-LIBINCLUDES := $(addprefix -I$(ACESSDIR)/Modules/Libraries/,$(LIBS))
+LIBINCLUDES := $(addprefix -I$(ACESSDIR)/Modules/,$(DEPS))
 LIBINCLUDES := $(addsuffix /include,$(LIBINCLUDES))
 
 CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include
diff --git a/Modules/Storage/FDDv2/Makefile b/Modules/Storage/FDDv2/Makefile
index f83de396..97aae0c4 100644
--- a/Modules/Storage/FDDv2/Makefile
+++ b/Modules/Storage/FDDv2/Makefile
@@ -1,6 +1,7 @@
 #
 #
 
+DEPS = x86/ISADMA
 OBJ = main.o fdc.o
 NAME = FDDv2
 
diff --git a/Modules/x86/ISADMA/include/dma.h b/Modules/x86/ISADMA/include/dma.h
new file mode 100644
index 00000000..b1a6d1a6
--- /dev/null
+++ b/Modules/x86/ISADMA/include/dma.h
@@ -0,0 +1,11 @@
+/*
+ * Acess2 DMA Driver
+ */
+#ifndef _DMA_H_
+#define _DMA_H_
+
+extern void	DMA_SetChannel(int channel, int length, int read);
+extern int	DMA_ReadData(int channel, int count, void *buffer);
+extern int	DMA_WriteData(int channel, int count, void *buffer);
+
+#endif