Added warning flags and fixed them :)

1 files changed, 24 insertions, 23 deletions

diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index 14770c8..ec45bd7 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -13,12 +13,11 @@
 
 static u8 mac[6];
 static u8 *rx_buffer;
-static u32 current_packet_ptr;
 
 static u32 rtl_device_pci = 0;
 static u32 rtl_iobase = 0;
 
-u8 *rtl8139_get_mac()
+u8 *rtl8139_get_mac(void)
 {
 	if (!rtl_device_pci)
 		return NULL;
@@ -26,8 +25,10 @@ u8 *rtl8139_get_mac()
 	return mac;
 }
 
-void rtl8139_receive_packet()
+void rtl8139_receive_packet(void)
 {
+	static u32 current_packet_ptr;
+
 	if (!rtl_device_pci)
 		return;
 
@@ -39,12 +40,12 @@ void rtl8139_receive_packet()
 	memcpy(packet, t, length);
 	ethernet_handle_packet(packet, length);
 
-	current_packet_ptr = (current_packet_ptr + length + 4 + 3) & (~3);
+	current_packet_ptr = (current_packet_ptr + length + 4 + 3) & (u32)(~3);
 
 	if (current_packet_ptr >= RX_BUF_SIZE)
 		current_packet_ptr -= RX_BUF_SIZE;
 
-	outw(rtl_iobase + RTL_PORT_RXPTR, current_packet_ptr - 0x10);
+	outw((u16)(rtl_iobase + RTL_PORT_RXPTR), (u16)(current_packet_ptr - 0x10));
 }
 
 static u8 tsad_array[4] = { 0x20, 0x24, 0x28, 0x2C };
@@ -56,8 +57,8 @@ void rtl8139_send_packet(void *data, u32 len)
 		return;
 
 	/* printf("Sending packet %d\n\n", len); */
-	outl(rtl_iobase + tsad_array[tx_current], (u32)data);
-	outl(rtl_iobase + tsd_array[tx_current++], len);
+	outl((u16)(rtl_iobase + tsad_array[tx_current]), (u32)data);
+	outl((u16)(rtl_iobase + tsd_array[tx_current++]), len);
 	if (tx_current > 3)
 		tx_current = 0;
 }
@@ -69,16 +70,15 @@ void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
 	}
 }
 
-// TODO: Fix late packet arrival
 void rtl8139_irq_handler()
 {
 	if (!rtl_device_pci)
 		return;
 
 	/* print("\nRTL INT!\n"); */
-	u16 status = inw(rtl_iobase + RTL_PORT_ISR);
+	u16 status = inw((u16)(rtl_iobase + RTL_PORT_ISR));
 
-	outw(rtl_iobase + RTL_PORT_ISR, 0x5);
+	outw((u16)(rtl_iobase + RTL_PORT_ISR), 0x5);
 
 	if (status & RTL_TOK) {
 		print("Got response!\n");
@@ -88,7 +88,7 @@ void rtl8139_irq_handler()
 	}
 }
 
-void rtl8139_init()
+void rtl8139_init(void)
 {
 	if (!rtl_device_pci)
 		return;
@@ -104,41 +104,41 @@ void rtl8139_init()
 	rtl_iobase = 0;
 
 	if (rtl_bar0 & 0x00000001)
-		rtl_iobase = rtl_bar0 & (~0x3);
+		rtl_iobase = rtl_bar0 & ((u32)~0x3);
 
 	// Get mac address
-	for (int i = 0; i < 6; ++i)
-		mac[i] = inb(rtl_iobase + RTL_PORT_MAC + i);
+	for (u32 i = 0; i < 6; ++i)
+		mac[i] = inb((u16)(rtl_iobase + RTL_PORT_MAC + i));
 	printf("Mac address: %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
 	// Activate
-	outb(rtl_iobase + RTL_PORT_CONFIG, 0x0);
+	outb((u16)(rtl_iobase + RTL_PORT_CONFIG), 0x0);
 
 	// Reset
 	outb((u16)(rtl_iobase + RTL_PORT_CMD), 0x10);
-	while ((inb(rtl_iobase + RTL_PORT_CMD) & 0x10) != 0)
+	while ((inb((u16)(rtl_iobase + RTL_PORT_CMD)) & 0x10) != 0)
 		;
 
 	// Set receive buffer
 	rx_buffer = (u8 *)malloc(RX_BUF_SIZE + 1516);
 	memset(rx_buffer, 0, RX_BUF_SIZE + 1516);
-	outl(rtl_iobase + RTL_PORT_RBSTART, (u32)rx_buffer);
+	outl((u16)(rtl_iobase + RTL_PORT_RBSTART), (u32)rx_buffer);
 
 	// Set TOK and ROK
-	outw(rtl_iobase + RTL_PORT_IMR, 0x0005);
+	outw((u16)(rtl_iobase + RTL_PORT_IMR), 0x0005);
 
 	// AB+AM+APM+AAP except WRAP
-	outl(rtl_iobase + RTL_PORT_RCR, 0xf | (1 << 7));
+	outl((u16)(rtl_iobase + RTL_PORT_RCR), 0xf | (1 << 7));
 
 	// Enable receive and transmit
-	outb(rtl_iobase + RTL_PORT_CMD, 0x08 | 0x04);
+	outb((u16)(rtl_iobase + RTL_PORT_CMD), 0x08 | 0x04);
 
 	// Install interrupt handler
-	u32 rtl_irq = pci_get_interrupt(rtl_device_pci);
+	int rtl_irq = pci_get_interrupt(rtl_device_pci);
 	irq_install_handler(rtl_irq, rtl8139_irq_handler);
 }
 
-int rtl8139_install()
+int rtl8139_install(void)
 {
 	pci_scan(&rtl8139_find, -1, &rtl_device_pci);
 
@@ -146,5 +146,6 @@ int rtl8139_install()
 		print("Found rtl8139 card\n");
 		rtl8139_init();
 	}
-	return rtl_device_pci;
+
+	return (int)rtl_device_pci;
 }