Improved RTL card.

Author: pradosh-arduino

source/drivers/networking/ethernet/RTL/8139.c

@@ -12,11 +12,9 @@
 
 struct rtl8139* RTL8139 = NULL;
 
-// Function to read the MAC address from EEPROM
-void read_mac_address(struct rtl8139* nic) {
-    // Read the MAC address from the EEPROM
+void read_mac_address() {
     for (int i = 0; i < 6; i++) {
-        nic->mac_address[i] = inb(nic->io_base + RTL8139_REG_MAC + i);
+        RTL8139->mac_address[i] = inb(RTL8139->io_base + RTL8139_REG_MAC + i);
     }
 }
 
@@ -31,8 +29,10 @@ void rtl8139_init(struct rtl8139* nic) {
     outw(nic->io_base + RTL8139_REG_COMMAND, RTL8139_CMD_RESET);
     // while (inb(nic->io_base + RTL8139_REG_COMMAND) & RTL8139_CMD_RESET);
 
+    sleep(1); // for safety
+
     // Initialize MAC address
-    read_mac_address(nic);
+    read_mac_address();
 
     print("Mac Address: ");
     printf("%x:%x:%x:%x:%x:%x", nic->mac_address[0], nic->mac_address[1], nic->mac_address[2], nic->mac_address[3], nic->mac_address[4], nic->mac_address[5]);
@@ -43,45 +43,45 @@ void rtl8139_init(struct rtl8139* nic) {
 }
 
 // Transmit a packet
-bool rtl8139_send_packet(struct rtl8139* nic, const int8* data, int16 length) {
+bool rtl8139_send_packet(const int8* data, int16 length) {
     if(RTL8139->io_base == null || RTL8139->io_base == 0){
         warn("RTL8139 Card is not detected but tried to send data to it. Skipping...", __FILE__);
         return no;
     }
     // Check if the NIC is ready for transmission (status checks)
-    int16 status = inw(nic->io_base + RTL8139_REG_TX_STATUS);
+    int16 status = inw(RTL8139->io_base + RTL8139_REG_TX_STATUS);
     if ((status & 0x8000) == 0) {
         return no; // Transmission is not ready
     }
 
     // Write the packet to the transmit buffer
     int16 tx_buffer_offset = status >> 11;
-    int16 tx_buffer_address = nic->io_base + RTL8139_REG_TX_ADDR + tx_buffer_offset;
+    int16 tx_buffer_address = RTL8139->io_base + RTL8139_REG_TX_ADDR + tx_buffer_offset;
     for (int16 i = 0; i < length; i++) {
         outb(tx_buffer_address, data[i]);
         tx_buffer_address++;
     }
 
     // Trigger transmission
-    outw(nic->io_base + RTL8139_REG_TX_STATUS, (tx_buffer_offset << 11) | length);
+    outw(RTL8139->io_base + RTL8139_REG_TX_STATUS, (tx_buffer_offset << 11) | length);
 
     return yes; // Return yes if transmission was successful, no otherwise
 }
 
 // Receives a packet
-bool rtl8139_receive_packet(struct rtl8139* nic, int8* buffer, int16* length) {
+bool rtl8139_receive_packet(int8* buffer, int16* length) {
     if(RTL8139->io_base == null || RTL8139->io_base == 0){
-        // warn("RTL8139 Card is not detected but tried to initialize it. Skipping...", __FILE__);
+        warn("RTL8139 Card is not detected but tried to receive data. Skipping...", __FILE__);
         return no;
     }
-    int16 status = inw(nic->io_base + RTL8139_REG_RX_BUFFER);
+    int16 status = inw(RTL8139->io_base + RTL8139_REG_RX_BUFFER);
     if ((status & 0x01) == 0) {
         return no; // No packet available
     }
 
     // Copy the received packet to the buffer
     int16 rx_buffer_offset = status >> 1;
-    int16 rx_buffer_address = nic->io_base + RTL8139_REG_RX_BUFFER + rx_buffer_offset;
+    int16 rx_buffer_address = RTL8139->io_base + RTL8139_REG_RX_BUFFER + rx_buffer_offset;
     *length = inw(rx_buffer_address);
     rx_buffer_address += 4; // Skip status and reserved fields
     for (int16 i = 0; i < *length; i++) {
@@ -90,7 +90,7 @@ bool rtl8139_receive_packet(struct rtl8139* nic, int8* buffer, int16* length) {
     }
 
     // Notify the NIC that the packet is read (update the RX buffer offset)
-    outw(nic->io_base + RTL8139_REG_RX_BUFFER, rx_buffer_offset);
+    outw(RTL8139->io_base + RTL8139_REG_RX_BUFFER, rx_buffer_offset);
 
     return yes; // Return yes if a packet was received, no otherwise
 }

source/includes/drivers/rtl8139.h

@@ -33,6 +33,12 @@
 #define RTL8139_IOADDR1     0x10
 #define RTL8139_CMD         0x37
 
+// RTL8139 Status
+#define TOK 0x0001
+#define ROK 0x0002
+
+#define RTL8139_IRQ_LINE 0x3C 
+
 struct rtl8139 {
     int16 io_base;
     int8 mac_address[6];
@@ -45,7 +51,7 @@ extern struct rtl8139* RTL8139;
  * 
  * @param nic 
  */
-void read_mac_address(struct rtl8139* nic);
+void read_mac_address();
 
 /**
  * @brief Initialize RTL8139 NIC
@@ -57,21 +63,19 @@ void rtl8139_init(struct rtl8139* nic);
 /**
  * @brief Transmit a packet from the RTL8139
  * 
- * @param nic 
  * @param data 
  * @param length 
  * @return true if successfully sent.
  * @return false if failed to sent.
  */
-bool rtl8139_send_packet(struct rtl8139* nic, const int8* data, int16 length);
+bool rtl8139_send_packet(const int8* data, int16 length);
 
 /**
  * @brief Receives a packet
  * 
- * @param nic the pointer to RTL structure
  * @param buffer the received data
  * @param length the length of buffer
  * @return [true] Return yes if a packet was received
  * @return [false] Return false if a packet was not received
  */
-bool rtl8139_receive_packet(struct rtl8139* nic, int8* buffer, int16* length);
+bool rtl8139_receive_packet(int8* buffer, int16* length);

source/includes/isr.h

@@ -39,4 +39,6 @@ void irqHandler(InterruptFrame* frame);
  */
 void registerInterruptHandler(uint8_t irq, irq_handler handler);
 
+void rtl8139_handler(InterruptFrame* frame);
+
 #endif

source/kernel/C/interrupts/isr.c

@@ -12,6 +12,7 @@
 #include <isr.h>
 #include <keyboard.h>
 #include <memory2.h>
+#include <drivers/rtl8139.h>
 
 irq_handler interrupt_handlers[256];
 
@@ -69,4 +70,15 @@ void irqHandler(InterruptFrame* frame)
     irq_handler handler = (irq_handler)interrupt_handlers[frame->int_no];
     if (handler != NULL)
         handler(frame);
-}
+}
+
+void rtl8139_handler(InterruptFrame* frame) {
+	uint16_t status = inw(RTL8139->io_base + 0x3e);
+	outw(RTL8139->io_base + 0x3E, 0x05);
+	if(status & TOK) {
+		info("Successfully sent a packet!", __FILE__);
+	}
+	if (status & ROK) {
+		info("Successfully recieved a packet!", __FILE__);
+	}
+}

source/kernel/C/pci.c

@@ -12,6 +12,7 @@
 #include <ahci.h>
 #include <hal.h>
 #include <pci.h>
+#include <isr.h>
 
 const char* display_adapter_name = "Frost Generic Display Adapter";
 const char* GPUName[1] = {"Frost Generic Display Driver for Graphics Processing Unit."}; //Max 2 GPUs allowed
@@ -395,6 +396,11 @@ void probe_pci(){
                         if(device == 0x8139){ // Indeed it is an RTL8139 Card
                             RTL8139->io_base = (int16)(pci_read_word(bus, slot, 0, RTL8139_IOADDR1) & 0xFFFC);
                             deviceName = "RTL8139 Networking Card";
+                            int8 rtl8139_irq = pci_read_word(bus, slot, 0, RTL8139_IRQ_LINE);
+
+                            printf("Handler number : 0x%x", rtl8139_irq);
+                            
+                            registerInterruptHandler(rtl8139_irq, rtl8139_handler);
                         }
                     }