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

         DRIVER_VERSION          = 5
         MAX_DEVICES             = 16
+        RBLEN                   = 3 ; Receive buffer size: 0==8K 1==16k 2==32k 3==64k
+        TXRR                    = 8 ; total retries = 16+(TXRR*16)
+        TX_MXDMA                = 6 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=2048
+        ERTXTH                  = 8 ; in unit of 32 bytes e.g:(8*32)=256
-        RBLEN                   = 3 ; Receive buffer size: 0==8K 1==16k 2==32k 3==64k
+        RX_MXDMA                = 7 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=unlimited
-        NUM_TX_DESC             = 4
+        RXFTH                   = 7 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=no threshold
         BIT_SELECTOR            = 0 ; binary encoded selector CSMA/CD=00001
         BIT_IFG1                = 25
-        BIT_IFG0                = 24
-        TXRR                    = 8 ; total retries = 16+(TXRR*16)
-        TX_MXDMA                = 6 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=2048
-        ERTXTH                  = 8 ; in unit of 32 bytes e.g:(8*32)=256
-        RX_MXDMA                = 7 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=unlimited
-        RXFTH                   = 7 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=no threshold
+        BIT_IFG0                = 24
         RX_CONFIG               = (RBLEN shl BIT_RBLEN) or \
                                   (RX_MXDMA shl BIT_RX_MXDMA) or \
                                   (1 shl BIT_NOWRAP) or \
                                   (RXFTH shl BIT_RXFTH) or\
-                                  (1 shl BIT_AB) or \                 ; Accept broadcast packets
+                                  (1 shl BIT_AB) or \                   ; Accept broadcast packets
-                                  (1 shl BIT_APM) or \                ; Accept physical match packets
+                                  (1 shl BIT_APM) or \                  ; Accept physical match packets
-                                  (1 shl BIT_AER) or \                ; Accept error packets
+                                  (1 shl BIT_AER) or \                  ; Accept error packets
-                                  (1 shl BIT_AR) or \                 ; Accept Runt packets (smaller then 64 bytes)
+                                  (1 shl BIT_AR) or \                   ; Accept Runt packets (smaller then 64 bytes)
-                                  (1 shl BIT_AM)                      ; Accept multicast packets
+                                  (1 shl BIT_AM)                        ; Accept multicast packets
         RX_BUFFER_SIZE          = (8192 shl RBLEN);+16+1500
-        RX_BUFFER_SIZE          = (8192 shl RBLEN);+16
+        MAX_ETH_FRAME_SIZE      = 1514
-        MAX_ETH_FRAME_SIZE      = 1514
+        NUM_TX_DESC             = 4                                     ; not user selectable
         ISR_TOK                 = 1 shl 2
         ISR_RER                 = 1 shl 1
         ISR_ROK                 = 1 shl 0
+        INTERRUPT_MASK          = ISR_ROK or \
+                                  ISR_RER or \
+                                  ISR_TOK or \
-        INTERRUPT_MASK          = ISR_ROK or \
+                                  ISR_TER or \
                                   ISR_RXOVW or \
                                   ISR_PUN or \
                                   ISR_FIFOOVW or \
                                   ISR_LENCHG or \
-                                  ISR_TOK or \
+                                  ISR_TIMEOUT or \
+                                  ISR_SERR
                                   ISR_TER
         TSR_OWN                 = 1 shl 13
 ; set RxBuffer address, init RX buffer offset
         mov     eax, [device.rx_buffer]
         mov     dword[eax], 0                   ; clear receive flags for first packet (really needed??)
         DEBUGF  1, "RX buffer virtual addr=0x%x\n", eax
         GetRealAddr
-        DEBUGF  1, "RX buffer real addr=0x%x\n", eax
+        DEBUGF  1, "RX buffer physical addr=0x%x\n", eax
         set_io  REG_RBSTART
         out     dx, eax
 ; Read MAC address
 ; Transmit ok / Transmit error
   @@:
         test    ax, ISR_TOK + ISR_TER
         jz      @f
+        DEBUGF  1, "Transmit done!\n"
         push    ax
         mov     ecx, (NUM_TX_DESC-1)*4
   .txdescloop:
         set_io  0
         jz      .notthisone
         cmp     [device.TX_DESC+ecx], 0
         je      .notthisone
+        DEBUGF  1, "TSD: 0x%x\n", eax
-;  .notxd:
-;        test    eax, TSR_TUN
+        test    eax, TSR_TUN
-;        jz      .nobun
+        jz      .no_bun
-;        DEBUGF  2, "TX: FIFO Buffer underrun!\n"
+        DEBUGF  2, "TX: FIFO Buffer underrun!\n"
-;
-;  .nobun:
+  .no_bun:
-;        test    eax, TSR_OWC
+        test    eax, TSR_OWC
-;        jz      .noowc
+        jz      .no_owc
-;        DEBUGF  2, "TX: OWC!\n"
+        DEBUGF  2, "TX: OWC!\n"
-;
-;  .noowc:
+  .no_owc:
-;        test    eax, TSR_TABT
+        test    eax, TSR_TABT
-;        jz      .notabt
+        jz      .no_tabt
-;        DEBUGF  2, "TX: TABT!\n"
+        DEBUGF  2, "TX: TABT!\n"
-;
-;  .notabt:
+  .no_tabt:
-;        test    eax, TSR_CRS
+        test    eax, TSR_CRS
-;        jz      .nocsl
+        jz      .no_csl
-;        DEBUGF  2, "TX: Carrier Sense Lost!\n"
+        DEBUGF  2, "TX: Carrier Sense Lost!\n"
+  .no_csl:
+        test    eax, TSR_TOK
+        jz      .no_tok
-;
+        DEBUGF  1, "TX: Transmit OK!\n"
 ;  .nocsl:
   .no_tok:
-        DEBUGF  1, "TX OK: free buffer %x\n", [device.TX_DESC+ecx]:8
+        DEBUGF  1, "free transmit buffer 0x%x\n", [device.TX_DESC+ecx]:8
         push    ecx ebx
         stdcall KernelFree, [device.TX_DESC+ecx]
         pop     ebx ecx
         mov     [device.TX_DESC+ecx], 0
   .notthisone:
         sub     ecx, 4
-        ja      .txdescloop
+        jae     .txdescloop
 ;;                     ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 cable:
-        DEBUGF  1, "Updating Cable status\n"
+        DEBUGF  1, "Checking link status:\n"
         set_io  0
         jnz     .10mbps
   .100mbps:
         mov     [device.state], ETH_LINK_100M
+        call    NetLinkChanged
-        call    NetLinkChanged
+        DEBUGF  1, "100 mbit\n"
         ret
+  .10mbps:
-  .10mbps:
+        mov     [device.state], ETH_LINK_10M
-        mov     [device.state], ETH_LINK_10M
+        call    NetLinkChanged
-        call    NetLinkChanged
+        DEBUGF  1, "10 mbit\n"
+        ret
         ret
 ;; Read MAC address ;;
 ;;                  ;;
 ;;;;;;;;;;;;;;;;;;;;;;
 read_mac:
-        DEBUGF  2, "Reading MAC:\n"
+        DEBUGF  1, "Reading MAC:\n"
         set_io  0
         lea     edi, [device.mac]
         in      eax, dx
         stosd
         add     edx, 4
         in      ax, dx
         stosw

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8139.asm – Rev 3856 → 3857