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

         EE_93C56_READ_CMD       = (6 shl 8) ; 110b + 8bit address
         EE_93C46_CMD_LENGTH     = 9  ; start bit + cmd + 6bit address
         EE_93C56_CMD_LENGTH     = 11 ; start bit + cmd + 8bit ddress
 ; See chapter "5.7 Transmit Configuration Register" of RTL8139D(L).pdf
+        VER_RTL8139             = 1000000b
-        VER_RTL8139             = 1100000b
+        VER_RTL8139_K           = 1100000b
         VER_RTL8139A            = 1110000b
-        VER_RTL8139AG           = 1110100b
+        VER_RTL8139A_G          = 1110010b
         VER_RTL8139B            = 1111000b
-        VER_RTL8130             = VER_RTL8139B
+        VER_RTL8130             = 1111100b
         VER_RTL8139C            = 1110100b
         VER_RTL8100             = 1111010b
-        VER_RTL8100B            = 1110101b
-        VER_RTL8139D            = VER_RTL8100B
-        VER_RTL8139CP           = 1110110b
+        VER_RTL8100_8139D       = 1110101b
+        VER_RTL8101             = 1110111b
-        VER_RTL8101             = 1110111b
+        IDX_UNKNOWN             = 0
+        IDX_RTL8139             = 1
-        IDX_RTL8139             = 0
+        IDX_RTL8139_K           = 2
-        IDX_RTL8139A            = 1
+        IDX_RTL8139A            = 3
-        IDX_RTL8139B            = 2
+        IDX_RTL8139A_G          = 4
-        IDX_RTL8139C            = 3
+        IDX_RTL8139B            = 5
-        IDX_RTL8100             = 4
+        IDX_RTL8130             = 6
+        IDX_RTL8139C            = 7
-        IDX_RTL8139D            = 5
+        IDX_RTL8100             = 8
+        IDX_RTL8100_8139D       = 9
+        IDX_RTL8101             = 10
         IDX_RTL8139D            = 6
-        IDX_RTL8101             = 7
+        HW_VERSIONS             = 10
         ISR_SERR                = 1 shl 15
 ; We've found the io address, find IRQ now
         invoke  PciRead8, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.interrupt_line
         mov     [ebx + device.irq_line], al
-        DEBUGF  1, "Hooking into device, dev:%x, bus:%x, irq:%x, I/O addr:%x\n",\
+        DEBUGF  1, "Hooking into device, devfn:%x, bus:%x, irq:%x, I/O addr:%x\n",\
-        [ebx + device.pci_dev]:1,[ebx + device.pci_bus]:1,[ebx + device.irq_line]:1,[ebx + device.io_addr]:4
+        [ebx + device.pci_dev]:2,[ebx + device.pci_bus]:2,[ebx + device.irq_line]:2,[ebx + device.io_addr]:4
         mov     eax, [devices]
         mov     dword[device_list-4+4*eax], 0
         dec     [devices]
   .err:
-        DEBUGF  2, "Error, removing all data !\n"
+        DEBUGF  2, "Fatal error occured, aborting\n"
         invoke  KernelFree, [ebx + device.rx_buffer]
         invoke  KernelFree, ebx
 probe:
         DEBUGF  1, "Probing\n"
 ; Make the device a bus master
         invoke  PciRead32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.command
-        or      al, PCI_CMD_MASTER
+        or      al, PCI_CMD_MASTER or PCI_CMD_PIO
         invoke  PciWrite32, [ebx + device.pci_bus], [ebx + device.pci_dev], PCI_header00.command, eax
+; wake up old chips
+        set_io  [ebx + device.io_addr], 0
+        set_io  [ebx + device.io_addr], REG_HLTCLK
+        mov     al, 'R'         ; run the clock
+        out     dx, al
-; get chip version
-        set_io  [ebx + device.io_addr], 0
+; get chip version
+        set_io  [ebx + device.io_addr], REG_TXCONFIG
-        set_io  [ebx + device.io_addr], REG_TXCONFIG + 2
+        in      eax, dx
-        in      ax, dx
+        shr     eax, 16
         shr     ah, 2
+        shr     ax, 6
-        shr     ax, 6
+        and     al, 0x7f
-        and     al, 01111111b
+        DEBUGF  1, "Chip version: %x\n", eax:2
 ; now find it in our array
-        mov     ecx, HW_VER_ARRAY_SIZE-1
+        mov     ecx, HW_VERSIONS
-  .chip_ver_loop:
+  @@:
         cmp     al, [hw_ver_array + ecx]
-        je      .chip_ver_found
+        je      @f
-        dec     ecx
-        jns     .chip_ver_loop
-  .unknown:
-        mov     ecx, 8
-  .chip_ver_found:
-        cmp     ecx, 8
+        dec     ecx
-        ja      .unknown
+        jnz     @r
-        mov     [ebx + device.hw_ver_id], cl
+  @@:
-        mov     ecx, [crosslist+ecx*4]
+        mov     [ebx + device.hw_ver_id], cl
-        mov     [ebx + device.name], ecx
-        DEBUGF  1, "Chip version: %s\n", ecx
-; wake up the chip
-        set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr], REG_HLTCLK
-        mov     al, 'R'         ; run the clock
-        out     dx, al
-; unlock config and BMCR registers
-        set_io  [ebx + device.io_addr], REG_9346CR
-        mov     al, (1 shl BIT_93C46_EEM1) or (1 shl BIT_93C46_EEM0)
-        out     dx, al
         mov     ecx, [hw_ver_names+ecx*4]
-; enable power management
+        mov     [ebx + device.name], ecx
+        DEBUGF  1, "Chip version: %s\n", ecx
         set_io  [ebx + device.io_addr], REG_CONFIG1
+        cmp     [ebx + device.hw_ver_id], IDX_RTL8139B
+        jae     .new_chip
+; wake up older chips
-        in      al, dx
+  .old_chip:
-        cmp     [ebx + device.hw_ver_id], IDX_RTL8139B
+        DEBUGF  1, "Wake up chip old style\n"
-        jae     .new_chip
+        set_io  [ebx + device.io_addr], REG_CONFIG1
-; wake up older chips
+        in      al, dx
         and     al, not ((1 shl BIT_SLEEP) or (1 shl BIT_PWRDWN))
         out     dx, al
-        jmp     .finish_wake_up
+        jmp     .done
+; set LWAKE pin to active high (default value).
+; it is for Wake-On-LAN functionality of some motherboards.
+; this signal is used to inform the motherboard to execute a wake-up process.
+; only at newer chips.
+  .new_chip:
+        DEBUGF  1, "Wake up chip new style\n"
+; unlock config and BMCR registers
+        set_io  [ebx + device.io_addr], 0
+        set_io  [ebx + device.io_addr], REG_9346CR
+        mov     al, (1 shl BIT_93C46_EEM1) or (1 shl BIT_93C46_EEM0)
-; set LWAKE pin to active high (default value).
+        out     dx, al
 ; it is for Wake-On-LAN functionality of some motherboards.
 ; this signal is used to inform the motherboard to execute a wake-up process.
+        set_io  [ebx + device.io_addr], REG_CONFIG1
-; only at newer chips.
+        in      al, dx
-  .new_chip:
+        or      al, (1 shl BIT_PMEn)
-        or      al, (1 shl BIT_PMEn)
+        and     al, not (1 shl BIT_LWACT)
-        and     al, not (1 shl BIT_LWACT)
+        out     dx, al
         out     dx, al
         set_io  [ebx + device.io_addr], REG_CONFIG4
-        in      al, dx
-        and     al, not (1 shl BIT_LWPTN)
+        set_io  [ebx + device.io_addr], REG_CONFIG4
-        out     dx, al
+        in      al, dx
+        and     al, not (1 shl BIT_LWPTN)
+        out     dx, al
 ; lock config and BMCR registers
-  .finish_wake_up:
-        xor     al, al
+; lock config and BMCR registers
-        set_io  [ebx + device.io_addr], 0
+        xor     al, al
         set_io  [ebx + device.io_addr], REG_9346CR
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], REG_COMMAND
         mov     al, 1 shl BIT_RST
         out     dx, al
         mov     cx, 1000                ; wait no longer for the reset
-  .wait_for_reset:
+  @@:
         in      al, dx
         test    al, 1 shl BIT_RST
-        jz      .reset_completed        ; RST remains 1 during reset
+        jz      @f                      ; RST remains 1 during reset
         dec     cx
-        jns     .wait_for_reset
+        jnz     @r
         DEBUGF  2, "Reset timeout!\n"
         or      eax, -1
         ret
-  .reset_completed:
+  @@:
 ; Read MAC address
         call    read_mac
         out     dx, ax
 ; Set the mtu, kernel will be able to send now
+        mov     [ebx + device.mtu], 1514
         mov     [ebx + device.mtu], 1514
 ; Detect current link status
         call    link
 include '../peimport.inc'
+my_service      db 'RTL8139',0                    ; max 16 chars include zero
-my_service      db 'RTL8139',0                    ; max 16 chars include zero
+sz_unknown              db 'Unknown RTL8139 clone', 0
-device_1        db 'Realtek 8139',0
+sz_RTL8139              db 'Realtek 8139',0
-device_2        db 'Realtek 8139A',0
+sz_RTL8139_K            db 'Realtek 8139 rev K',0
-device_3        db 'Realtek 8139B',0
+sz_RTL8139A             db 'Realtek 8139A',0
-device_4        db 'Realtek 8139C',0
+sz_RTL8139A_G           db 'Realtek 8139A rev G',0
-device_5        db 'Realtek 8100',0
+sz_RTL8139B             db 'Realtek 8139B',0
+sz_RTL8130              db 'Realtek 8130',0
-device_6        db 'Realtek 8139D',0
+sz_RTL8139C             db 'Realtek 8139C',0
-device_7        db 'Realtek 8139CP',0
+sz_RTL8100              db 'Realtek 8100',0
-device_8        db 'Realtek 8101',0
+sz_RTL8100_8139D        db 'Realtek 8100B / 8139D',0
+sz_RTL8101              db 'Realtek 8101',0
-device_unknown  db 'Unknown RTL8139 clone', 0
+hw_ver_names:
-crosslist:
+        dd sz_unknown
-        dd device_1
+        dd sz_RTL8139
-        dd device_2
+        dd sz_RTL8139_K
-        dd device_3
+        dd sz_RTL8139A
-        dd device_4
+        dd sz_RTL8139A_G
-        dd device_5
+        dd sz_RTL8139B
+        dd sz_RTL8130
-        dd device_6
+        dd sz_RTL8139C
-        dd device_7
+        dd sz_RTL8100
+        dd sz_RTL8100_8139D
-        dd device_8
+        dd sz_RTL8101
-        dd device_unknown
+hw_ver_array:                   ; This array is used by the probe routine to find out wich version of the RTL8139 we are working with
+        db 0
         db VER_RTL8139
+        db VER_RTL8139_K
-hw_ver_array:                    ; This array is used by the probe routine to find out wich version of the RTL8139 we are working with
+        db VER_RTL8139A
-        db VER_RTL8139
+        db VER_RTL8139A_G
-        db VER_RTL8139A
+        db VER_RTL8139B
-        db VER_RTL8139B
-        db VER_RTL8139C
+        db VER_RTL8130
-        db VER_RTL8100
-        db VER_RTL8139D
-        db VER_RTL8139CP
-        db VER_RTL8101
+        db VER_RTL8139C
-        db 0
+        db VER_RTL8100
         db VER_RTL8100_8139D

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8139.asm – Rev 6682 → 6711