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

 ;; Intel's programming manual for i8255x:                          ;;
 ;; http://www.intel.com/design/network/manuals/8255x_opensdm.htm   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; TODO: use separate descriptors in memory instead of placing them in front of packets!
 format PE DLL native
 CmdConfigure    = 0x0002
 CmdTx           = 0x0004
 CmdTxFlex       = 0x0008
 Cmdsuspend      = 0x4000
+CmdRxFlex       = 0x0008
 reg_scb_status  = 0
 reg_scb_cmd     = 2
 reg_scb_ptr     = 4
 reg_port        = 8
 ;-----------------------------
 ; Create RX and TX descriptors
+        call    create_ring
         test    eax, eax
-        call    create_ring
+        jz      .error
 ; RX start
+        set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr], 0
+        set_io  [ebx + device.io_addr], reg_scb_ptr
-        set_io  [ebx + device.io_addr], reg_scb_ptr
+        mov     eax, [ebx + device.rx_desc]
-        mov     eax, [ebx + device.rx_desc]
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [ebx + device.state], ETH_LINK_UNKNOWN
         xor     eax, eax        ; indicate that we have successfully reset the card
+        ret
+  .error:
+        or      eax, -1
         ret
 align 4
 create_ring:
+        DEBUGF  1,"Creating ring\n"
-        DEBUGF  1,"Creating ring\n"
+;---------------------
 ; build rxfd structure
 ;---------------------
+        invoke  NetAlloc, 2000
-; build rxfd structure
+        test    eax, eax
+        jz      .out_of_mem
-        invoke  KernelAlloc, 2000
+        mov     [ebx + device.rx_desc], eax
-        mov     [ebx + device.rx_desc], eax
+        mov     esi, eax
-        mov     esi, eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
-        mov     [esi + rxfd.status], 0x0000
+        mov     [esi + sizeof.NET_BUFF + rxfd.status], 0x0000
-        mov     [esi + rxfd.command], 0x0000
+        mov     [esi + sizeof.NET_BUFF + rxfd.command], 0x0000
         mov     [ebx + device.txfd.count], 0x01208000
         lea     eax, [ebx + device.txfd.buf_addr0]
         invoke  GetPhysAddr
         mov     [ebx + device.txfd.desc_addr], eax
+  .out_of_mem:
         ret
 ;;                                         ;;
 ;; In: pointer to device structure in ebx  ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-proc transmit stdcall bufferptr, buffersize
+proc transmit stdcall bufferptr
+        pushf
-        pushf
+        cli
-        cli
         mov     esi, [bufferptr]
-        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [buffersize]
+        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
-        mov     eax, [bufferptr]
+        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     [buffersize], 1514
+        cmp     [esi + NET_BUFF.length], 1514
         ja      .fail
+        cmp     [esi + NET_BUFF.length], 60
-        cmp     [buffersize], 60
+        jb      .fail
-        jb      .fail
+        ;;; TODO: check if current descriptor is in use
         ; fill in buffer address and size
-        ;;; TODO: check if current descriptor is in use
+        mov     eax, [bufferptr]
+        mov     [ebx + device.last_tx_buffer], eax
-        ; fill in buffer address and size
+        add     eax, [eax + NET_BUFF.offset]
-        mov     [ebx + device.last_tx_buffer], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        mov     [ebx + device.txfd.buf_addr0], eax
-        mov     [ebx + device.txfd.buf_addr0], eax
+        mov     ecx, [bufferptr]
-        mov     ecx, [buffersize]
+        mov     ecx, [ecx + NET_BUFF.length]
         mov     [ebx + device.txfd.buf_size0], ecx
         out     dx, ax
         call    cmd_wait
 ; Update stats
-        inc     [ebx + device.packets_tx]
-        mov     ecx, [buffersize]
+        inc     [ebx + device.packets_tx]
         add     dword[ebx + device.bytes_tx], ecx
         adc     dword[ebx + device.bytes_tx + 4], 0
         DEBUGF  1,"Transmit OK\n"
         popf
         xor     eax, eax
         ret
   .fail:
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         push    ebx
   .rx_loop:
         pop     ebx
         mov     esi, [ebx + device.rx_desc]
-        cmp     [esi + rxfd.status], 0        ; we could also check bits C and OK (bit 15 and 13)
+        cmp     [esi + sizeof.NET_BUFF + rxfd.status], 0        ; we could also check bits C and OK (bit 15 and 13)
         je      .nodata
-        DEBUGF  1,"rxfd status=0x%x\n", [esi + rxfd.status]:4
+        DEBUGF  1,"rxfd status=0x%x\n", [esi + sizeof.NET_BUFF + rxfd.status]:4
-        movzx   ecx, [esi + rxfd.count]
+        movzx   ecx, [esi + sizeof.NET_BUFF + rxfd.count]
-        and     ecx, 0x3fff
-        push    ebx
+        and     ecx, 0x3fff
+        push    ebx
+        push    .rx_loop
-        push    .rx_loop
+        push    esi
-        push    ecx
+        mov     [esi + NET_BUFF.length], ecx
-        add     esi, rxfd.packet
+        mov     [esi + NET_BUFF.device], ebx
-        push    esi
+        mov     [esi + NET_BUFF.offset], NET_BUFF.data + rxfd.packet
 ; Update stats
         add     dword [ebx + device.bytes_rx], ecx
         adc     dword [ebx + device.bytes_rx + 4], 0
         inc     dword [ebx + device.packets_rx]
+; allocate new descriptor
-; allocate new descriptor
+        invoke  NetAlloc, 2000
-        invoke  KernelAlloc, 2000
+        mov     [ebx + device.rx_desc], eax
-        mov     [ebx + device.rx_desc], eax
+        mov     esi, eax
-        mov     esi, eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
-        mov     [esi + rxfd.status], 0x0000
+        mov     [esi + sizeof.NET_BUFF + rxfd.status], 0x0000
         mov     ax, RX_START
         out     dx, ax
         call    cmd_wait
 ; And give packet to kernel
-        jmp     [Eth_input]
+        jmp     [EthInput]
   .nodata:

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/i8255x.asm – Rev 5363 → 5522