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/Makeconf.local b/l4/pkg/bootstrap_custom/server/src/Makeconf.local
index c87528c18f3e496ff1dcbd84e0497473e41631d2..3e9ed58f91d490991858f1b73051acaec40b8574 100644 (file)
--- a/l4/pkg/bootstrap_custom/server/src/Makeconf.local
+++ b/l4/pkg/bootstrap_custom/server/src/Makeconf.local
@@ -2,4 +2,4 @@
 DEFINES += -DJAILHOUSE
 DEFINES += -DIMAGE_MODE
 DEFINES += -DREALMODE_LOADING
-DEFINES += -DRAM_SIZE_MB=0x44ff000
+DEFINES += -DRAM_SIZE_MB=0x3bff000

diff --git a/l4/pkg/drivers-frst/include/io_regblock_port.h b/l4/pkg/drivers-frst/include/io_regblock_port.h
index 121c3fe84433cb4bd5479ca1803f313fa1b60e72..d84d618f95ac374d282958ac6e8b726e342ac72f 100644 (file)
--- a/l4/pkg/drivers-frst/include/io_regblock_port.h
+++ b/l4/pkg/drivers-frst/include/io_regblock_port.h
@@ -51,8 +51,21 @@ 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"); }
+=======
+    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;

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 facfe3a7a732cd84e6a6ad4c49c3caa14fa5955a..e5434f3bcbe3993921fb557f1fe39a3586387b3c 100644 (file)
--- 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