Revert "use kdterm"

This reverts commit 9a14fb3.

Author: DistroHopper39B

boot/bootdata/hybridcd.ini

@@ -13,8 +13,7 @@ LiveCD_Screen="LiveCD (Screen)"
 LiveCD_RamDisk="LiveCD in RAM"
 LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)"
 LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
-LiveCD_RamDisk_Macpi="LiveCD in RAM SMP"
-LiveCD_RamDisk_Macpi_screen="LiveCD in RAM SMP (Screen)"
+
 [LiveCD]
 BootType=Windows2003
 SystemPath=\livecd\reactos
@@ -28,7 +27,7 @@ Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
 [LiveCD_Screen]
 BootType=Windows2003
 SystemPath=\livecd\reactos
-Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT
+Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
 
 [LiveCD_RamDisk]
 BootType=Windows2003
@@ -43,14 +42,4 @@ Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\live
 [LiveCD_RamDisk_Screen]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
-
-[LiveCD_RamDisk_Macpi]
-BootType=Windows2003
-SystemPath=ramdisk(0)\reactos
-Options=/HAL=HALMP.DLL /KERNEL=NTKRNLMP.EXE /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
-
-[LiveCD_RamDisk_Macpi_screen]
-BootType=Windows2003
-SystemPath=ramdisk(0)\reactos
-Options=/HAL=HALMP.DLL /KERNEL=NTKRNLMP.EXE /DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD

boot/bootdata/livecd.ini

@@ -9,8 +9,11 @@ MinimalUI=Yes
 [Operating Systems]
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
+LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
+LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
+LiveCD_VBoxDebug="LiveCD (VBox Debug)"
 LiveCD_Screen="LiveCD (Screen)"
-LiveCD_Macpi="LiveCD ACPI SMP"
+LiveCD_LogFile="LiveCD (Log file)"
 
 [LiveCD]
 BootType=Windows2003
@@ -20,14 +23,29 @@ Options=/FASTDETECT /MININT
 [LiveCD_Debug]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
 
 [LiveCD_Macpi]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/HAL=halmp.dll /KERNEL=ntkrnlmp.exe /DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT /FASTDETECT
+Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
+
+[LiveCD_Aacpi]
+BootType=Windows2003
+SystemPath=\reactos
+Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
+
+[LiveCD_VBoxDebug]
+BootType=Windows2003
+SystemPath=\reactos
+Options=/DEBUG /DEBUGPORT=VBOX /SOS /FASTDETECT /MININT
 
 [LiveCD_Screen]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT /FASTDETECT
+Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT
+
+[LiveCD_LogFile]
+BootType=Windows2003
+SystemPath=\reactos
+Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT

boot/bootdata/txtsetup.sif

@@ -94,7 +94,6 @@ buslogic.sys = 1,,,,,,x,4,,,,1,4
 blue.sys     = 1,,,,,,x,4,,,,1,4
 vgafonts.cab = 1,,,,,,,1,,,,1,1
 bootvid.dll  = 1,,,,,,,2,,,,1,2
-kdterm.dll  = 1,,,,,,,2,,,,1,2
 c_437.nls    = 1,,,,,,,2,,,,1,2
 c_1252.nls   = 1,,,,,,,2,,,,1,2
 cdfs.sys     = 1,,,,,,x,4,,,,1,4