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

[l4.git] / 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 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;