switch api to matrch kernel for io_write

2 files changed, 22 insertions, 22 deletions

diff --git a/drivers/rtl8169.c b/drivers/rtl8169.c
index 7218a8e..4ab2124 100644
--- a/drivers/rtl8169.c
+++ b/drivers/rtl8169.c
@@ -51,30 +51,30 @@ int rtl_8169_remap(int container, void *map, struct rxdesc *rx_ring)
 {
 
 	/* unock config registers */
-	io_write8(map + 0x50, 0xc0);
+	io_write8(0xc0, map + 0x50);
 	/* RxConfig = RXFTH: unlimited, MXDMA: unlimited, AAP: set (promisc. mode set) */
-	io_write32(map + 0x44, 0x0000e70f);
+	io_write32(0x0000e70f, map + 0x44);
 	/* Already enabled, do we need a reset? */
-	//io_write8(map + 0x37, 0x04);
+	//io_write8(0x04, map + 0x37);
 	/* TxConfig = IFG: normal, MXDMA: unlimited */
-	io_write32(map + 0x40, 0x03000700);
+	io_write32(0x03000700, map + 0x40);
 	/* Max Rx packet size */
-	io_write16(map + 0xDA, 0x1FFF);
+	io_write16(0x1fff, map + 0xDA);
 	/* max Tx packet size */
-	io_write8(map + 0xEC, 0x3B);
+	io_write8(0x3b, map + 0xEC);
 
 	/* physical address for descriptors */
 	//io_write32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32);
 	//io_write32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_BIT_MASK(32));
 
 	/* XXX need physaddress here not virtual */
-	io_write32(map + 0xE8, ((uint64_t) rx_ring) >> 32);
-	io_write32(map + 0xE4, ((uint64_t) rx_ring) & 0x00000000ffffffff);
+	io_write32(((uint64_t) rx_ring) >> 32, map + 0xe8);
+	io_write32(((uint64_t) rx_ring) & 0x00000000ffffffff, map + 0xe4);
 
 	/* Done */
 	//io_write8(map + 0x37, 0x0C); /* Enable Rx/Tx in the Command register */
 	/* Lock config registers */
-	io_write8(map + 0x50, 0x00);
+	io_write8(0x00, map + 0x50);
 
 	return 0;
 }
@@ -103,7 +103,7 @@ void *rtl8169_rx_fill(int container, struct rxdesc *rx_desc_ring, uint64_t iova_
 		printf("Failed to map memory\n");
 
 	for (i = 0; i < NUM_RX_DESC; i++) {
-		rtl8169_map_to_asic(&rx_desc_ring[i], (dma_addr_t)dma_map.iova + i * 2048, 2048);
+		rtl8169_map_to_asic(&rx_desc_ring[i], (dma_addr_t)vaddr + i * 2048, 2048);
 	}
 
 	return vaddr;
diff --git a/include/reg_api.h b/include/reg_api.h
index 0637c9b..c650533 100644
--- a/include/reg_api.h
+++ b/include/reg_api.h
@@ -23,22 +23,22 @@ static inline uint64_t io_read64_relaxed(const volatile void *addr)
 	return *(const volatile uint64_t *)addr;
 }
 
-static inline void io_write8_relaxed(volatile void *addr, uint8_t value)
+static inline void io_write8_relaxed(uint8_t value, volatile void *addr)
 {
 	*(volatile uint8_t *)addr = value;
 }
 
-static inline void io_write16_relaxed(volatile void *addr, uint16_t value)
+static inline void io_write16_relaxed(uint16_t value, volatile void *addr)
 {
 	*(volatile uint16_t *)addr = value;
 }
 
-static inline void io_write32_relaxed(volatile void *addr, uint32_t value)
+static inline void io_write32_relaxed(uint32_t value, volatile void *addr)
 {
 	*(volatile uint32_t *)addr = value;
 }
 
-static inline void io_write64_relaxed(volatile void *addr, int64_t value)
+static inline void io_write64_relaxed(uint64_t value, volatile void *addr)
 {
 	*(volatile uint64_t *)addr = value;
 }
@@ -71,24 +71,24 @@ static inline uint64_t io_read64(const volatile void *addr)
 	return val;
 }
 
-static inline void io_write8(volatile void *addr, uint8_t value)
+static inline void io_write8(uint8_t value, volatile void *addr)
 {
-	io_write8_relaxed(addr, value);
+	io_write8_relaxed(value, addr);
 }
 
-static inline void io_write16(volatile void *addr, uint16_t value)
+static inline void io_write16(uint16_t value, volatile void *addr)
 {
-	io_write16_relaxed(addr, value);
+	io_write16_relaxed(value, addr);
 }
 
-static inline void io_write32(volatile void *addr, uint32_t value)
+static inline void io_write32(uint32_t value, volatile void *addr)
 {
-	io_write32_relaxed(addr, value);
+	io_write32_relaxed(value, addr);
 }
 
-static inline void io_write64(volatile void *addr, uint64_t value)
+static inline void io_write64(uint64_t value, volatile void *addr)
 {
-	io_write64_relaxed(addr, value);
+	io_write64_relaxed(value, addr);
 }
 
 #endif