From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Fri, 22 Apr 2016 00:44:39 +0000 (+0200)
Subject: fiasco: drivers-frst: Get this code back to default state. Port interference problem... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/l4.git/commitdiff_plain/72e6cd65b32dc4846ab1c57eee660d414a1233b9

fiasco: drivers-frst: Get this code back to default state. Port interference problem was solved into the linux kernel configuration.

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

diff --git a/l4/pkg/drivers-frst/include/io_regblock_port.h b/l4/pkg/drivers-frst/include/io_regblock_port.h
index 62cdeb28f..36caba829 100644
--- a/l4/pkg/drivers-frst/include/io_regblock_port.h
+++ b/l4/pkg/drivers-frst/include/io_regblock_port.h
@@ -51,8 +51,16 @@ namespace L4
     void write32(unsigned long reg, unsigned int val) const
     { asm volatile("out %0, %w1" : : "a" (val), "Nd" (_base + reg)); }
 
+<<<<<<< HEAD
     void delay() const
     { asm volatile ("outb %al,$0x80"); }
+=======
+    void delay() const //root linux in jailhouse have a problem when cell used port 0x80
+    {	
+	 asm volatile ("outb %al,$0x80"); 
+	/*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.
 
   private:
     unsigned long _base;
diff --git a/l4/pkg/l4re-core/l4util/include/ARCH-x86/port_io.h b/l4/pkg/l4re-core/l4util/include/ARCH-x86/port_io.h
index facfe3a7a..e5434f3bc 100644
--- a/l4/pkg/l4re-core/l4util/include/ARCH-x86/port_io.h
+++ b/l4/pkg/l4re-core/l4util/include/ARCH-x86/port_io.h
@@ -268,6 +268,7 @@ L4_INLINE void
 l4util_iodelay(void)
 {
   asm volatile ("outb %al,$0x80");
+ /*for(int i = 0; i < 1000000; i++);*/ 
 }
 
 #endif