WebSVN – Kolibri OS – Diff – /kernel/trunk/network/ethernet.inc

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5363 $
+$Revision: 5522 $
 ETH_FRAME_MINIMUM       = 60
         mac             dp ?
-ends
-struct  ETH_queue_entry
-        device          dd ?
-        packet          dd ?
-        size            dd ?
 ends
+iglobal
+align 4
+        ETH_BROADCAST   dp 0xffffffffffff
+        ETH_frame_queued        dd 0    ; Number of queued frames
 iglobal
-align 4
+        ETH_frame_head          dd ETH_frame_head       ; Pointer to next frame in the linked list
         ETH_frame_tail          dd ETH_frame_head       ; Pointer to last frame in the linked list
         ETH_BROADCAST   dp  0xffffffffffff
-endg
 endg
 uglobal
-align 4
-        ETH_input_event dd ?
-        ETH_queue       rd (ETH_QUEUE_SIZE*sizeof.ETH_queue_entry + sizeof.queue)/4
+uglobal
-endg
+align 4
         ETH_input_event dd ?
-macro   ETH_init {
+endg
 ;-----------------------------------------------------------------
+;
 ; ETH_input
+;
 ;  This function is called by ethernet drivers,
-;  It pushes the received ethernet packets onto the eth_in_queue
+;  It pushes the received ethernet packets onto the ethernet input queue
+;
-;  IN:   [esp]  = Pointer to buffer
+;  IN:  [esp] = Pointer to buffer
-;       [esp+4] = size of buffer
-;         ebx   = pointer to eth_device
+;
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_input:
+        pop     eax
+        pushf
+        cli
-        push    ebx
+        cmp     [ETH_frame_queued], ETH_QUEUE_SIZE
+        jae     .full
+        inc     [ETH_frame_queued]
+; Add frame to the end of the linked list
-        mov     esi, esp
+        mov     [eax + NET_BUFF.NextPtr], ETH_frame_head
+        mov     ebx, [ETH_frame_tail]
+        mov     [eax + NET_BUFF.PrevPtr], ebx
+        mov     [ETH_frame_tail], eax
+        mov     [ebx + NET_BUFF.NextPtr], eax
-        add_to_queue ETH_queue, ETH_QUEUE_SIZE, sizeof.ETH_queue_entry, .fail
+        popf
         add     esp, sizeof.ETH_queue_entry
 ; Now queue an event to process it
         xor     edx, edx
         mov     eax, [ETH_input_event]
         mov     ebx, [eax + EVENT.id]
         xor     esi, esi
         call    raise_event
-        ret
+        ret
-  .fail:
-        DEBUGF  DEBUG_NETWORK_ERROR, "ETH incoming queue is full, discarding packet!\n"
   .full:
         xor     esi, esi
         mov     ecx, MANUAL_DESTROY
         call    create_event
         mov     [ETH_input_event], eax
         pushf
+  .wait:
-  .wait:
+        popf
         mov     eax, [ETH_input_event]
         mov     ebx, [eax + EVENT.id]
         call    wait_event
+  .loop:
+        pushf
+        cli
+        cmp     [ETH_frame_queued], 0
+        je      .wait
-  .loop:
-        get_from_queue ETH_queue, ETH_QUEUE_SIZE, sizeof.ETH_queue_entry, .wait
+        dec     [ETH_frame_queued]
-        mov     eax, [esi + ETH_queue_entry.packet]
+        mov     esi, [ETH_frame_head]
+        mov     ebx, [esi + NET_BUFF.NextPtr]
+        mov     [ETH_frame_head], ebx
+        mov     [ebx + NET_BUFF.PrevPtr], ETH_frame_head
-        mov     ecx, [esi + ETH_queue_entry.size]
+        popf
+        mov     eax, [esi + NET_BUFF.offset]
+        add     eax, esi
+        mov     ecx, [esi + NET_BUFF.length]
-        mov     ebx, [esi + ETH_queue_entry.device]
+        mov     ebx, [esi + NET_BUFF.device]
-        pushd   .loop   ; return address
+        pushd   .loop           ; return address for protocol handler
+        push    esi             ; keep pointer to NET_BUFF on stack
         push    ecx eax
         DEBUGF  DEBUG_NETWORK_VERBOSE, "ETH_input: size=%u\n", ecx
+        sub     ecx, sizeof.ETH_header
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "ETH_input: size=%u\n", ecx
+        jb      .dump
         sub     ecx, sizeof.ETH_header
-        jb      .dump
+; Set registers for protocol handlers
         lea     edx, [eax + sizeof.ETH_header]
         DEBUGF  DEBUG_NETWORK_VERBOSE, "ETH_input: Unknown packet type=%x\n", ax
   .dump:
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "ETH_input: dumping\n"
-        call    NET_packet_free
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "ETH_input: dumping\n"
-        add     esp, 4
+        call    NET_BUFF_free
         ret
 ; IN:  ax = protocol
 ;     ebx = device ptr
 ;     ecx = payload size
 ;     edx = pointer to destination mac
+;
-; OUT: eax = start of ethernet frame / 0 on error
+; OUT: eax = start of net frame / 0 on error
 ;      ebx = device ptr
 ;      ecx = payload size
-;      edx = ethernet frame size
-;      edi = start of ethernet payload
+;      edi = start of payload
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_output:
         ja      .exit
         push    ecx
         push    ax edx
-        add     ecx, sizeof.ETH_header
+        add     ecx, sizeof.ETH_header + NET_BUFF.data
-        stdcall kernel_alloc, ecx
+        stdcall NET_BUFF_alloc, ecx
+        test    eax, eax
-        test    eax, eax
+        jz      .out_of_ram
+        mov     [eax + NET_BUFF.type], NET_BUFF_ETH
+        mov     [eax + NET_BUFF.device], ebx
-        jz      .out_of_ram
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
-        mov     edi, eax
+        lea     edi, [eax + NET_BUFF.data]
         pop     esi
         movsd
         movsw
         lea     esi, [ebx + ETH_DEVICE.mac]
         movsd
         movsw
         pop     ax
-        stosw
+        stosw
-        lea     eax, [edi - sizeof.ETH_header]  ; Set eax to buffer start
+        lea     eax, [edi - sizeof.ETH_header - NET_BUFF.data]  ; Set eax to buffer start
         pop     ecx
         lea     edx, [ecx + sizeof.ETH_header]  ; Set edx to complete buffer size
         cmp     edx, ETH_FRAME_MINIMUM
-        cmp     edx, ETH_FRAME_MINIMUM
+        jbe     .adjust_size
-        jbe     .adjust_size
+  .done:
   .read_mac:
         movzx   ebx, word [eax + ETH_DEVICE.mac]
         mov     eax, dword [eax + ETH_DEVICE.mac + 2]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/ethernet.inc – Rev 5363 → 5522