Merge branch 'master' of rtime.felk.cvut.cz:l4

Conflicts:
	l4/pkg/drivers-frst/include/io_regblock_port.h

diff --git a/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc b/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc
index 17b24edbaecf1abdde1a26808239f01512fddab8..56f99d6a04f83a8a1810e5b88b59b35aed333726 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc
+++ b/l4/pkg/bootstrap_custom/server/src/platform/x86_pc.cc
@@ -372,8 +372,8 @@ void __main(l4util_mb_info_t *mbi, unsigned long p2, char const *realmode_si,
   (void)mbi;
   (void)p2;
   _x86_pc_platform.realmode_pointer = realmode_si;
-  cmdline = _x86_pc_platform.cmdline();
-//  if (!cmdline)
+  cmdline = "";//_x86_pc_platform.cmdline();
+// if (!cmdline)
 //    cmdline = _mbi_cmdline;
 #else
   (void)realmode_si;

diff --git a/l4/pkg/drivers-frst/include/io_regblock_port.h b/l4/pkg/drivers-frst/include/io_regblock_port.h
index 36caba82977154f53ddcc2934d33fc990248740c..d84d618f95ac374d282958ac6e8b726e342ac72f 100644 (file)
--- a/l4/pkg/drivers-frst/include/io_regblock_port.h
+++ b/l4/pkg/drivers-frst/include/io_regblock_port.h
@@ -51,6 +51,7 @@ namespace L4
     void write32(unsigned long reg, unsigned int val) const
     { asm volatile("out %0, %w1" : : "a" (val), "Nd" (_base + reg)); }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     void delay() const
     { asm volatile ("outb %al,$0x80"); }
@@ -61,6 +62,10 @@ namespace L4
        /*for (int i = 0; i < 1000000; i++);*/
     }
 >>>>>>> d8997e7... fiasco: drivers-frst: Get this code back to default state. Port interference problem was solved into the linux kernel configuration.
+=======
+    void delay() const //root linux in jailhouse have a problem when cell used port 0x80
+    {/* asm volatile ("outb %al,$0x80"); */}
+>>>>>>> e3e88cd02e4e26d0d588e4c756f63f7aa9447267
 
   private:
     unsigned long _base;