WebSVN – Kolibri OS – Diff – /drivers/ethernet/R6040.asm

         .io_addr        dd ?
         .cur_rx         dw ?
         .cur_tx         dw ?
         .last_tx        dw ?
-        .phy_addr       dw ?
+        .phy_addr       dd ?
         .phy_mode       dw ?
         .mcr0           dw ?
         .mcr1           dw ?
         .switch_sig     dw ?
         .pci_bus        dd ?
         .pci_dev        dd ?
         .irq_line       db ?
-        rb 3            ; dword alignment
+        rb 1            ; dword alignment
 ;;        Actual Hardware dependent code starts here                      ;;
 ;;                                                                        ;;
 ;;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\;;
-macro mdio_write reg, val {
+;mdio_read:
+;        stdcall phy_read, [device.io_addr], [device.phy_addr], ecx
-        stdcall phy_read, [device.io_addr], [device.phy_addr], reg
-}
+;        ret
-macro mdio_write reg, val {
+;mdio_write:
+;        stdcall phy_write, [device.io_addr], [device.phy_addr], ecx, eax
         stdcall phy_write, [device.io_addr], [devce.phy_addr], reg, val
 ;        ret
 ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;;  probe: enables the device (if it really is RTL8139)
+;;  probe: enables the device (if it really is R6040)
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         DEBUGF  2, "MAC address not initialized!\n"
      @@:
         ; Init RDC private data
         mov     [device.mcr0], MCR0_XMTEN or MCR0_RCVEN
-        ;mov     [private.phy_addr], 1 ; Asper: Only one network card is supported now.
+        mov     [device.phy_addr], PHY1_ADDR
         mov     [device.switch_sig], 0
         ; Check the vendor ID on the PHY, if 0xFFFF assume none attached
-        stdcall phy_read, 1, 2
+        stdcall phy_read, [device.phy_addr], 2
         cmp     ax, 0xFFFF
         jne     @f
-        DEBUGF  2, "Failed to detect an attached PHY\n" ;, generating random"
+        DEBUGF  2, "Failed to detect an attached PHY!\n"
         mov     eax, -1
         ret
         stdcall phy_write, 29, 31, 0x175C ; Enable registers
         jmp     .phy_readen
       @@:
-        ; PHY Mode Check
-        movzx   eax, [device.phy_addr]
+        ; PHY Mode Check
-        stdcall phy_write, eax, 4, PHY_CAP
+        stdcall phy_write, [device.phy_addr], 4, PHY_CAP
-        stdcall phy_write, eax, 0, PHY_MODE
+        stdcall phy_write, [device.phy_addr], 0, PHY_MODE
       if PHY_MODE = 0x3100
         call    phy_mode_chk
 phy_mode_chk:
         DEBUGF  1,"Checking PHY mode\n"
-        ; PHY Link Status Check
-        movzx   eax, [device.phy_addr]
+        ; PHY Link Status Check
-        stdcall phy_read, eax, 1
+        stdcall phy_read, [device.phy_addr], MII_BMSR
-        test    eax, 0x4
+        test    ax, BMSR_LSTATUS
-        jz      .ret_0x8000
-        ; PHY Chip Auto-Negotiation Status
+        jz      .ret_0x8000
         movzx   eax, [device.phy_addr]
-        stdcall phy_read, eax, 1
+        ; PHY Chip Auto-Negotiation Status
-        test    eax, 0x0020
+        test    ax, BMSR_ANEGCOMPLETE
-        jnz     .auto_nego
+        jnz     .auto_nego
         ; Force Mode
-        movzx   eax, [device.phy_addr]
+        ; Force Mode
-        stdcall phy_read, eax, 0
+        stdcall phy_read, [device.phy_addr], MII_BMCR
-        test    eax, 0x100
+        test    ax, BMCR_FULLDPLX
-        jnz     .ret_0x8000
+        jnz     .ret_0x8000
-  .auto_nego:
-        ; Auto Negotiation Mode
-        movzx   eax, [device.phy_addr]
+  .auto_nego:
-        stdcall phy_read, eax, 5
+        ; Auto Negotiation Mode
-        mov     ecx, eax
+        stdcall phy_read, [device.phy_addr], MII_LPA
-        movzx   eax, [device.phy_addr]
+        mov     cx, ax
-        stdcall phy_read, eax, 4
+        stdcall phy_read, [device.phy_addr], MII_ADVERTISE
         set_io  MTPR
         out     dx, ax
         inc     [device.cur_tx]
-        and     [device.cur_tx], TX_RING_SIZE - 1
-        xor     eax, eax
+        and     [device.cur_tx], TX_RING_SIZE - 1
 ; Update stats
         inc     [device.packets_tx]
         mov     eax, [esp+8]
+        add     dword [device.bytes_tx], eax
-        add     dword [device.bytes_tx], eax
+        adc     dword [device.bytes_tx + 4], 0
         adc     dword [device.bytes_tx + 4], 0
         xor     eax, eax
   .no_rxfifo:
         test    word[esp], RX_EARLY
         jz      .no_rxearly
-        DEBUGF  1, "RX early\n"
+        DEBUGF  2, "RX early\n"
   .no_rxearly:
         test    word[esp], TX_EARLY
         jz      .no_txearly
   .no_ovrfl:
         test    word[esp], LINK_CHANGED
         jz      .no_link
-        DEBUGF  1, "Link changed\n"
+        DEBUGF  2, "Link changed\n"
         set_io  0
         set_io  MMWD
         out     dx, ax
-        ;Write the command to the MDIO bus
         ;Write the command to the MDIO bus
         mov     eax, [phy_addr]
         shl     eax, 8
         add     eax, [reg]
         add     eax, MDIO_WRITE
 align 4
 read_mac:
-        DEBUGF  1,"Reading MAC: "
+        DEBUGF  1,"Reading MAC:\n"

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/R6040.asm – Rev 4439 → 4450