x86emu: make it compile again with the last lrmi api

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>

1 files changed, 30 insertions, 22 deletions

diff --git a/src/lrmi/backend-x86emu.c b/src/lrmi/backend-x86emu.c
index 61c6d68..1c937d9 100644
--- a/src/lrmi/backend-x86emu.c
+++ b/src/lrmi/backend-x86emu.c
@@ -2,16 +2,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <pciaccess.h>
+#include <inttypes.h>
 
+#include "libx86.h"
 #include "common.h"
 #include "common_helper.h"
 
+#include "../x86emu/x86emu.h"
 
-extern Int10Current;
+extern xf86Int10InfoPtr Int10Current;
 
-#define CARD8  unsigned char
-#define CARD16 unsigned short
-#define CARD32 unsigned long
 #define pointer void *
 #define IOADDRESS void *
 #define Bool int
@@ -56,21 +56,21 @@ printk(const char *fmt, ...)
       (SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \
        : (((char*)(INTPriv(pInt)->base) + addr)))
 
-#define V_ADDR_RB(addr) *(CARD8*) V_ADDR(addr)
+#define V_ADDR_RB(addr) *(uint8_t*) V_ADDR(addr)
 //#define V_ADDR_RW(addr) ldw_u((pointer)V_ADDR(addr))
 //#define V_ADDR_RL(addr) ldl_u((pointer)V_ADDR(addr))
 
-#define V_ADDR_WB(addr,val) *(CARD8*) V_ADDR(addr) = val;
+#define V_ADDR_WB(addr,val) *(uint8_t*) V_ADDR(addr) = val;
 //#define V_ADDR_WW(addr,val) stw_u((val),(pointer)(V_ADDR(addr)));
 //#define V_ADDR_WL(addr,val) stl_u(val,(pointer)(V_ADDR(addr)));
 
-static CARD8
+static uint8_t
 read_b(xf86Int10InfoPtr pInt, int addr)
 {
     return V_ADDR_RB(addr);
 }
 
-static CARD16
+static uint16_t
 read_w(xf86Int10InfoPtr pInt, int addr)
 {
 #if 0
@@ -81,7 +81,7 @@ X_BYTE_ORDER == X_LITTLE_ENDIAN
     return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
 }
 
-static CARD32
+static uint32_t
 read_l(xf86Int10InfoPtr pInt, int addr)
 {
 #if 0
@@ -96,13 +96,13 @@ X_BYTE_ORDER == X_LITTLE_ENDIAN
 }
 
 static void
-write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
+write_b(xf86Int10InfoPtr pInt, int addr, uint8_t val)
 {
     V_ADDR_WB(addr,val);
 }
 
 static void
-write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
+write_w(xf86Int10InfoPtr pInt, int addr, uint16_t val)
 {
 #if 0
 X_BYTE_ORDER == X_LITTLE_ENDIAN
@@ -114,7 +114,7 @@ X_BYTE_ORDER == X_LITTLE_ENDIAN
 }
 
 static void
-write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
+write_l(xf86Int10InfoPtr pInt, int addr, uint32_t val)
 {
 #if 0
 X_BYTE_ORDER == X_LITTLE_ENDIAN
@@ -137,43 +137,43 @@ static int10MemRec genericMem = {
 };
 
 void *
-LRMI_base_addr(xf86Int10InfoPtr pInt, CARD32 addr)
+LRMI_base_addr(xf86Int10InfoPtr pInt, unsigned long addr)
 {
     return V_ADDR(addr);
 }
 
-static CARD8
-Mem_rb(CARD32 addr)
+static uint8_t
+Mem_rb(uint32_t addr)
 {
     return (*Int10Current->mem->rb)(Int10Current, addr);
 }
 
-static CARD16
-Mem_rw(CARD32 addr)
+static uint16_t
+Mem_rw(uint32_t addr)
 {
     return (*Int10Current->mem->rw)(Int10Current, addr);
 }
 
-static CARD32
-Mem_rl(CARD32 addr)
+static uint32_t
+Mem_rl(uint32_t addr)
 {
     return (*Int10Current->mem->rl)(Int10Current, addr);
 }
 
 static void
-Mem_wb(CARD32 addr, CARD8 val)
+Mem_wb(uint32_t addr, uint8_t val)
 {
     (*Int10Current->mem->wb)(Int10Current, addr, val);
 }
 
 static void
-Mem_ww(CARD32 addr, CARD16 val)
+Mem_ww(uint32_t addr, uint16_t val)
 {
     (*Int10Current->mem->ww)(Int10Current, addr, val);
 }
 
 static void
-Mem_wl(CARD32 addr, CARD32 val)
+Mem_wl(uint32_t addr, uint32_t val)
 {
     (*Int10Current->mem->wl)(Int10Current, addr, val);
 }
@@ -214,6 +214,14 @@ LRMI_int(xf86Int10InfoPtr pInt)
     pos_int(pInt);
 }
 
+uint8_t x_inb(uint16_t port);
+uint16_t x_inw(uint16_t port);
+uint32_t x_inl(uint16_t port);
+void x_outl(uint16_t port, uint32_t val);
+void x_outb(uint16_t port, uint8_t val);
+void x_outw(uint16_t port, uint16_t val);
+
+
 void
 LRMI_init(xf86Int10InfoPtr pInt)
 {