[disk->libdisk] Continue librarization process
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 10 Jan 2011 02:48:30 +0000 (21:48 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 10 Jan 2011 02:48:30 +0000 (21:48 -0500)
WinVBlock.dev
src/winvblock/libdisk/dev_ctl.c [moved from src/winvblock/disk/dev_ctl.c with 100% similarity]
src/winvblock/libdisk/libdisk.c [moved from src/winvblock/disk/disk.c with 100% similarity]
src/winvblock/libdisk/makelib.bat [moved from src/winvblock/disk/makelib.bat with 68% similarity]
src/winvblock/libdisk/pnp.c [moved from src/winvblock/disk/pnp.c with 100% similarity]
src/winvblock/libdisk/scsi.c [moved from src/winvblock/disk/scsi.c with 100% similarity]
src/winvblock/makedriver.bat

index ecb1a62..45f672e 100644 (file)
@@ -8,7 +8,7 @@ Ver=3
 IsCpp=1\r
 ProfilesCount=2\r
 ProfileIndex=0\r
-Folders=AoE,HTTPDisk,HTTPDisk_Util,Include,Util,WinVBlock,WinVBlock/Disk,WinVBlock/FileDisk,WinVBlock/LibBus,WinVBlock/LibThread,WinVBlock/RAMDisk\r
+Folders=AoE,HTTPDisk,HTTPDisk_Util,Include,Util,WinVBlock,WinVBlock/FileDisk,WinVBlock/LibBus,WinVBlock/LibDisk,WinVBlock/LibThread,WinVBlock/RAMDisk\r
 \r
 [VersionInfo]\r
 Major=0\r
@@ -84,9 +84,9 @@ CompilerSet=1
 CompilerType=1\r
 \r
 [Unit21]\r
-FileName=src\winvblock\ramdisk\ramdisk.c\r
+FileName=src\include\debug.h\r
 CompileCpp=1\r
-Folder=WinVBlock/RAMDisk\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -94,7 +94,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit23]\r
-FileName=src\include\aoe.h\r
+FileName=src\include\driver.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -104,17 +104,17 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit22]\r
-FileName=src\winvblock\winvblock.rc\r
+FileName=src\include\disk.h\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=Include\r
 Compile=1\r
-Link=0\r
+Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit24]\r
-FileName=src\include\bus.h\r
+FileName=src\include\filedisk.h\r
 Folder=Include\r
 Compile=1\r
 Link=1\r
@@ -124,7 +124,7 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit25]\r
-FileName=src\include\debug.h\r
+FileName=src\include\grub4dos.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -134,7 +134,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit26]\r
-FileName=src\include\disk.h\r
+FileName=src\include\httpdisk.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -144,7 +144,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit27]\r
-FileName=src\include\driver.h\r
+FileName=src\include\mdi.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -154,7 +154,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit28]\r
-FileName=src\include\filedisk.h\r
+FileName=src\include\memdisk.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -164,7 +164,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit30]\r
-FileName=src\include\httpdisk.h\r
+FileName=src\include\portable.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -174,7 +174,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit35]\r
-FileName=src\include\probe.h\r
+FileName=src\include\resource.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -184,7 +184,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit36]\r
-FileName=src\include\protocol.h\r
+FileName=src\include\winvblock.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -194,9 +194,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit19]\r
-FileName=src\winvblock\ramdisk\grub4dos.c\r
+FileName=src\include\aoe.h\r
 CompileCpp=1\r
-Folder=WinVBlock/RAMDisk\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -204,17 +204,17 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit37]\r
-FileName=src\include\ramdisk.h\r
+FileName=src\aoe\aoe.rc\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=AoE\r
 Compile=1\r
-Link=1\r
+Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit38]\r
-FileName=src\include\registry.h\r
+FileName=src\include\device.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -224,9 +224,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit39]\r
-FileName=src\include\resource.h\r
+FileName=src\winvblock\device.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -234,9 +234,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit40]\r
-FileName=src\include\winvblock.h\r
+FileName=src\winvblock\filedisk\filedisk.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock/FileDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -244,17 +244,17 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit41]\r
-FileName=src\aoe\aoe.rc\r
+FileName=src\winvblock\filedisk\grub4dos.c\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=WinVBlock/FileDisk\r
 Compile=1\r
-Link=0\r
+Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit42]\r
-FileName=src\include\device.h\r
+FileName=src\include\byte.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -264,19 +264,19 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit44]\r
-FileName=src\winvblock\filedisk\filedisk.c\r
+FileName=src\util\winvblock.rc\r
 CompileCpp=1\r
-Folder=WinVBlock/FileDisk\r
+Folder=Util\r
 Compile=1\r
-Link=1\r
+Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit45]\r
-FileName=src\winvblock\filedisk\grub4dos.c\r
+FileName=src\include\wv_stdlib.h\r
 CompileCpp=1\r
-Folder=WinVBlock/FileDisk\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -284,9 +284,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit46]\r
-FileName=src\include\byte.h\r
+FileName=src\winvblock\wv_stdlib.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -294,7 +294,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit47]\r
-FileName=src\include\msvhd.h\r
+FileName=src\include\wv_stddef.h\r
 Folder=Include\r
 Compile=1\r
 Link=1\r
@@ -304,17 +304,17 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit48]\r
-FileName=src\util\winvblock.rc\r
+FileName=src\aoe\wv_stdlib.c\r
 CompileCpp=1\r
-Folder=Util\r
+Folder=AoE\r
 Compile=1\r
-Link=0\r
+Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit49]\r
-FileName=src\include\wv_stdlib.h\r
+FileName=src\include\wv_string.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -324,7 +324,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit50]\r
-FileName=src\winvblock\wv_stdlib.c\r
+FileName=src\winvblock\wv_string.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -334,7 +334,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit51]\r
-FileName=src\include\wv_stddef.h\r
+FileName=src\include\wv_stdbool.h\r
 Folder=Include\r
 Compile=1\r
 Link=1\r
@@ -344,7 +344,7 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit52]\r
-FileName=src\aoe\wv_stdlib.c\r
+FileName=src\aoe\wv_string.c\r
 CompileCpp=1\r
 Folder=AoE\r
 Compile=1\r
@@ -482,9 +482,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit17]\r
-FileName=src\winvblock\disk\pnp.c\r
+FileName=src\winvblock\ramdisk\ramdisk.c\r
 CompileCpp=1\r
-Folder=WinVBlock/Disk\r
+Folder=WinVBlock/RAMDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -492,19 +492,19 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit18]\r
-FileName=src\winvblock\disk\scsi.c\r
+FileName=src\winvblock\winvblock.rc\r
 CompileCpp=1\r
-Folder=WinVBlock/Disk\r
+Folder=WinVBlock\r
 Compile=1\r
-Link=1\r
+Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit20]\r
-FileName=src\winvblock\ramdisk\memdisk.c\r
+FileName=src\include\bus.h\r
 CompileCpp=1\r
-Folder=WinVBlock/RAMDisk\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -512,8 +512,8 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit53]\r
-FileName=src\include\wv_string.h\r
-Folder=Include\r
+FileName=src\aoe\bus.c\r
+Folder=AoE\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -522,9 +522,9 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit54]\r
-FileName=src\winvblock\wv_string.c\r
+FileName=src\aoe\registry.c\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=AoE\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -532,9 +532,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit55]\r
-FileName=src\include\wv_stdbool.h\r
+FileName=src\util\winvblk.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=Util\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -542,9 +542,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit56]\r
-FileName=src\aoe\wv_string.c\r
+FileName=src\include\irp.h\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -552,9 +552,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit57]\r
-FileName=src\aoe\bus.c\r
+FileName=src\winvblock\irp.c\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -562,9 +562,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit58]\r
-FileName=src\aoe\registry.c\r
+FileName=src\winvblock\libbus\pnp.c\r
 CompileCpp=1\r
-Folder=AoE\r
+Folder=WinVBlock/LibBus\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -572,8 +572,8 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit59]\r
-FileName=src\util\winvblk.c\r
-Folder=Util\r
+FileName=src\include\dummy.h\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -582,7 +582,7 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit61]\r
-FileName=src\winvblock\irp.c\r
+FileName=src\winvblock\bus.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -592,9 +592,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit60]\r
-FileName=src\include\irp.h\r
+FileName=src\winvblock\dummy.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -602,9 +602,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit63]\r
-FileName=src\include\dummy.h\r
+FileName=src\winvblock\libthread\libthread.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock/LibThread\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -612,9 +612,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit64]\r
-FileName=src\winvblock\dummy.c\r
+FileName=src\include\libthread.h\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -622,9 +622,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit65]\r
-FileName=src\winvblock\bus.c\r
+FileName=src\httpdisk\bus.c\r
 CompileCpp=1\r
-Folder=WinVBlock\r
+Folder=HTTPDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -632,9 +632,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit66]\r
-FileName=src\winvblock\libbus\libbus.c\r
+FileName=src\winvblock\libdisk\scsi.c\r
 CompileCpp=1\r
-Folder=WinVBlock/LibBus\r
+Folder=WinVBlock/LibDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -642,9 +642,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit67]\r
-FileName=src\winvblock\libthread\libthread.c\r
+FileName=src\winvblock\libdisk\dev_ctl.c\r
 CompileCpp=1\r
-Folder=WinVBlock/LibThread\r
+Folder=WinVBlock/LibDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -652,9 +652,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit68]\r
-FileName=src\include\libthread.h\r
+FileName=src\winvblock\libdisk\libdisk.c\r
 CompileCpp=1\r
-Folder=Include\r
+Folder=WinVBlock/LibDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -662,9 +662,9 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit69]\r
-FileName=src\httpdisk\bus.c\r
+FileName=src\winvblock\libdisk\pnp.c\r
 CompileCpp=1\r
-Folder=HTTPDisk\r
+Folder=WinVBlock/LibDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
@@ -672,7 +672,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit32]\r
-FileName=src\include\memdisk.h\r
+FileName=src\include\protocol.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -682,7 +682,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit33]\r
-FileName=src\include\mount.h\r
+FileName=src\include\ramdisk.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -692,7 +692,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit29]\r
-FileName=src\include\grub4dos.h\r
+FileName=src\include\mount.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -702,7 +702,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit31]\r
-FileName=src\include\mdi.h\r
+FileName=src\include\probe.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -722,7 +722,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit34]\r
-FileName=src\include\portable.h\r
+FileName=src\include\registry.h\r
 CompileCpp=1\r
 Folder=Include\r
 Compile=1\r
@@ -731,40 +731,40 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit16]\r
-FileName=src\winvblock\disk\disk.c\r
-CompileCpp=1\r
-Folder=WinVBlock/Disk\r
+[Unit43]\r
+FileName=src\include\msvhd.h\r
+Folder=Include\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
+CompileCpp=1\r
 \r
-[Unit43]\r
-FileName=src\winvblock\device.c\r
-Folder=WinVBlock\r
+[Unit15]\r
+FileName=src\winvblock\ramdisk\grub4dos.c\r
+CompileCpp=1\r
+Folder=WinVBlock/RAMDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
-CompileCpp=1\r
 \r
-[Unit15]\r
-FileName=src\winvblock\disk\dev_ctl.c\r
+[Unit62]\r
+FileName=src\winvblock\libbus\libbus.c\r
 CompileCpp=1\r
-Folder=WinVBlock/Disk\r
+Folder=WinVBlock/LibBus\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit62]\r
-FileName=src\winvblock\libbus\pnp.c\r
+[Unit16]\r
+FileName=src\winvblock\ramdisk\memdisk.c\r
 CompileCpp=1\r
-Folder=WinVBlock/LibBus\r
+Folder=WinVBlock/RAMDisk\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
similarity index 68%
rename from src/winvblock/disk/makelib.bat
rename to src/winvblock/libdisk/makelib.bat
index 6f7d06a..e9a787c 100644 (file)
@@ -1,8 +1,8 @@
 @echo off\r
 \r
-set libname=disk\r
+set libname=libdisk\r
 \r
-set c=disk.c dev_ctl.c scsi.c pnp.c\r
+set c=libdisk.c dev_ctl.c scsi.c pnp.c\r
 \r
 echo !INCLUDE $(NTMAKEENV)\makefile.def        > makefile\r
 \r
index 0e2c919..221cbf1 100644 (file)
@@ -1,6 +1,6 @@
 @echo off\r
 \r
-set lib=libbus disk ramdisk filedisk libthread\r
+set lib=libbus libdisk ramdisk filedisk libthread\r
 \r
 set links=\r
 for /d %%a in (%lib%) do (\r