back merge

.bochsrc

@@ -1,22 +1,23 @@
 # configuration file generated by Bochs
-plugin_ctrl: unmapped=1, biosdev=1, speaker=1, extfpuirq=1, parallel=1, serial=1, iodebug=1
+
+#plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, iodebug=1, gameport=true, usb_ehci=true
 config_interface: textconfig
 display_library: x, options="gui_debug"
 memory: host=32, guest=32
-romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x0, options=none
+romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none
 vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
 boot: floppy
 floppy_bootsig_check: disabled=0
-floppya: type=1_44, 1_44="/dev/sdc", status=inserted, write_protected=0
+floppya: type=1_44, 1_44="/dev/sdd", status=inserted, write_protected=0
 # no floppyb
-ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
+ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
 ata0-master: type=none
 ata0-slave: type=none
-ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15
+ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
 ata1-master: type=none
 ata1-slave: type=none
-ata2: enabled=0
-ata3: enabled=0
+ata2: enabled=false
+ata3: enabled=false
 optromimage1: file=none
 optromimage2: file=none
 optromimage3: file=none
@@ -25,33 +26,33 @@ optramimage1: file=none
 optramimage2: file=none
 optramimage3: file=none
 optramimage4: file=none
-pci: enabled=1, chipset=i440fx, slot1=usb_uhci, slot2=usb_ehci, slot3=usb_xhci
+pci: enabled=1, chipset=i440fx, slot2=usb_ehci
 vga: extension=vbe, update_freq=5, realtime=1
 cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=0, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
-cpuid: level=6, stepping=3, model=3, family=6, vendor_string="AuthenticAMD", brand_string="AMD Athlon(tm) processor"
-cpuid: mmx=1, apic=xapic, simd=sse2, sse4a=0, misaligned_sse=0, sep=1, movbe=0, adx=0
-cpuid: aes=0, sha=0, xsave=0, xsaveopt=0, avx_f16c=0, avx_fma=0, bmi=0, xop=0, fma4=0
-cpuid: tbm=0, x86_64=1, 1g_pages=0, pcid=0, fsgsbase=0, smep=0, smap=0, mwait=1
+cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string="              Intel(R) Pentium(R) 4 CPU        "
+cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true
+cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, x86_64=true
+cpuid: 1g_pages=false, pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true
 print_timestamps: enabled=0
 debugger_log: -
 magic_break: enabled=1
 port_e9_hack: enabled=0
 private_colormap: enabled=0
 clock: sync=none, time0=local, rtc_sync=0
 # no cmosimage
-# no loader
 log: -
 logprefix: %t%e%d
 debug: action=ignore
 info: action=report
 error: action=report
 panic: action=ask
 keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none
-mouse: type=ps2, enabled=0, toggle=ctrl+mbutton
-speaker: enabled=1, mode=system
-parport1: enabled=1, file=none
-parport2: enabled=0
-com1: enabled=1, mode=null
-com2: enabled=0
-com3: enabled=0
-com4: enabled=0
+mouse: type=ps2, enabled=false, toggle=ctrl+mbutton
+speaker: enabled=true, mode=system
+parport1: enabled=true, file=none
+parport2: enabled=false
+com1: enabled=true, mode=null
+com2: enabled=false
+com3: enabled=false
+com4: enabled=false
+#usb_ehci: enabled=1, port1=none, options1=none, port2=none, options2=none, port3=none, options3=none, port4=none, options4=none, port5=none, options5=none, port6=none, options6=none

.gitignore

@@ -6,3 +6,14 @@
 .~lock.*
 *.swp
 *.swo
+.idea/
+.vscode/
+cmake-build-debug/
+kernel.bin
+bx_enh_dbg.ini
+.vscode/
+.idea/
+cmake-build-debug/
+kernel.bin
+.idea/
+cmake-build-debug/