diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-08-30 19:41:15 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-08-30 19:41:15 +0200 |
| commit | 4c6017d0d21cb085bf3757c2949e435481840fe6 (patch) | |
| tree | 8daf7eefd434828117d15825679010c50df15aa4 | |
| parent | 558bf072fff36ae9f09e332cf8aa536db8ef17c0 (diff) | |
fixed bochs
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | bochsdebug | 2 | ||||
| -rw-r--r-- | bochsrc | 14 | ||||
| -rw-r--r-- | kernel/kernel.c | 2 |
4 files changed, 15 insertions, 5 deletions
@@ -95,7 +95,7 @@ FoolData.img: binfont.bin # run in our local bochs (we need cirrus support for our vesa mode) run: FoolOS.img - ~/opt/bochs-2.6.6/bochs -q + ~/opt/bochs-2.6.6/bochs -q -rc bochsdebug ############ cleanup ############ diff --git a/bochsdebug b/bochsdebug new file mode 100644 index 0000000..fabafe9 --- /dev/null +++ b/bochsdebug @@ -0,0 +1,2 @@ +continue + @@ -1,4 +1,12 @@ -# You may now use double quotes around pathnames, in case +# +# +# bochs-2.6.6$ +# ./configure --enable-clgd54xx --enable-a20-pin --enable-debugger --enable-disasm --enable-e1000 --with-x --with-x11 +# +# +# +# +## You may now use double quotes around pathnames, in case # your pathname includes spaces. #======================================================================= @@ -53,8 +61,8 @@ #display_library: term #display_library: wx #display_library: x, options="hideIPS" # disable IPS output in status bar -#display_library: x, options="gui_debug" # use GTK debugger gui -display_library: x +display_library: x, options="gui_debug" # use GTK debugger gui +#display_library: x #======================================================================= diff --git a/kernel/kernel.c b/kernel/kernel.c index 9e8108f..3eebef6 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -167,7 +167,7 @@ void kernel_main(uint32_t initial_stack) pci_init(); // floppy - floppy_init(); + floppy_init(); //init shell |