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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; TODO: test for RX-overrun
 format PE DLL native
 entry START
         CURRENT_API             = 0x0200
+        COMPATIBLE_API          = 0x0100
+        API_VERSION             = (COMPATIBLE_API shl 16) + CURRENT_API
         COMPATIBLE_API          = 0x0100
-        API_VERSION             = (COMPATIBLE_API shl 16) + CURRENT_API
+; configureable area
         RXFTH                   = 7     ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=no threshold
         __DEBUG__               = 1
+        __DEBUG_LEVEL__         = 2     ; 1 = verbose, 2 = errors only
-        __DEBUG_LEVEL__         = 2     ; 1 = verbose, 2 = errors only
+; end configureable area
 section '.flat' readable writable executable
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit                                ;;
 ;;                                         ;;
 ;; In: pointer to device structure in ebx  ;;
+;; Out: eax = 0 on success                 ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+align 16
 proc transmit stdcall bufferptr
-        pushf
-        cli
+        spin_lock_irqsave
         mov     esi, [bufferptr]
         DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
         lea     eax, [esi + NET_BUFF.data]
         DEBUGF  1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
         [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
         [eax+06]:2,[eax+07]:2,[eax+08]:2,[eax+09]:2,[eax+10]:2,[eax+11]:2,\
         [eax+13]:2,[eax+12]:2
         cmp     [esi + NET_BUFF.length], 1514
-        ja      .fail
+        ja      .error
         cmp     [esi + NET_BUFF.length], 60
-        jb      .fail
+        jb      .error
 ; check if we own the current discriptor
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], REG_TSD0
         movzx   ecx, [ebx + device.curr_tx_desc]
         shl     ecx, 2
-        add     edx, ecx
-        in      eax, dx
+        add     edx, ecx
-        test    eax, (1 shl BIT_OWN)
+        in      eax, dx
-        jz      .wait_to_send
+        test    eax, (1 shl BIT_OWN)
         jz      .overrun
   .send_packet:
         inc     [ebx + device.curr_tx_desc]
         and     [ebx + device.curr_tx_desc], NUM_TX_DESC-1
 ; Update stats
         inc     [ebx + device.packets_tx]
-        mov     ecx, [esi + NET_BUFF.length]
+        mov     eax, [esi + NET_BUFF.length]
-        add     dword [ebx + device.bytes_tx], ecx
+        add     dword[ebx + device.bytes_tx], eax
-        adc     dword [ebx + device.bytes_tx+4], 0
+        adc     dword[ebx + device.bytes_tx + 4], 0
         DEBUGF  1, "Packet Sent!\n"
-        popf
+        spin_unlock_irqrestore
         xor     eax, eax
         ret
-  .wait_to_send:
-        DEBUGF  1, "Waiting for timeout\n"
-        push    edx
-        mov     esi, 30
-        invoke  Sleep
-        pop     edx
+  .error:
-        in      ax, dx
-        test    ax, (1 shl BIT_OWN)
-        jnz     .send_packet
+        DEBUGF  2, "TX packet error\n"
-        pusha
+        inc     [ebx + device.packets_tx_err]
+        invoke  NetFree, [bufferptr]
-        call    reset                            ; if chip hung, reset it
-        popa
+        spin_unlock_irqrestore
+        or      eax, -1
         ret
-        jmp     .send_packet
+  .overrun:
         DEBUGF  2, "TX overrun\n"
-  .fail:
+        inc     [ebx + device.packets_tx_ovr]
-        DEBUGF  2, "transmit failed!\n"
+        invoke  NetFree, [bufferptr]
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;;                   ;;
 ;; Interrupt handler ;;
 ;;                   ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
-align 4
+align 16
 int_handler:
+        push    ebx esi edi
-        push    ebx esi edi
-        DEBUGF  1, "INT\n"
-; find pointer of device wich made IRQ occur
-        mov     ecx, [devices]
+        mov     ebx, [esp+4*4]
-        test    ecx, ecx
-        jz      .nothing
-        mov     esi, device_list
+        DEBUGF  1,"INT for 0x%x\n", ebx
   .nextdevice:
-        mov     ebx, [esi]
+; TODO? if we are paranoid, we can check that the value from ebx is present in the current device_list
         set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr], REG_ISR
+        set_io  [ebx + device.io_addr], 0
-        in      ax, dx                          ; Get interrupt status
-        out     dx, ax                          ; send it back to ACK
-        test    ax, ax
-        jnz     .got_it
-  .continue:
-        add     esi, 4
-        dec     ecx
-        jnz     .nextdevice
-  .nothing:
-        pop     edi esi ebx
-        xor     eax, eax
+        set_io  [ebx + device.io_addr], REG_ISR
+        in      ax, dx                          ; Get interrupt status
-        ret                                     ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
+        test    ax, ax
         jz      .nothing
   .got_it:
         mov     ax, RX_CONFIG
         out     dx, ax
   .finish:
+        pop     ax
-        pop     ax
+  @@:
-;----------------------------------------------------
-; Transmit ok / Transmit error
+;----------------------------------------------------
-  @@:
+; Transmit ok / Transmit error
         test    ax, ISR_TOK + ISR_TER
   .notthisone:
         sub     ecx, 4
         jae     .txdescloop
+        pop     ax
-        pop     ax
+  @@:
-;----------------------------------------------------
-; Rx buffer overflow ?
+;----------------------------------------------------
-  @@:
+; Rx buffer overflow ?
         test    ax, ISR_RXOVW
         jz      @f
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], REG_ISR
         mov     ax, ISR_FIFOOVW or ISR_RXOVW or ISR_ROK
         out     dx, ax
         pop     ax
+  @@:
 ;----------------------------------------------------
-; Packet underrun?
-  @@:
+; Packet underrun?
         test    ax, ISR_PUN
         jz      @f
+        DEBUGF  1, "Packet underrun or link changed!\n"
         DEBUGF  1, "Packet underrun or link changed!\n"
         call    link
-        call    link
   @@:
 ;----------------------------------------------------
-; Receive FIFO overflow ?
+;----------------------------------------------------
-  @@:
+; Receive FIFO overflow ?
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], REG_ISR
         mov     ax, ISR_FIFOOVW or ISR_RXOVW or ISR_ROK
         out     dx, ax
         pop     ax
+  @@:
 ;----------------------------------------------------
-; cable length changed ?
-  @@:
+; cable length changed ?
         test    ax, ISR_LENCHG
-        jz      .fail
+        jz      @f
+        DEBUGF  2, "Cable length changed!\n"
-        DEBUGF  2, "Cable length changed!\n"
         call    link
   @@:
   .fail:
+        pop     edi esi ebx
+        xor     eax, eax
+        inc     eax
+        ret
         pop     edi esi ebx
-        xor     eax, eax
+  .nothing:

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8139.asm – Rev 9149 → 9161