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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1885 $
+$Revision: 2220 $
 __DEBUG_LEVEL_OLD__	equ __DEBUG_LEVEL__	; use seperate debug level for network part of kernel
 align 4
 uglobal
 	NET_RUNNING	dd  ?
-	NET_DRV_LIST	rd  MAX_NET_DEVICES
+	NET_DRV_LIST	rd  (MAX_NET_DEVICES + 1)	; device 0 is a link to the default device
 stack_init:
 ; Init the network drivers list
 	xor	eax, eax
 	mov	edi, NET_RUNNING
-	mov	ecx, MAX_NET_DEVICES + 1
+	mov	ecx, (MAX_NET_DEVICES + 2)
-	rep	stosd
 	rep	stosd
 	ETH_init
 ;        SLIP_init
 ;        PPPOE_init
 ;-----------------------------------------------------------------
+;
-; NET_add_Device:
+; NET_add_device:
+;
 ;  This function is called by the network drivers,
+;
 ;-----------------------------------------------------------------
 align 4
 NET_add_device:
-	DEBUGF	1,"NET_Add_Device: %x\n", ebx
+	DEBUGF	1,"NET_Add_Device: %x\n", ebx	;;; TODO: use mutex to lock net device list
 	mov	eax, [NET_RUNNING]
 	cmp	eax, MAX_NET_DEVICES
 	jge	.error
 ;----------------------------------
 ; Check if device is already listed
 	mov	eax, ebx
-	mov	ecx, MAX_NET_DEVICES	  ; We need to check whole list because a device may be removed without re-organizing list
+	mov	ecx, MAX_NET_DEVICES	; We need to check whole list because a device may be removed without re-organizing list
-	mov	edi, NET_DRV_LIST
+	mov	edi, NET_DRV_LIST+4
-	repne	scasd			  ; See if device is already in the list
+	repne	scasd			; See if device is already in the list
 	jz	.error
 ;----------------------------
 ; Find empty slot in the list
 	xor	eax, eax
-	mov	ecx, MAX_NET_DEVICES
-	mov	edi, NET_DRV_LIST
-	repne	scasd
-	jnz	.error
-	sub	edi, 4
-	cmp	[ebx + NET_DEVICE.type], NET_TYPE_ETH
-	je	.ethernet
-	cmp	[ebx + NET_DEVICE.type], NET_TYPE_SLIP
-	je	.slip
-	DEBUGF	1,"Unknown network device type: %u\n", [ebx + NET_DEVICE.type]
-	jmp	.error
-  .ethernet:
-	DEBUGF	1,"Trying to add an ethernet device\n"
-	inc	[ETH_RUNNING]		  ; Indicate that one more ethernet device is up and running
-	jmp	.add_it
-  .slip:
+	mov	ecx, MAX_NET_DEVICES
-	DEBUGF	1,"Trying to add a slip device\n"
+	mov	edi, NET_DRV_LIST+4
 	;;;;
-	jmp	.error
+	repne	scasd
+	jnz	.error
-  .add_it:
+	sub	edi, 4
+;-----------------------------
+; Add device to the found slot
+	mov	[edi], ebx		; add device to list
+	mov	eax, edi		; Calculate device number in eax
+	sub	eax, NET_DRV_LIST
 	shr	eax, 2
 ;-----------------------------
-; Add device to the found slot
+	inc	[NET_RUNNING]		; Indicate that one more network device is up and running
 	mov	[edi], ebx		  ; add device to list
+;-----------------------------------------------------------------
+;
+; NET_set_default
+;
+;  API to set the default interface
+;
+;  IN:  Device num in eax
+;  OUT: Device num in eax, -1 on error
+;
+;-----------------------------------------------------------------
+align 4
+NET_set_default:
+	DEBUGF	1,"NET_set_default %x\n", eax
+	cmp	eax, MAX_NET_DEVICES
+	jge	.error
+	cmp	[NET_DRV_LIST+eax*4], 0
+	je	.error
+	push	[NET_DRV_LIST+eax*4]
+	pop	[NET_DRV_LIST]
+	DEBUGF	1,"Device number %u is now default!\n", eax
+	ret
+  .error:
+	or	eax, -1
+	DEBUGF	2,"Setting default network device failed\n"
+	ret
 ;-----------------------------------------------------------------
+;
 ; NET_Remove_Device:
-;
+;
 ;  This function is called by etwork drivers,
 ;  to unregister network devices from the kernel
 ;                                                                                                                                d
 ;  IN:  Pointer to device structure in ebx
 ;  OUT: eax: -1 on error
+;
 ;-----------------------------------------------------------------
 align 4
+NET_remove_device:
+	cmp	[NET_RUNNING], 0
+	je	.error
+	cmp	[NET_DRV_LIST], ebx
+	jne	@f
+	mov	[NET_DRV_LIST], 0
+	cmp	[NET_RUNNING], 1
+	je	@f
+	; there are still active devices, find one and make it default
+	xor	eax, eax
+	mov	ecx, MAX_NET_DEVICES
+	mov	edi, NET_DRV_LIST+4
+	repe	scasd
-NET_remove_device:
+	jz	@f
 	push	dword [edi-4]
-	cmp	[NET_RUNNING], 0
+	pop	[NET_DRV_LIST]
-	je	.error
+       @@:
 ;----------------------------
 ; Find the driver in the list
 align 4
 NET_ptr_to_num:
 	push	ecx
 	mov	ecx, MAX_NET_DEVICES
-	mov	edi, NET_DRV_LIST
+	mov	edi, NET_DRV_LIST+4
   .loop:
 	cmp	ebx, [edi]
 	shr	esi, 6
-	cmp	dword [esi + NET_DRV_LIST], 0 ; check if driver is running
+	cmp	dword [esi + NET_DRV_LIST], 0	; check if driver is running
+	je	.doesnt_exist
 	je	.doesnt_exist
-	test	bl, bl			 ; 0 = Get device type (ethernet/token ring/...)
+	test	bl, bl			; 0 = Get device type (ethernet/token ring/...)
 	jnz	@f
   @@:
 	dec	bl			; 4 = Get driver pointer
 	jnz	@f
+	; ..;
+	xor	eax, eax
+	jmp	.return
+  @@:
+	dec	bl			; 5 = Get driver name
+	jnz	@f
+	; ..;
+	xor	eax, eax
+	jmp	.return
+  @@:
+	dec	bl			; 6 = Set default device
+	jnz	@f
+	mov	eax, esi
+	call	NET_set_default
-	; ..;
+	jmp	.return
   @@:
-;  ...                                   ; 5 Get driver name
+  @@:

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/stack.inc – Rev 1885 → 2220