Conflicts:
l4/pkg/drivers-frst/include/io_regblock_port.h
void write32(unsigned long reg, unsigned int val) const
{ asm volatile("out %0, %w1" : : "a" (val), "Nd" (_base + reg)); }
void write32(unsigned long reg, unsigned int val) const
{ asm volatile("out %0, %w1" : : "a" (val), "Nd" (_base + reg)); }
void delay() const
{ asm volatile ("outb %al,$0x80"); }
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;
private:
unsigned long _base;
l4util_iodelay(void)
{
asm volatile ("outb %al,$0x80");
l4util_iodelay(void)
{
asm volatile ("outb %al,$0x80");
+ /*for(int i = 0; i < 1000000; i++);*/