Modules - Added DEPS variable for inter-module includes

diff --git a/Kernel/include/dma.h b/Kernel/include/dma.h
deleted file mode 100644 (file)
index b1a6d1a..0000000
--- 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 36445f6..b31943e 100644 (file)
--- 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 f83de39..97aae0c 100644 (file)
--- 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 (file)
index 0000000..b1a6d1a
--- /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