From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Fri, 22 Apr 2016 00:52:08 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:l4
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/l4.git/commitdiff_plain/b20a0e12a13e95c6a6c4608d7ee22b8f64e4eccf

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

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

b20a0e12a13e95c6a6c4608d7ee22b8f64e4eccf
diff --cc l4/pkg/drivers-frst/include/io_regblock_port.h
index 36caba829,121c3fe84..d84d618f9
--- a/l4/pkg/drivers-frst/include/io_regblock_port.h
+++ b/l4/pkg/drivers-frst/include/io_regblock_port.h
@@@ -51,16 -51,8 +51,21 @@@ namespace L
      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"); }
 +=======
 +    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.
++=======
+     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;