From 4c6017d0d21cb085bf3757c2949e435481840fe6 Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Sat, 30 Aug 2014 19:41:15 +0200
Subject: fixed bochs

---
 Makefile        |  2 +-
 bochsdebug      |  2 ++
 bochsrc         | 14 +++++++++++---
 kernel/kernel.c |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 bochsdebug

diff --git a/Makefile b/Makefile
index cefabb4..e080398 100644
--- a/Makefile
+++ b/Makefile
@@ -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
+
diff --git a/bochsrc b/bochsrc
index ceb79ee..83f5417 100644
--- a/bochsrc
+++ b/bochsrc
@@ -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
-- 
cgit v1.2.3