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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2021. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;; i8255x (Intel eepro 100) driver for KolibriOS                   ;;
 ;;                                                                 ;;
 ;;    Written by hidnplayr@kolibrios.org                           ;;
         CURRENT_API             = 0x0200
         COMPATIBLE_API          = 0x0100
         API_VERSION             = (COMPATIBLE_API shl 16) + CURRENT_API
-        MAX_DEVICES             = 16
+; configureable area
+        MAX_DEVICES             = 16            ; Maximum number of devices this driver may handle
-        TX_RING_SIZE            = 16
+        TX_RING_SIZE            = 16            ; Number of packets in send ring buffer
+        RX_RING_SIZE            = 1             ; Number of packets in receive ring buffer
         __DEBUG__               = 1             ; 1 = on, 0 = off
-        DEBUG                   = 1
+        __DEBUG_LEVEL__         = 2             ; 1 = verbose, 2 = errors only
         __DEBUG__               = 1
-        __DEBUG_LEVEL__         = 2             ; 1 = verbose, 2 = errors only
+; end configureable area
 section '.flat' readable writable executable
+include '../proc32.inc'
+include '../struct.inc'
+include '../macros.inc'
+include '../fdo.inc'
+include '../netdrv.inc'
+if (bsr TX_RING_SIZE)>(bsf TX_RING_SIZE)
+  display 'TX_RING_SIZE must be a power of two'
+  err
 end if
 include '../proc32.inc'
-include '../struct.inc'
+if (RX_RING_SIZE)<>(1)
-include '../macros.inc'
+  display 'RX_RING_SIZE must be 1'
-include '../fdo.inc'
+  err
 ; Serial EEPROM
 EE_SK                   = 1 shl 0       ; serial clock
 EE_CS                   = 1 shl 1       ; chip select
 EE_DI                   = 1 shl 2       ; data in
 EE_DO                   = 1 shl 3       ; data out
-EE_MASK                 = EE_SK + EE_CS + EE_DI + EE_DO
+EE_MASK                 = EE_SK or EE_CS or EE_DI or EE_DO
 ; opcodes, first bit is start bit and must be 1
 EE_READ                 = 110b
 EE_WRITE                = 101b
 EE_ERASE                = 111b
         call    cmd_wait
 ;-------------------------
 ; Individual address setup
-        mov     [ebx + device.confcmd.command], TXFD_CMD_IA + TXFD_CMD_SUSPEND
+        mov     [ebx + device.confcmd.command], TXFD_CMD_IA or TXFD_CMD_SUSPEND
         mov     [ebx + device.confcmd.status], 0
         lea     eax, [ebx + device.tx_ring]
         invoke  GetPhysAddr
         call    cmd_wait
 ;-------------
 ; Configure CU
-        mov     [ebx + device.confcmd.command], TXFD_CMD_CFG + TXFD_CMD_SUSPEND
+        mov     [ebx + device.confcmd.command], TXFD_CMD_CFG or TXFD_CMD_SUSPEND
         mov     [ebx + device.confcmd.status], 0
         lea     eax, [ebx + device.confcmd.status]
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; 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
         ; Get current TX descriptor
         mov     edi, [ebx + device.cur_tx]
         mov     eax, sizeof.txfd
         mul     edi
         lea     edi, [ebx + device.tx_ring + eax]
         ; Check if current descriptor is free or still in use
         cmp     [edi + txfd.status], 0
-        jne     .fail
+        jne     .overrun
         ; Fill in status and command values
         ; Update stats
         inc     [ebx + device.packets_tx]
         add     dword[ebx + device.bytes_tx], ecx
         adc     dword[ebx + device.bytes_tx + 4], 0
-        ; Wait for command to complete
-        call    cmd_wait
         inc     [ebx + device.cur_tx]
         and     [ebx + device.cur_tx], TX_RING_SIZE - 1
+        ; Wait for command to complete
+        call    cmd_wait
         DEBUGF  1,"Transmit OK\n"
-        popf
+        spin_unlock_irqrestore
         xor     eax, eax
         ret
+  .error:
+        DEBUGF  2, "TX packet error\n"
+        inc     [ebx + device.packets_tx_err]
+        invoke  NetFree, [bufferptr]
+        spin_unlock_irqrestore
+        or      eax, -1
+        ret
   .overrun:
+        DEBUGF  2, "TX overrun\n"
-  .fail:
+        inc     [ebx + device.packets_tx_ovr]
-        DEBUGF  2,"Transmit failed!\n"
+        invoke  NetFree, [bufferptr]
         invoke  NetFree, [bufferptr]
-        popf
+        spin_unlock_irqrestore
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;;                   ;;
 ;; Interrupt handler ;;
 ;;                   ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
-align 4
+align 16
 int_handler:
         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      ; REG_SCB_STATUS = 0
-        set_io  [ebx + device.io_addr], REG_SCB_STATUS
+;        set_io  [ebx + device.io_addr], 0      ; REG_SCB_STATUS = 0
-        in      ax, dx
-        out     dx, ax                          ; send it back to ACK
-        test    ax, ax
-        jnz     .got_it
-  .continue:
-        add     esi, 4
-        dec     ecx
-        jnz     .nextdevice
-  .nothing:
+        set_io  [ebx + device.io_addr], REG_SCB_STATUS
-        pop     edi esi ebx
-        xor     eax, eax
+        in      ax, dx
-        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:
+        out     dx, ax                          ; send it back to ACK
   .tx_done:
         pop     eax
   .no_tx:
         test    ax, RU_STATUS_NO_RESOURCES
-        jne     .fail
+        jz      .not_out_of_resources
         DEBUGF  2, "Out of resources!\n"
-  .fail:
+  .not_out_of_resources:
         pop     edi esi ebx
+        xor     eax, eax
+        inc     eax
+        ret
         xor     eax, eax
-        inc     eax
+  .nothing:
-        ret
         ret

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/i8255x.asm @ 6948 – Rev 6948 → 9232