From 6249939b47bd8520ef4c1b8fdb8eeb11cc052d57 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@prelude.(none)>
Date: Wed, 20 Jan 2010 10:55:45 +0800
Subject: [PATCH] Moved ATA driver out of Kernel tree - Also changed VER3 macro
 to VER2 for compatability with MODULE_DEFINE

---
 Kernel/Makefile.BuildNum              | 2 +-
 Kernel/include/acess.h                | 2 +-
 Makefile.cfg                          | 4 ++--
 Modules/ATA/Makefile                  | 7 +++++++
 {Kernel/drv => Modules/ATA}/ata_x86.c | 0
 Modules/IPStack/main.c                | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 Modules/ATA/Makefile
 rename {Kernel/drv => Modules/ATA}/ata_x86.c (100%)

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index 911235d7..cf092370 100644
--- a/Kernel/Makefile.BuildNum
+++ b/Kernel/Makefile.BuildNum
@@ -1 +1 @@
-BUILD_NUM = 1386
+BUILD_NUM = 1387
diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index a87aaec1..d4df34bc 100644
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -27,7 +27,7 @@ typedef Sint64	tTimestamp;
 #define STR(x) #x
 #define EXPAND_STR(x) STR(x)
 
-#define VER3(major,minor,patch)	((((major)&0xFF)<<16)|(((minor)&0xFF)<<8)|((patch)&0xFF))
+#define VER2(major,minor)	((((major)&0xFF)<<8)|((minor)&0xFF))
 /**
  * \}
  */
diff --git a/Makefile.cfg b/Makefile.cfg
index 9363ff68..be0194f0 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -24,8 +24,8 @@ ifeq ($(ARCHDIR),)
 endif
 
 FILESYSTEMS = fat
-DRIVERS = ata_x86
-MODULES = FS_Ext2 FDD NE2000 BochsGA IPStack
+DRIVERS = 
+MODULES = ATA FS_Ext2 FDD NE2000 BochsGA IPStack
 DYNMODS = USB UDI
 
 #DISTROOT = /mnt/AcessHDD/Acess2
diff --git a/Modules/ATA/Makefile b/Modules/ATA/Makefile
new file mode 100644
index 00000000..a697f66b
--- /dev/null
+++ b/Modules/ATA/Makefile
@@ -0,0 +1,7 @@
+#
+#
+
+OBJ = ata_x86.o
+NAME = ATA
+
+-include ../Makefile.tpl
diff --git a/Kernel/drv/ata_x86.c b/Modules/ATA/ata_x86.c
similarity index 100%
rename from Kernel/drv/ata_x86.c
rename to Modules/ATA/ata_x86.c
diff --git a/Modules/IPStack/main.c b/Modules/IPStack/main.c
index 831000a4..5f34d9a1 100644
--- a/Modules/IPStack/main.c
+++ b/Modules/IPStack/main.c
@@ -3,7 +3,7 @@
  * - Stack Initialisation
  */
 #define DEBUG	0
-#define VERSION	VER3(0,10,0)
+#define VERSION	VER2(0,10)
 #include "ipstack.h"
 #include "link.h"
 #include <modules.h>
-- 
2.20.1