[project] Split AoE off, part 2
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Tue, 11 May 2010 01:40:43 +0000 (21:40 -0400)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Tue, 11 May 2010 01:40:43 +0000 (21:40 -0400)
At last, the unfortunately monolithic AoE module can be
separated from the bus, RAM disk and file-backed disk
code.  This is part 2 of an estimated 3 commits.  Do not
expect AoE to work until the third commit.

config.bat
makedriver.bat
src/aoe/driver.c [moved from src/bus/aoe.c with 100% similarity]
src/aoe/makefile [new file with mode: 0644]
src/aoe/protocol.c [moved from src/bus/protocol.c with 100% similarity]
src/aoe/sources [new file with mode: 0644]

index d77f02a..126b0f5 100644 (file)
@@ -2,5 +2,5 @@ rem This is the root directory of the ddk.
 set ddkdir=c:\winddk\6001.18001\r
 \r
 rem Next two lines are duplicated in Makefile, edit both when adding files or changing pxe style.\r
-set c=driver.c registry.c bus.c bus_pnp.c bus_dev_ctl.c disk.c ramdisk.c filedisk.c memdisk.c grub4dos.c disk_pnp.c disk_dev_ctl.c disk_scsi.c aoe.c protocol.c debug.c probe.c winvblock.rc irp.c\r
+set c=driver.c registry.c bus.c bus_pnp.c bus_dev_ctl.c disk.c ramdisk.c filedisk.c memdisk.c grub4dos.c disk_pnp.c disk_dev_ctl.c disk_scsi.c debug.c probe.c winvblock.rc irp.c\r
 set pxestyle=asm\r
index fbc874a..21dd7c1 100644 (file)
@@ -70,7 +70,7 @@ echo TARGETTYPE=EXPORT_DRIVER >> sources
 echo TARGETPATH=obj >> sources\r
 echo TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib >> sources\r
 echo SOURCES=%c% >> sources\r
-echo C_DEFINES=-DPROJECT_BUS=1 >> sources\r
+echo C_DEFINES=-DPROJECT_BUS=1 -DSPLIT_AOE=1>> sources\r
 echo NAME %name%.sys> %name%.def\r
 build\r
 copy obj%obj%\%arch%\%name%.sys ..\..\bin >nul\r
similarity index 100%
rename from src/bus/aoe.c
rename to src/aoe/driver.c
diff --git a/src/aoe/makefile b/src/aoe/makefile
new file mode 100644 (file)
index 0000000..53b9a3d
--- /dev/null
@@ -0,0 +1 @@
+!INCLUDE $(NTMAKEENV)\makefile.def\r
similarity index 100%
rename from src/bus/protocol.c
rename to src/aoe/protocol.c
diff --git a/src/aoe/sources b/src/aoe/sources
new file mode 100644 (file)
index 0000000..81c7939
--- /dev/null
@@ -0,0 +1,7 @@
+INCLUDES=..\include\r
+TARGETNAME=aoe32\r
+TARGETTYPE=DRIVER\r
+TARGETPATH=obj\r
+TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib ..\\..\\bin\\wvblk32.lib\r
+SOURCES=driver.c protocol.c\r
+C_DEFINES=-DPROJECT_AOE=1
\ No newline at end of file