cleanup

.gitignore

@@ -1,20 +1,18 @@
-vm_*
-.D*
-msorg/**
-pcorg/**
-*.log
+**/.D*
+private/**
+**/*.log
 .*.swp
-*.obj
-*.prn
-*.hex
-*.PRN
-*.HEX
+**/*.obj
+**/*.prn
+**/*.hex
+**/*.PRN
+**/*.HEX
+**/*.map
+**/*.crf
+**/*.lst
+vm_*
 rom
-*.img
-*.com
-*.map
 *.exe
-*.crf
-*.lst
+*.com
 mscmd.asm
 mscmdex.asm

Makefile

@@ -20,10 +20,10 @@ ibmdos.obj: ibmdos.asm msdos.asm
 	emu2 bin/masm.exe ibmdos,ibmdos,ibmdos,ibmdos || rm -f ibmdos.obj
 
 pcdos.img: ibmcmdex.com ibmbio.com ibmdos.com asm.com hello.com trans.com hex2bin.com \
-  pcorg/pcdos.img hello.asm hello.bas mkhello.bat
-	cp pcorg/pcdos.img pcdos.img
-	mattrib -r -s -i pcdos.img ::IBMDOS.COM
-	mattrib -r -s -i pcdos.img ::IBMBIO.COM
+  images/blank.img hello.asm hello.bas ball.bas mkhello.bat
+	cp images/blank.img pcdos.img
+	-mattrib -r -s -i pcdos.img ::IBMDOS.COM
+	-mattrib -r -s -i pcdos.img ::IBMBIO.COM
 	mcopy  -o -i pcdos.img ibmbio.com ::IBMBIO.COM
 	mcopy  -o -i pcdos.img ibmdos.com ::IBMDOS.COM
 	mcopy  -o -i pcdos.img ibmcmdex.com ::COMMAND.COM
@@ -49,6 +49,7 @@ pcdos.img: ibmcmdex.com ibmbio.com ibmdos.com asm.com hello.com trans.com hex2bi
 	mcopy  -o -i pcdos.img hello.asm ::HELLO.ASM
 	mcopy  -o -i pcdos.img mkhello.bat ::MKHELLO.BAT
 	mcopy  -o -i pcdos.img hello.bas ::HELLO.BAS
+	[ -f private/pceexit.com ] && mcopy  -o -i pcdos.img private/pceexit.com ::EXIT.COM
 	mdir -w -i pcdos.img ::
 
 ibmcmd.com: ibmcmd.exe 

msdos.cfg

@@ -9,7 +9,7 @@ system {
 
 	memtest = 0
 
-	floppy_disk_drives = 2
+	floppy_disk_drives = 3
 
 	patch_bios_init  = 1
 	patch_bios_int19 = 1
@@ -41,7 +41,7 @@ load {
 
 ram {
 	address = 0
-	size    = 512K
+	size    = 128K
 }
 
 rom {
@@ -155,6 +155,8 @@ fdc {
 	irq     = 6
 
 	drive0 = 0x00
+	drive1 = 0x01
+	drive2 = 0x02
 
 	accurate = 0
 }
@@ -169,6 +171,13 @@ disk {
 disk {
 	drive    = 0x01
 	type     = "auto"
-	file     = "app.img"
+	file     = "private/app.img"
+	optional = 0
+}
+
+disk {
+	drive    = 0x02
+	type     = "auto"
+	file     = "misc.img"
 	optional = 0
 }

pcdos.cfg

@@ -172,7 +172,7 @@ disk {
 disk {
 	drive    = 0x01
 	type     = "auto"
-	file     = "app.img"
+	file     = "private/app.img"
 	optional = 0
 }