WebSVN – Kolibri OS – Diff – /kernel/branches/net/network/ethernet.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2010. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  ETHERNET.INC                                                   ;;
 ;;                                                                 ;;
 ;;  Ethernet network layer for KolibriOS                           ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1473 $
 $Revision: 1514 $
 MAX_ETH_DEVICES 	equ MAX_NET_DEVICES
 ETH_QUEUE_SIZE		equ 16
 struct	ETH_FRAME
-	.DstMAC 	dp  ?  ; destination MAC-address [6 bytes]
+	.DstMAC 	dp  ?  ; destination MAC-address
-	.SrcMAC 	dp  ?  ; source MAC-address [6 bytes]
+	.SrcMAC 	dp  ?  ; source MAC-address
+	.Type		dw  ?  ; type of the upper-layer protocol
+	.Data:		       ; data (46-1500 bytes for a normal packet)
-	.Type		dw  ?  ; type of the upper-layer protocol [2 bytes]
+ends
 	.Data:		       ; data [46-1500 bytes]
-ends
+virtual at NET_DEVICE.end
-struct	ETH_DEVICE
+	ETH_DEVICE:
 	.unload 	dd ?
 	.bytes_tx	dq ?
 	.bytes_rx	dq ?
 	.packets_tx	dd ?
 	.packets_rx	dd ?
-	.mode		dd ?  ; This dword contains cable status (10mbit/100mbit, full/half duplex, auto negotiation or not,..)
+	.mode		dd ?
 	.name		dd ?
-	.mac		dp ?
-ends			      ; the rest of the device struct depends on the type of device
-struct	eth_queue_entry
-	.owner		dd ?
-	.data_ptr	dd ?
-	.data_size	dd ?
-	.size:
+	.mac		dp ?
 ends
 end virtual
 align 4
 iglobal
-	ETH_BROADCAST	dp  0xffffffffffff
-endg
+	ETH_BROADCAST	dp  0xffffffffffff
-align 4
-uglobal
-	ETH_RUNNING	dd  ?
-	ETH_DRV_LIST	rd  MAX_ETH_DEVICES
+endg
 	ETH_IN_QUEUE	rd  3*ETH_QUEUE_SIZE+3
-if QUEUE_BEFORE_SENDING
+align 4
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_init:
-	xor	eax, eax
-	mov	edi, ETH_RUNNING
-	mov	ecx, (1+MAX_ETH_DEVICES)
-	rep	stosd
-	init_queue ETH_IN_QUEUE
-if QUEUE_BEFORE_SENDING
-	init_queue ETH_OUT_QUEUE
-end if
-	ret
-;-----------------------------------------------------------------
-;
-; ETH_Add_Device:
-;
-;  This function is called by ethernet drivers,
-;  to register each running ethernet device to the kernel
-;
-;  IN:  Pointer to device structure in ebx
-;  OUT: Device num in eax, -1 on error
-;
-;-----------------------------------------------------------------
-align 4
-ETH_add_device:
-	DEBUGF	1,"ETH_Add_Device: %x ", ebx
-	mov	eax, [ETH_RUNNING]
-	cmp	eax, MAX_ETH_DEVICES
-	jge	.error
-	test	eax, eax
-	jnz	.notfirst
-	mov	dword [ETH_IN_QUEUE], eax
-if QUEUE_BEFORE_SENDING
-	mov	dword [ETH_OUT_QUEUE], eax
-end if
-      .notfirst:
-	mov	eax, ebx
-	mov	ecx, MAX_ETH_DEVICES	  ; We need to check whole list because a device may be removed without re-organizing list
-	mov	edi, ETH_DRV_LIST
-	repne	scasd			  ; See if device is already in the list
-	jz	.error
-	xor	eax, eax
-	mov	ecx, MAX_ETH_DEVICES
-	mov	edi, ETH_DRV_LIST
-	repne	scasd			  ; Find empty spot in the list
-	jnz	.error
-	sub	edi, 4
-	mov	[edi], ebx		  ; add device to list
-	sub	edi, ETH_DRV_LIST	  ; edi = 4*device num       Calculate device number in eax
-	mov	eax, edi		  ; edx = 4*device num
-	shr	eax, 2
-	inc	[ETH_RUNNING]		  ; Indicate that one more ethernet device is up and running
 	mov	[ETH_RUNNING], 0
-	DEBUGF	1,"- succes: %u\n",eax
-	ret
-       .error:
-	or	eax, -1
-	DEBUGF	2,"Adding ETH device failed\n"
-	ret
-;-----------------------------------------------------------------
-;
-; ETH_Remove_Device:
-;
-;  This function is called by ethernet drivers,
-;  to unregister ethernet devices from the kernel
-;
-;  IN:  Pointer to device structure in ebx
-;  OUT: eax: -1 on error
-;
-;-----------------------------------------------------------------
-align 4
-ETH_remove_device:
-	cmp	[ETH_RUNNING], 0
-	je	.error
-	mov	eax, ebx
-	mov	ecx, MAX_ETH_DEVICES
-	mov	edi, ETH_DRV_LIST
-	repne	scasd
-	jnz	.error
-	xor	eax, eax
-	mov	dword [edi-4], eax
-	dec	[ETH_RUNNING]
-	jnz	.notlast
-	mov	dword [ETH_IN_QUEUE], ETH_QUEUE_SIZE
-if QUEUE_BEFORE_SENDING
-	mov	dword [ETH_OUT_QUEUE], ETH_QUEUE_SIZE
-end if
-  .notlast:
-	ret
-  .error:
-	or	eax, -1
 	ret
 	ret
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_receiver:
-;        DEBUGF  1,"ETH_Receiver: "
-;        push    ebx
-;        mov     esi, esp
-;        add_to_queue ETH_IN_QUEUE, ETH_QUEUE_SIZE, eth_queue_entry.size, .fail
-;        DEBUGF  1,"Queued packet successfully\n"
-;        add     esp, 4*3
-;
-;        ret
-;
-;  .fail:
-;        DEBUGF  1,"ETH_IN_QUEUE is full!\n"
-;        add     esp, 4
-;        call    kernel_free
-;        add     esp, 4
-;
-;        ret
-;
-;
-;
-;;-----------------------------------------------------------------
-;;
-;; ETH_Handler:
-;;
-;;  Handles all queued eth packets (called from kernel's main_loop)
-;;
-;;  IN:  /
-;;  OUT: /
-;;
-;;-----------------------------------------------------------------
-;align 4
-;ETH_handler:
-;
-;        get_from_queue ETH_IN_QUEUE, ETH_QUEUE_SIZE, eth_queue_entry.size, .gohome
-;
-;        push    ETH_handler
-;
-;        lodsd
-;        mov     ebx, eax
-;        lodsd
-;        mov     ecx, eax
-;        lodsd
-;        xchg    eax, ecx
-;        push    ecx
-;        push    eax
-;-----------------------------
 	mov	eax, [esp]
 	mov	ecx, [esp+4]
-;-----------------------------
 	DEBUGF	1,"ETH_Handler - size: %u\n", ecx
 	cmp	ecx, 60    ; check packet length
 	jl	.dump
   .dump:
 	DEBUGF	2,"ETH_Handler - dumping\n"
 	call	kernel_free
-	add	esp, 4
-  .gohome:
-	ret				; return to get more from queue / to caller
-align 4
-ETH_handler:
-ret
-;-----------------------------------------------------------------
-;
-; ETH_sender:
-;
-;  This function sends an ethernet packet to the correct driver.
-;
-;  IN:  Pointer to buffer in [esp]
-;       size of buffer in [esp+4]
-;       pointer to device struct in ebx
-;  OUT: /
-;
-;-----------------------------------------------------------------
-align 4
-ETH_sender:
-if QUEUE_BEFORE_SENDING
-	DEBUGF	1,"ETH_Sender: queuing for device: %x, %u bytes\n", [esp], [esp + 4]
-	push	ebx
-	mov	esi, esp
-	add_to_queue ETH_OUT_QUEUE, ETH_QUEUE_SIZE, eth_queue_entry.size, .fail
-	DEBUGF	1,"Queued packet successfully\n"
-	add	esp, 3*4
-	ret
-  .fail:
-	DEBUGF	1,"ETH_OUT_QUEUE is full!\n"
-	add	esp, 4
-	call	kernel_free
-	add	esp, 4
 	add	esp, 4
-	ret
-;-----------------------------------------------------------------
-;
-; ETH_send_queued:
-;
-;  IN:  /
-;  OUT: /
-;
-;-----------------------------------------------------------------
-align 4
-ETH_send_queued:
-	get_from_queue ETH_OUT_QUEUE, ETH_QUEUE_SIZE, eth_queue_entry.size, .gohome
-	push	ETH_send_queued 		; this will cause the procedure to check for more packets
-						; when a single packet is handled
-	mov	ebx, [esi]
-	pushd	[esi + 8]
-	pushd	[esi + 4]
-	DEBUGF	1,"dequeued packet for device %x\n", ebx
-end if
-	call	[ebx+ETH_DEVICE.transmit]	; we will return to get_from_queue macro after transmitting packet
-	call	kernel_free
-	add	esp, 4 ; pop (balance stack)
-  .gohome:
-	ret
-;-----------------------------------------------------------------
-;
-; ETH_struc2dev
-;
-; IN: pointer to device struct in ebx
-;
-; OUT: edi is -1 on error, device number otherwise
-;
-;-----------------------------------------------------------------
-align 4
-ETH_struc2dev:
-	push	ecx
-	mov	ecx, MAX_ETH_DEVICES
-	mov	edi, ETH_DRV_LIST
-  .loop:
-	cmp	ebx, [edi]
-	jz	.found
-	add	edi, 4
-	dec	ecx
-	jnz	.loop
-	or	edi, -1
-	pop	ecx
-	ret
-  .found:
-	sub	edi, ETH_DRV_LIST
-	shr	edi, 2
-	pop	ecx
-	ret
 	ret
 ;-----------------------------------------------------------------
+;
 ; ETH_create_packet
 ;
-; IN: pointer to source mac in eax
+; IN: eax = pointer to source mac
-;     pointer to destination mac in ebx
+;     ebx = pointer to destination mac
-;     packet size in ecx
+;     ecx = packet size
-;     device number in edx
+;     edx = device number
-;     protocol in di
+;      di = protocol
 ;
-; OUT: edi is -1 on error, pointer to buffer otherwise
+; OUT: edi = 0 on error, pointer to buffer otherwise
-;      eax points to buffer start
+;      eax = buffer start
-;      ebx is pointer to device structure
+;      ebx = to device structure
-;      ecx is unchanged (packet size of embedded data)
-;      edx is size of complete buffer
+;      ecx = unchanged (packet size of embedded data)
-;      esi points to procedure wich needs to be called to send packet
+;      edx = size of complete buffer
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_create_packet:
 	DEBUGF	1,"Creating Ethernet Packet (size=%u): \n", ecx
-	cmp	ecx, 1500
+	cmp	ecx, 1500 ;;;
 	jg	.exit
+	push	ecx di eax ebx edx
-	push	ecx di eax ebx edx
 	add	ecx, ETH_FRAME.Data
-	add	ecx, ETH_FRAME.Data
+	push	ecx
 	push	ecx
-	push	ecx
 	call	kernel_alloc
-	test	eax, eax
+	mov	edi, eax
-	jz	.pop_exit
+	test	edi, edi
 	jz	.pop_exit
 	pop	ecx
 	stosw
 	lea	eax, [edi - ETH_FRAME.Data]  ; Set eax to buffer start
 	mov	edx, ecx		     ; Set ebx to complete buffer size
-	pop	ecx
-	mov	esi, ETH_sender
+	pop	ecx
 	xor	ebx, ebx			;;;; TODO: Fixme
-	mov	ebx, [ETH_DRV_LIST + ebx]
+	mov	ebx, [NET_DRV_LIST + ebx]
 	cmp	edx, 46 + ETH_FRAME.Data    ; If data size is less then 46, add padding bytes
 	ret
   .pop_exit:
 	DEBUGF	2,"Out of ram space!!\n"
 	add	esp, 18
-	or	edi,-1
+	and	edi, 0
 	ret
   .exit:
 	DEBUGF	2,"Packet too large!\n"
-	or	edi, -1
+	and	edi, 0
+;
 ;-----------------------------------------------------------------
 align 4
 ETH_API:
+	cmp	bh, MAX_NET_DEVICES
 	jg	.error
 	movzx	eax, bh
+	shl	eax, 2
+	cmp	bl, 7
+	jz	.out_queue
+	cmp	bl, 6
+	jz	.in_queue
+	mov	eax, dword [NET_DRV_LIST + eax]
+	cmp	[eax + NET_DEVICE.type], NET_TYPE_ETH
-	shl	eax, 2
+	jne	.error
 	test	bl, bl
 	jz	.packets_tx	; 0
 	dec	bl
 	jz	.bytes_rx	; 3
 	dec	bl
 	jz	.read_mac	; 4
 	dec	bl
 	jz	.write_mac	; 5
-	dec	bl
-	jz	.in_queue	; 6
-	dec	bl
-	jz	.out_queue	; 7
+  .error:
-.error:
+	DEBUGF	2,"Device is not ethernet type\n"
-	mov	eax, -1
+	or	eax, -1
 	ret
-.packets_tx:
 	add	eax, ETH_DRV_LIST
-	mov	eax, dword [eax]
+.packets_tx:
 	mov	eax, dword [eax + ETH_DEVICE.packets_tx]
-	ret
-.packets_rx:
+	ret
 	add	eax, ETH_DRV_LIST
-	mov	eax, dword [eax]
-	mov	eax, dword [eax + ETH_DEVICE.packets_rx]
-	ret
+.packets_rx:
 	mov	eax, dword [eax + ETH_DEVICE.packets_rx]
-.bytes_tx:
+	ret
 	add	eax, ETH_DRV_LIST
-	mov	eax, dword [eax]
+.bytes_tx:
-	mov	ebx, dword [eax + ETH_DEVICE.bytes_tx + 4]
-	mov	eax, dword [eax + ETH_DEVICE.bytes_tx]
-	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
+	mov	ebx, dword [eax + ETH_DEVICE.bytes_tx + 4]
-	ret
+	mov	eax, dword [eax + ETH_DEVICE.bytes_tx]
 	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
-.bytes_rx:
+	ret
 	add	eax, ETH_DRV_LIST
-	mov	eax, dword [eax]
-	mov	ebx, dword [eax + ETH_DEVICE.bytes_rx + 4]
-	mov	eax, dword [eax + ETH_DEVICE.bytes_rx]
-	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
-	ret
 .bytes_rx:
 	mov	ebx, dword [eax + ETH_DEVICE.bytes_rx + 4]
-.read_mac:
+	mov	eax, dword [eax + ETH_DEVICE.bytes_rx]
-	add	eax, ETH_DRV_LIST
+	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
-	mov	eax, [eax]
+	ret
 ;        push    eax
 ;        call    dword [eax + ETH_DEVICE.get_MAC]
-;        pop     eax
-	movzx	ebx, word [eax + ETH_DEVICE.mac]
-	mov	eax, dword [eax + ETH_DEVICE.mac + 2]
+.read_mac:
-	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
+	movzx	ebx, word [eax + ETH_DEVICE.mac]
-	ret
+	mov	eax, dword [eax + ETH_DEVICE.mac + 2]
 	mov	[esp+20+4], ebx 			; TODO: fix this ugly code
+	ret
 .write_mac:
-	push	ecx
+.write_mac:
+	push	ecx
+	push	dx
+	mov	eax, [eax + ETH_DEVICE.set_MAC]
-	push	dx
+	call	eax
-	add	eax, ETH_DRV_LIST
+	ret
-	mov	eax, [eax]
-	mov	eax, dword [eax + ETH_DEVICE.set_MAC]
+.in_queue:
-	call	eax
+   if ETH_QUEUE
-	ret
+	add	eax, ETH_IN_QUEUE
+	mov	eax, [eax + queue.size]
-.in_queue:
+   else
-	add	eax, ETH_IN_QUEUE
+	or	eax, -1
-	mov	eax, [eax + queue.size]
+   end if

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/ethernet.inc – Rev 1473 → 1514