WebSVN – Kolibri OS – Diff – /kernel/branches/net/drivers/sis900.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                    ;;
-;; 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 driver for KolibriOS                                     ;;
 ;;  This is an adaptation of MenuetOS driver with minimal changes.    ;;
 ;;  Changes were made by CleverMouse. Original copyright follows.     ;;
 ;;                                                                    ;;
 ;;  This driver is based on the SIS900 driver from                    ;;
 ;;  the etherboot 5.0.6 project. The copyright statement is           ;;
 ;;                                                                    ;;
 ;;          GNU GENERAL PUBLIC LICENSE                                ;;
 ;;             Version 2, June 1991                                   ;;
 ;;                                                                    ;;
 ;;  remaining parts Copyright 2004 Jason Delozier,                    ;;
 ;;   cordata51@hotmail.com                                            ;;
 ;;                                                                    ;;
 ;;  See file COPYING for details                                      ;;
 ;;                                                                    ;;
 ;;  Updates:                                                          ;;
 ;;    Revision Look up table and SIS635 Mac Address by Jarek Pelczar  ;;
 ;;                                                                    ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; $Revision: 1514 $
 format MS COFF
 	API_VERSION		equ 0x01000100
+	DRIVER_VERSION		equ 5
+	MAX_DEVICES		equ 16
 	DEBUG			equ 1
 	__DEBUG__		equ 1
 	__DEBUG_LEVEL__ 	equ 1
 include 'proc32.inc'
 include 'imports.inc'
 include 'fdo.inc'
 include 'netdrv.inc'
 public START
 public version
-NUM_RX_DESC    equ    4 	      ;* Number of RX descriptors *
+NUM_RX_DESC		equ 4		;* Number of RX descriptors *
-NUM_TX_DESC    equ    1 	      ;* Number of TX descriptors *
+NUM_TX_DESC		equ 1		;* Number of TX descriptors *
-RX_BUFF_SZ	    equ    1520 	   ;* Buffer size for each Rx buffer *
+RX_BUFF_SZ		equ 1520	;* Buffer size for each Rx buffer *
-TX_BUFF_SZ	    equ    1516 	   ;* Buffer size for each Tx buffer *
+TX_BUFF_SZ		equ 1516	;* Buffer size for each Tx buffer *
-MAX_ETH_FRAME_SIZE  equ    1516
+MAX_ETH_FRAME_SIZE	equ 1516
-TOTAL_BUFFERS_SIZE equ NUM_RX_DESC*RX_BUFF_SZ + NUM_TX_DESC*TX_BUFF_SZ
-virtual at 0
+virtual at ebx
 	device:
 	ETH_DEVICE
 ; device specific
-      .io_addr		dd ?
+	.io_addr	dd ?
-      .pci_bus		db ?
+	.pci_bus	db ?
-      .pci_dev		db ?
+	.pci_dev	db ?
-      .irq_line 	db ?
+	.irq_line	db ?
-      .cur_rx		db ?
+	.cur_rx 	db ?
+	.cur_tx 	db ?
+	.last_tx	db ?
-      .pci_revision	db ?
+	.pci_revision	db ?
-      .table_entries:	db ?
+	.table_entries	db ?
-align 4
+			dw ? ; align 4
-      .special_func:	dd 0
+	.special_func	dd ?
-      .txd: times (3 * NUM_TX_DESC) dd 0
+	.txd		rd (4 * NUM_TX_DESC)
-      .rxd: times (3 * NUM_RX_DESC) dd 0
+	.rxd		rd (4 * NUM_RX_DESC)
-      .size:
+	.size = $ - device
 end virtual
+macro	ee_delay {
-; First page is designated to ETH_DEVICE, buffers start from second
+	push	eax
-ALLOCATION_SIZE = ((device.size+0FFFh) and not 0FFFh) + TOTAL_BUFFERS_SIZE
+	in	eax, dx
-; Note that buffers must be contiguous in the physical memory;
+	in	eax, dx
+	in	eax, dx
+	in	eax, dx
+	in	eax, dx
+	in	eax, dx
+	in	eax, dx
-; because KernelAlloc allocates contiguous physical pages only in 8-pages blocks,
+	in	eax, dx
-; align ALLOCATION_SIZE up to 8*(page size) = 8000h
+	in	eax, dx
-ALLOCATION_SIZE = (ALLOCATION_SIZE + 7FFFh) and not 7FFFh
+	in	eax, dx
-MAX_DEVICES = 16	; maximum number of devices which this driver can handle
+	pop	eax
+}
-	PCI_HEADER_TYPE 	      equ 0x0e	;8 bit
-	PCI_BASE_ADDRESS_0	      equ 0x10	;32 bit
-	PCI_BASE_ADDRESS_5	      equ 0x24	;32 bits
-	PCI_BASE_ADDRESS_SPACE_IO     equ 0x01
-	PCI_VENDOR_ID		      equ 0x00	;16 bit
 	PCI_BASE_ADDRESS_IO_MASK      equ 0xFFFFFFFC
 section '.flat' code readable align 16
 ; Driver entry point - register our service when the driver is loading.
 ; TODO: add needed operations when unloading
 START:
 	cmp	dword [esp+4], 1
 	jne	.exit
 	stdcall RegService, my_service, service_proc
 	ret	4
 .exit:
 	xor	eax, eax
 	ret	4
 ; Service procedure for the driver - handle all I/O requests for the driver.
 ; Currently handled requests are: SRV_GETVERSION = 0 and SRV_HOOK = 1.
 service_proc:
 ; 1. Get parameter from the stack: [esp+4] is the first parameter,
 ;       pointer to IOCTL structure.
 	mov	edx, [esp+4]	; edx -> IOCTL
 ; 2. Get request code and select a handler for the code.
-	mov	eax, [edx+IOCTL.io_code]
+	mov	eax, [IOCTL.io_code]
 	test	eax, eax	; check for SRV_GETVERSION
 	jnz	@f
 ; 3. This is SRV_GETVERSION request, no input, 4 bytes output, API_VERSION.
 ; 3a. Output size must be at least 4 bytes.
-	cmp	[edx+IOCTL.out_size], 4
+	cmp	[IOCTL.out_size], 4
 	jl	.fail
 ; 3b. Write result to the output buffer.
-	mov	eax, [edx+IOCTL.output]
+	mov	eax, [IOCTL.output]
 	mov	[eax], dword API_VERSION
 ; 3c. Return success.
 	xor	eax, eax
 	ret	4
 @@:
 	dec	eax	; check for SRV_HOOK
 	jnz	.fail
 ; 4. This is SRV_HOOK request, input defines the device to hook, no output.
 ; 4a. The driver works only with PCI devices,
 ;       so input must be at least 3 bytes long.
-	cmp	[edx + IOCTL.inp_size], 3
+	cmp	[IOCTL.inp_size], 3
 	jl	.fail
 ; 4b. First byte of input is bus type, 1 stands for PCI.
-	mov	eax, [edx + IOCTL.input]
+	mov	eax, [IOCTL.input]
 	cmp	byte [eax], 1
 	jne	.fail
 ; 4c. Second and third bytes of the input define the device: bus and dev.
 ;       Word in bx holds both bytes.
 	mov	bx, [eax+1]
 ; 4d. Check if the device was already hooked,
 ;       scan through the list of known devices.
+; check if the device is already listed
-	mov	esi, DEV_LIST
+	mov	esi, device_list
-	mov	ecx, [NUM_DEV]
+	mov	ecx, [devices]
 	test	ecx, ecx
 	jz	.firstdevice
+;        mov     eax, [IOCTL.input]                      ; get the pci bus and device numbers
+	mov	ax , [eax+1]				;
   .nextdevice:
-	lodsd
+	mov	ebx, [esi]
+	cmp	ax , word [device.pci_bus]		; compare with pci and device num in device list (notice the usage of word instead of byte)
-	cmp	bx, word [eax + device.pci_bus]
+	je	.find_devicenum 			; Device is already loaded, let's find it's device number
-	je	.find_devicenum
+	add	esi, 4
 	loop	.nextdevice
 ; 4e. This device doesn't have its own eth_device structure yet, let's create one
   .firstdevice:
 ; 4f. Check that we have place for new device.
-	cmp	[NUM_DEV], MAX_DEVICES
+	cmp	[devices], MAX_DEVICES
 	jge	.fail
 ; 4g. Allocate memory for device descriptor and receive+transmit buffers.
-	stdcall KernelAlloc, ALLOCATION_SIZE
+	stdcall KernelAlloc, device.size
 	test	eax, eax
 	jz	.fail
 ; 4h. Zero the structure.
-	push	eax
 	mov	edi, eax
 	mov	ecx, (device.size + 3) shr 2
 	xor	eax, eax
 	rep	stosd
-	pop	eax
-; 4i. Save PCI coordinates, loaded to bx at 4c.
+; 4i. Save PCI coordinates
+	mov	eax, [IOCTL.input]
+	mov	cl , [eax+1]
-	mov	word [eax+device.pci_bus], bx
+	mov	[device.pci_bus], cl
+	mov	cl , [eax+2]
-	mov	ebx, eax				; ebx is always used as a pointer to the structure (in driver, but also in kernel code)
+	mov	[device.pci_dev], cl
 ; 4j. Fill in the direct call addresses into the struct.
-; Note that get_MAC pointer is filled in initialization by SIS900_probe.
+; Note that get_MAC pointer is filled in initialization by probe.
-	mov	dword [ebx+device.reset], sis900_init
+	mov	[device.reset], init
-	mov	dword [ebx+device.transmit], transmit
+	mov	[device.transmit], transmit
-;       mov     dword [ebx+device.get_MAC], read_mac
+;       mov     [device.get_MAC], read_mac
-	mov	dword [ebx+device.set_MAC], write_mac
+	mov	[device.set_MAC], write_mac
-	mov	dword [ebx+device.unload], unload
+	mov	[device.unload], unload
-	mov	dword [ebx+device.name], my_service
+	mov	[device.name], my_service
 ; 4k. Now, it's time to find the base io addres of the PCI device
 ; TODO: implement check if bus and dev exist on this machine
-	mov	edx, PCI_BASE_ADDRESS_0
-.reg_check:
-	push	edx
-	stdcall PciRead16, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], edx
-	pop	edx
-	test	al, PCI_BASE_ADDRESS_SPACE_IO
-	jz	.inc_reg
-	and	eax, PCI_BASE_ADDRESS_IO_MASK
-	jnz	.got_io
-  .inc_reg:
-	add	edx, 4
-	cmp	edx, PCI_BASE_ADDRESS_5
-	jbe	.reg_check
-	jmp	.fail
-  .got_io:
+; Now, it's time to find the base io addres of the PCI device
-	mov	[ebx+device.io_addr], eax
+	find_io [device.pci_bus], [device.pci_dev], [device.io_addr]
-; 4l. We've found the io address, find IRQ now
+; We've found the io address, find IRQ now
-	stdcall PciRead8, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x3c
-	mov	byte [ebx+device.irq_line], al
+	find_irq [device.pci_bus], [device.pci_dev], [device.irq_line]
 ; 4m. Add new device to the list (required for int_handler).
-	mov	eax, [NUM_DEV]
+	mov	eax, [devices]
-	mov	[DEV_LIST+4*eax], ebx
+	mov	[device_list+4*eax], ebx
-	inc	[NUM_DEV]
+	inc	[devices]
 ; 4m. Ok, the eth_device structure is ready, let's probe the device
 ; 4m. Ok, the eth_device structure is ready, let's probe the device
-	call	SIS900_probe
+	call	probe
 	test	eax, eax
 	jnz	.destroy
 ; 4n. If device was successfully initialized, register it for the kernel.
 	mov	[device.type], NET_TYPE_ETH
 	call	NetRegDev
 	cmp	eax, -1
 	je	.destroy
 	ret	4
 ; 5. If the device was already loaded, find the device number and return it in eax
   .find_devicenum:
 	mov	ebx, eax
 	call	NetPtrToNum						; This kernel procedure converts a pointer to device struct in ebx
 									; into a device number in edi
 	mov	eax, edi						; Application wants it in eax instead
 	ret	4
 ; If an error occured, remove all allocated data and exit (returning -1 in eax)
   .destroy:
-	dec	[NUM_DEV]
+	dec	[devices]
 	; todo: reset device into virgin state
   .err:
 	stdcall KernelFree, ebx
   .fail:
 	xor	eax, eax
 	ret	4
 ;;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\;;
 ;;                                                                        ;;
 ;;        Actual Hardware dependent code starts here                      ;;
 ;;                                                                        ;;
 ;;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\;;
 unload:
 	; TODO: (in this particular order)
+	;
 	; - Stop the device
 	; - Detach int handler
 	; - Remove device from local list
 	; - call unregister function in kernel
 	; - Remove all allocated structures and buffers the card used
 	or	eax,-1
 ret
 ;********************************************************************
-;   Interface
-;      SIS900_reset
-;      SIS900_probe
-;      SIS900_poll
-;      SIS900_transmit
-;
-;********************************************************************
-;********************************************************************
 ;  Comments:
 ;    Known to work with the following SIS900 ethernet cards:
 ;      -  Device ID: 0x0900   Vendor ID: 0x1039   Revision: 0x91
 ;      -  Device ID: 0x0900   Vendor ID: 0x1039   Revision: 0x90
+;
 ;    If your card is not listed, try it and let me know if it
 ;    functions properly and it will be aded to the list.  If not
 ;    we may be able to add support for it.
+;
 ;  ToDo:
 ;     -  Enable MII interface for reading speed
 ;        and duplex settings.
-;
-;     -  Update Poll routine to support packet fragmentation.
+;     -  Update receive routine to support packet fragmentation.
-;
 ;     -  Add additional support for other sis900 based cards
+;
 ;********************************************************************
-;SIS900 Revision ID
+; Revision ID
-	SIS900B_900_REV       equ      0x03
+	SIS900B_900_REV 	equ 0x03
-	SIS630A_900_REV       equ      0x80
+	SIS630A_900_REV 	equ 0x80
-	SIS630E_900_REV       equ      0x81
+	SIS630E_900_REV 	equ 0x81
-	SIS630S_900_REV       equ      0x82
+	SIS630S_900_REV 	equ 0x82
-	SIS630EA1_900_REV     equ      0x83
+	SIS630EA1_900_REV	equ 0x83
-	SIS630ET_900_REV      equ      0x84
+	SIS630ET_900_REV	equ 0x84
-	SIS635A_900_REV       equ      0x90
+	SIS635A_900_REV 	equ 0x90
-	SIS900_960_REV	      equ      0x91
+	SIS900_960_REV		equ 0x91
-;SIS900 Receive Filter Control Register Bits
+; Receive Filter Control Register Bits
-    SIS900_RFEN 	 equ 0x80000000
+	RFEN		equ 0x80000000
-    SIS900_RFAAB	 equ 0x40000000
+	RFAAB		equ 0x40000000
-    SIS900_RFAAM	 equ 0x20000000
+	RFAAM		equ 0x20000000
-    SIS900_RFAAP	 equ 0x10000000
+	RFAAP		equ 0x10000000
-    SIS900_RFPromiscuous equ 0x70000000
+	RFPromiscuous	equ 0x70000000
-;SIS900 Reveive Filter Data Mask
+; Reveive Filter Data Mask
-    SIS900_RFDAT equ  0x0000FFFF
+	RFDAT		equ 0x0000FFFF
-;SIS900 Eeprom Address
+; Eeprom Address
-    SIS900_EEPROMSignature equ 0x00
+	EEPROMSignature equ 0x00
-    SIS900_EEPROMVendorID  equ 0x02
+	EEPROMVendorID	equ 0x02
-    SIS900_EEPROMDeviceID  equ 0x03
+	EEPROMDeviceID	equ 0x03
-    SIS900_EEPROMMACAddr   equ 0x08
+	EEPROMMACAddr	equ 0x08
-    SIS900_EEPROMChecksum  equ 0x0b
+	EEPROMChecksum	equ 0x0b
 ;The EEPROM commands include the alway-set leading bit.
-;SIS900 Eeprom Command
-    SIS900_EEread	   equ 0x0180
+	EEread		equ 0x0180
-    SIS900_EEwrite	   equ 0x0140
+	EEwrite 	equ 0x0140
-    SIS900_EEerase	   equ 0x01C0
+	EEerase 	equ 0x01C0
-    SIS900_EEwriteEnable   equ 0x0130
+	EEwriteEnable	equ 0x0130
-    SIS900_EEwriteDisable  equ 0x0100
+	EEwriteDisable	equ 0x0100
-    SIS900_EEeraseAll	   equ 0x0120
+	EEeraseAll	equ 0x0120
-    SIS900_EEwriteAll	   equ 0x0110
+	EEwriteAll	equ 0x0110
-    SIS900_EEaddrMask	   equ 0x013F
+	EEaddrMask	equ 0x013F
-    SIS900_EEcmdShift	   equ 16
+	EEcmdShift	equ 16
 ;For SiS962 or SiS963, request the eeprom software access
-	SIS900_EEREQ	equ 0x00000400
+	EEREQ		equ 0x00000400
-	SIS900_EEDONE	equ 0x00000200
+	EEDONE		equ 0x00000200
-	SIS900_EEGNT	equ 0x00000100
+	EEGNT		equ 0x00000100
-SIS900_pci_revision equ ebx+device.pci_revision
-sis900_get_mac_func equ ebx+device.get_MAC
-sis900_special_func equ ebx+device.special_func
-sis900_table_entries equ ebx+device.table_entries
-cur_rx equ ebx+device.cur_rx
-sys_msg_board_str equ SysMsgBoardStr
 ;***************************************************************************
-;   Function
+;
-;      SIS900_probe
+; probe
-;   Description
+;
-;      Searches for an ethernet card, enables it and clears the rx buffer
+; Searches for an ethernet card, enables it and clears the rx buffer
-;      If a card was found, it enables the ethernet -> TCPIP link
+;
-;not done  - still need to probe mii transcievers
+; TODO: probe mii transceivers
+;
 ;***************************************************************************
-if defined SIS900_DEBUG
-SIS900_Debug_Str_Unsupported db 'Sorry your card is unsupported ',13,10,0
-end if
+align 4
-SIS900_probe:
+probe:
-;******Wake Up Chip*******
-   stdcall PciWrite8, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x40, 0
+	stdcall PciWrite8, dword [device.pci_bus], dword [device.pci_dev], 0x40, 0	; Wake Up Chip
-;*******Set some PCI Settings*********
-   call    SIS900_adjust_pci_device
+	make_bus_master [device.pci_bus], [device.pci_dev]
-;*****Get Card Revision******
+; Get Card Revision
-   stdcall PciRead8, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x08
+	stdcall PciRead8, dword [device.pci_bus], dword [device.pci_dev], 0x08
-   mov [SIS900_pci_revision], al	;save the revision for later use
+	mov	[pci_revision], al							; save the revision for later use
-;****** Look up through the sis900_specific_table
+; Look up through the specific_table
-   mov	   esi,sis900_specific_table
+	mov	esi, specific_table
-.probe_loop:
+  .loop:
-   cmp	   dword [esi],0		; Check if we reached end of the list
+	cmp	dword [esi], 0		     ; Check if we reached end of the list
-   je	   .probe_loop_failed
+	je	.error
-   cmp	   al,[esi]			; Check if revision is OK
+	cmp	al, [esi]		     ; Check if revision is OK
-   je	   .probe_loop_ok
+	je	.ok
-   add	   esi,12			; Advance to next entry
+	add	esi, 12 		     ; Advance to next entry
-   jmp	   .probe_loop
+	jmp	.loop
-.probe_loop_failed:
-   jmp	   SIS900_Probe_Unsupported
-;*********Find Get Mac Function*********
-.probe_loop_ok:
-   mov	    eax,[esi+4] 	; Get pointer to "get MAC" function
-   mov	    [sis900_get_mac_func],eax
-   mov	    eax,[esi+8] 	; Get pointer to special initialization fn
-   mov	    [sis900_special_func],eax
-;******** Get MAC ********
-   call     dword [sis900_get_mac_func]
-;******** Call special initialization fn if requested ********
-   cmp	    dword [sis900_special_func],0
-   je	    .no_special_init
-   call     dword [sis900_special_func]
-.no_special_init:
-;******** Set table entries ********
-   mov	    al,[SIS900_pci_revision]
-   cmp	    al,SIS635A_900_REV
-   jae	    .ent16
-   cmp	    al,SIS900B_900_REV
-   je	    .ent16
-   mov	    byte [sis900_table_entries],8
-   jmp	    .ent8
-.ent16:
-   mov	    byte [sis900_table_entries],16
-.ent8:
-;*******Probe for mii transceiver*******
-;TODO!!*********************
-;*******Initialize Device*******
-   call sis900_init
-   ret
-SIS900_Probe_Unsupported:
+  .error:
-if defined SIS900_DEBUG
-   mov	   esi, SIS900_Debug_Str_Unsupported
+	DEBUGF	1, "Device not supported!\n"
-   call    sys_msg_board_str
-end if
-   or	   eax, -1
+	or	eax, -1
-   ret
+	ret
+; Find Get Mac Function
+  .ok:
+	mov	eax, [esi+4]		; Get pointer to "get MAC" function
+	mov	[get_mac_func], eax
+	mov	eax, [esi+8]		; Get pointer to special initialization fn
+	mov	[special_func], eax
+; Get MAC
+	call	[get_mac_func]
+; Call special initialization fn if requested
+	cmp	[special_func],0
+	je	@f
+	call	[special_func]
+       @@:
+; Set table entries
+	mov	 byte [table_entries], 16
+	cmp	 [pci_revision], SIS635A_900_REV
+	jae	 @f
+	cmp	 [pci_revision], SIS900B_900_REV
+	je	 @f
+	mov	 byte [table_entries], 8
+       @@:
+; TODO: Probe for mii transceiver
 ;***************************************************************************
-; Function: sis900_init
+;
-; Description: resets the ethernet controller chip and various
-;    data structures required for sending and receiving packets.
+; init
+;
-; Arguments:
+; resets the ethernet controller chip and various
+;    data structures required for sending and receiving packets.
+;
-; returns:   none
-;not done
 ;***************************************************************************
+align 4
-sis900_init:
+init:
-   call SIS900_reset		   ;Done
+	call reset
-   call SIS900_init_rxfilter   ;Done
+	call init_rxfilter
-   call SIS900_init_txd        ;Done
+	call init_txd
-   call SIS900_init_rxd 	   ;Done
+	call init_rxd
-   call SIS900_set_rx_mode     ;done
+	call set_rx_mode
-   call SIS900_set_tx_mode
+	call set_tx_mode
-   ;call SIS900_check_mode
+	;call check_mode
 ; enable interrupts on packet receive
 	xor	eax, eax
-	inc	eax	; eax = 1 = SIS900_RxOK
+	inc	eax	; eax = 1 = RxOK
-	mov	edx, [ebx+device.io_addr]
+	set_io	0
-	add	edx, SIS900_imr
+	set_io	imr
 	out	dx, eax
 ; globally enable interrupts
-	add	edx, SIS900_ier-SIS900_imr
+	set_io	ier
 	out	dx, eax ; eax is still 1
 	xor	eax, eax
+	mov	[device.mtu], 1514
-   ret
+	ret
 ;***************************************************************************
-;   Function
+;
-;      SIS900_reset
+; reset
-;   Description
+;
-;      disables interrupts and soft resets the controller chip
+; disables interrupts and soft resets the controller chip
+;
-;done+
 ;***************************************************************************
-if defined SIS900_DEBUG
-   SIS900_Debug_Reset_Failed db 'Reset Failed ',0
-end if
+align 4
-SIS900_reset:
+reset:
-	movzx	eax, [ebx+device.irq_line]
+	movzx	eax, [device.irq_line]
 	stdcall AttachIntHandler, eax, int_handler, 0
-   push     ebp
-   mov	    ebp, [ebx+device.io_addr] ; base address
+;--------------------------------------------
-   ;******Disable Interrupts and reset Receive Filter*******
+; Disable Interrupts and reset Receive Filter
+	set_io	0
-   xor	    eax, eax		; 0 to initialize
+	set_io	ier
-   lea	    edx,[ebp+SIS900_ier]
+	xor	eax, eax
-   out	    dx, eax			; Write 0 to location
+	out	dx, eax
-   lea	    edx,[ebp+SIS900_imr]
+	set_io	imr
-   out	    dx, eax			; Write 0 to location
+	out	dx, eax
-   lea	    edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-   out	    dx, eax			; Write 0 to location
+	out	dx, eax
+;-----------
-   ;*******Reset Card***********************************************
+; Reset Card
-   lea	    edx,[ebp+SIS900_cr]
+	set_io	cr
-   in	    eax, dx				; Get current Command Register
+	in	eax, dx 			; Get current Command Register
-   or	    eax, SIS900_RESET		; set flags
+	or	eax, RESET + RxRESET + TxRESET	; set flags
-   or	    eax, SIS900_RxRESET     ;
-   or		eax, SIS900_TxRESET	    ;
-   out	    dx, eax				; Write new Command Register
+	out	dx, eax 			; Write new Command Register
-   ;*******Wait Loop************************************************
+;----------
-   push     ebx
+; Wait loop
-   lea	    edx,[ebp+SIS900_isr]
+	set_io	isr
-   mov	    ecx, 0x03000000	    ; Status we would like to see from card
-   mov	    ebx, 2001		    ; only loop 1000 times
+	mov	ecx, 1000
-SIS900_Wait:
+  .loop:
-   dec	    ebx 				    ; 1 less loop
+	dec	ecx
-   jz	    SIS900_DoneWait_e		; 1000 times yet?
+	jz	.error
-   in	    eax, dx				    ; move interrup status to eax
+	in	eax, dx 			; move interrup status to eax
-   and	    eax, ecx
-   xor	    ecx, eax
-   jz	    SIS900_DoneWait
-   jmp	    SIS900_Wait
+	cmp	eax, 0x03000000
-SIS900_DoneWait_e:
+	jne	.loop
-if defined SIS900_DEBUG
-   mov esi, SIS900_Debug_Reset_Failed
-   call sys_msg_board_str
-end if
-SIS900_DoneWait:
+;------------------------------------------------------
-   pop	    ebx
-   ;*******Set Configuration Register depending on Card Revision********
+; Set Configuration Register depending on Card Revision
-   lea	    edx,[ebp+SIS900_cfg]
+	set_io	cfg
-   mov	    eax, SIS900_PESEL		    ; Configuration Register Bit
+	mov	eax, PESEL			; Configuration Register Bit
-   mov	    cl, [SIS900_pci_revision]	; card revision
-   cmp	    cl, SIS635A_900_REV
+	cmp	[pci_revision], SIS635A_900_REV
-   je	    SIS900_RevMatch
+	je	.match
-   cmp	    cl, SIS900B_900_REV 	; Check card revision
+	cmp	[pci_revision], SIS900B_900_REV ; Check card revision
-   je	    SIS900_RevMatch
+	je	.match
-   out	    dx, eax				    ; no revision match
+	out	dx, eax 			; no revision match
-   jmp	    SIS900_Reset_Complete
+	jmp	.done
-SIS900_RevMatch:					; Revision match
+  .match:					; Revision match
-   or	    eax, SIS900_RND_CNT 	; Configuration Register Bit
+	or	eax, RND_CNT			; Configuration Register Bit
-   out	    dx, eax
+	out	dx, eax
-SIS900_Reset_Complete:
+  .done:
-   xor	    eax, eax
+	xor	eax, eax
-   pop	    ebp
-   ret
+	ret
+  .error:
+	DEBUGF	1, "Reset failed!\n"
+	or	eax, -1
+	ret
-;***************************************************************************
-; Function: sis_init_rxfilter
+;***************************************************************************
 ;
-; Description: sets receive filter address to our MAC address
+; sis_init_rxfilter
 ;
-; Arguments:
+; sets receive filter address to our MAC address
-;
-; returns:
 ;done+
+;***************************************************************************
-;***************************************************************************
+align 4
-SIS900_init_rxfilter:
+init_rxfilter:
-   push     ebp
-   mov	    ebp, [ebx+device.io_addr]	; base address
+;------------------------------------
+; Get Receive Filter Control Register
-   ;****Get Receive Filter Control Register ********
+	set_io	0
-   lea	    edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-   in	    eax, dx			    ; get register
+	in	eax, dx
+	push	eax
-   push     eax
+;-----------------------------------------------
-   ;****disable packet filtering before setting filter*******
+; disable packet filtering before setting filter
-   mov	    eax, SIS900_RFEN	;move receive filter enable flag
-   not	    eax 			;1s complement
+	and	eax, not RFEN
+	out	dx, eax
-   and	    eax, [esp]			;disable receiver
-   out	    dx, eax			;set receive disabled
+;--------------------------------------
+; load MAC addr to filter data register
    ;********load MAC addr to filter data register*********
-   xor	    ecx, ecx
-SIS900_RXINT_Mac_Write:
+	xor	ecx, ecx
-   ;high word of eax tells card which mac byte to write
+RXINT_Mac_Write:	; high word of eax tells card which mac byte to write
+	mov	eax, ecx
-   mov	    eax, ecx
+	set_io	0
-   lea	    edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-   shl	    eax, 16						;
+	shl	eax, 16 					    ;
-   out	    dx, eax						;
+	out	dx, eax 					    ;
-   lea	    edx,[ebp+SIS900_rfdr]
+	set_io	rfdr
-   mov	    ax,  word [ebx+device.mac+ecx*2] ; Get Mac ID word
+	mov	ax, word [device.mac+ecx*2]			    ; Get Mac ID word
-   out	    dx, ax						; Send Mac ID
+	out	dx, ax						    ; Send Mac ID
-   inc	    cl							; send next word
+	inc	cl						    ; send next word
-   cmp	    cl, 3						; more to send?
+	cmp	cl, 3						    ; more to send?
-   jne	    SIS900_RXINT_Mac_Write
+	jne	RXINT_Mac_Write
+;------------------------
-   ;********enable packet filitering *****
+; enable packet filtering
-   pop	    eax 			    ;old register value
+	pop	eax				;old register value
-   lea	    edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-   or	    eax, SIS900_RFEN	;enable filtering
+	or	eax, RFEN    ;enable filtering
-   out	    dx, eax		;set register
+	out	dx, eax 	    ;set register
-   pop	    ebp
-   ret
+	ret
 ;***************************************************************************
-;*
+;
-;* Function: sis_init_txd
+; init_txd
-;*
+;
-;* Description: initializes the Tx descriptor
+; initializes the Tx descriptor
-;*
-;* Arguments:
-;*
+;
-;* returns:
-;*done
 ;***************************************************************************
+align 4
-SIS900_init_txd:
+init_txd:
+;-------------------------
-   ;********** initialize TX descriptor **************
+; initialize TX descriptor
-   mov	   [ebx+device.txd], dword 0	   ;put link to next descriptor in link field
+	mov	dword [device.txd], 0		; put link to next descriptor in link field
-   mov	   [ebx+device.txd+4],dword 0	   ;clear status field
+	mov	dword [device.txd+4], 0 	; clear status field
-   lea	   eax, [ebx+0x1000]
-   call    GetPgAddr
-   mov	   [ebx+device.txd+8], eax   ;save address to buffer ptr field
+	mov	dword [device.txd+8], 0 	; ptr to buffer
+;----------------------------------
-   ;*************** load Transmit Descriptor Register ***************
+; load Transmit Descriptor Register
-   mov	   edx, [ebx+device.io_addr]	    ; base address
+	set_io	0
-   add	   edx, SIS900_txdp	 ; TX Descriptor Pointer
+	set_io	txdp			; TX Descriptor Pointer
-   add	   eax, device.txd - 0x1000	   ; First Descriptor
+	lea	eax, [device.txd]
+	GetRealAddr
-   out	   dx, eax			       ; move the pointer
+	out	dx, eax 			    ; move the pointer
-   ret
+	ret
 ;***************************************************************************
+;
-;* Function: sis_init_rxd
+; init_rxd
-;*
+;
-;* Description: initializes the Rx descriptor ring
+; initializes the Rx descriptor ring
-;*
-;* Arguments:
-;*
+;
-;* Returns:
-;*done
 ;***************************************************************************
+align 4
-SIS900_init_rxd:
+init_rxd:
-   xor	    ecx,ecx
+; init RX descriptors
-   mov	    [cur_rx], cl					;Set cuurent rx discriptor to 0
-   mov	    eax, ebx
+	mov	ecx, NUM_RX_DESC
-   call     GetPgAddr
+	lea	esi, [device.rxd]
-   mov	    esi, eax
+  .loop:
-   ;******** init RX descriptors ********
+	lea	eax, [esi + 16]
-SIS900_init_rxd_Loop:
+	GetRealAddr
-    mov     edx, ecx					    ;current descriptor
+	mov	dword [esi+0], eax
-    imul    edx, 12			    ;
+	mov	dword [esi+4], RX_BUFF_SZ
-    mov     eax, ecx					    ;determine next link descriptor
+	stdcall KernelAlloc, RX_BUFF_SZ
-    inc     eax 			    ;
+	test	eax, eax
+	jz	.fail
-    cmp     eax, NUM_RX_DESC		    ;
+	mov	dword [esi+12], eax
-    jne     SIS900_init_rxd_Loop_0	    ;
+	GetRealAddr
-    xor     eax, eax			    ;
+	mov	dword [esi+8], eax
-SIS900_init_rxd_Loop_0: 		   ;
+	add	esi, 16
-    imul    eax, 12			    ;
+	loop	.loop
-    lea     eax, [eax+esi+device.rxd]
+	lea	eax, [device.rxd]
-    mov     [ebx+device.rxd+edx], eax					   ;save link to next descriptor
-    mov     [ebx+device.rxd+edx+4],dword RX_BUFF_SZ	   ;status bits init to buf size
-    mov     eax, ecx						;find where the buf is located
-    imul    eax,RX_BUFF_SZ		    ;
+	GetRealAddr
-    lea     eax, [eax+esi+0x1000+NUM_TX_DESC*TX_BUFF_SZ]
-    mov     [ebx+device.rxd+edx+8], eax 			   ;save buffer pointer
+	mov	dword [esi - 16], eax	; correct last descriptor link ptr
-    inc     ecx 						    ;next descriptor
+; And output ptr to first desc, to device
-    cmp     ecx, NUM_RX_DESC		    ;
-    jne     SIS900_init_rxd_Loop	    ;
-    ;********* load Receive Descriptor Register with address of first
-    ; descriptor*********
+	set_io	0
-    mov     edx, [ebx+device.io_addr]
-    add     edx, SIS900_rxdp
+	set_io	rxdp
-    lea     eax, [esi+device.rxd]
-    out     dx, eax
+	out	dx, eax
+	mov	[device.cur_rx], 0	; Set curent rx discriptor to 0
+  .fail:	;;; TODO: abort instead!
-    ret
+	ret
+;***************************************************************************
+;
+; set_tx_mode
+;
+; sets the transmit mode to allow for full duplex
+;
+; If you are having problems transmitting packet try changing the
+; Max DMA Burst, Possible settings are as follows:
+;
+; 0x00000000 = 512 bytes
+; 0x00100000 = 4 bytes
+; 0x00200000 = 8 bytes
+; 0x00300000 = 16 bytes
+; 0x00400000 = 32 bytes
+; 0x00500000 = 64 bytes
+; 0x00600000 = 128 bytes
+; 0x00700000 = 256 bytes
+;
-;***************************************************************************
-;* Function: sis900_set_tx_mode
-;*
-;* Description:
-;*    sets the transmit mode to allow for full duplex
-;*
+;***************************************************************************
-;*
+align 4
-;* Arguments:
+set_tx_mode:
-;*
-;* Returns:
-;*
-;* Comments:
-;*     If you are having problems transmitting packet try changing the
-;*     Max DMA Burst, Possible settings are as follows:
-;*         0x00000000 = 512 bytes
-;*         0x00100000 = 4 bytes
-;*         0x00200000 = 8 bytes
-;*         0x00300000 = 16 bytes
-;*         0x00400000 = 32 bytes
-;*         0x00500000 = 64 bytes
-;*         0x00600000 = 128 bytes
-;*         0x00700000 = 256 bytes
-;***************************************************************************
+	set_io	0
-SIS900_set_tx_mode:
-   push     ebp
-   mov	    ebp,[ebx+device.io_addr]
-   lea	    edx,[ebp+SIS900_cr]
+	set_io	cr
-   in	    eax, dx			    ; Get current Command Register
+	in	eax, dx 			; Get current Command Register
+	or	eax, TxENA			; Enable Receive
+	out	dx, eax
+	set_io	txcfg					; Transmit config Register offset
+	mov	eax, ATP + HBI + CSI +0x00600120
+	; allow automatic padding
+	; allow heartbeat ignore
+	; allow carrier sense ignore
+	; Max DMA Burst (128 bytes)
+	; TX Fill Threshold
-   or	    eax, SIS900_TxENA	;Enable Receive
+	; TX Drain Threshold
-   out	    dx, eax
-   lea	    edx,[ebp+SIS900_txcfg]; Transmit config Register offset
-   mov	    eax, SIS900_ATP		;allow automatic padding
-   or	    eax, SIS900_HBI		;allow heartbeat ignore
-   or	    eax, SIS900_CSI		;allow carrier sense ignore
-   or	    eax, 0x00600000	;Max DMA Burst
-   or	    eax, 0x00000100	;TX Fill Threshold
-   or	    eax, 0x00000020	;TX Drain Threshold
-   out	    dx, eax
+	out	 dx, eax
    pop	    ebp
-   ret
+	ret
 ;***************************************************************************
-;* Function: sis900_set_rx_mode
-;*
+;
-;* Description:
+; set_rx_mode
+;
-;*    sets the receive mode to accept all broadcast packets and packets
+; sets the receive mode to accept all broadcast packets and packets
-;*    with our MAC address, and reject all multicast packets.  Also allows
+; with our MAC address, and reject all multicast packets.  Also allows
-;*    full-duplex
+; full-duplex
-;*
-;* Arguments:
-;*
-;* Returns:
-;*
+;
-;* Comments:
-;*     If you are having problems receiving packet try changing the
+; If you are having problems receiving packet try changing the
-;*     Max DMA Burst, Possible settings are as follows:
+; Max DMA Burst, Possible settings are as follows:
+;
-;*         0x00000000 = 512 bytes
+; 0x00000000 = 512 bytes
-;*         0x00100000 = 4 bytes
+; 0x00100000 = 4 bytes
-;*         0x00200000 = 8 bytes
+; 0x00200000 = 8 bytes
-;*         0x00300000 = 16 bytes
+; 0x00300000 = 16 bytes
-;*         0x00400000 = 32 bytes
+; 0x00400000 = 32 bytes
-;*         0x00500000 = 64 bytes
+; 0x00500000 = 64 bytes
-;*         0x00600000 = 128 bytes
+; 0x00600000 = 128 bytes
-;*         0x00700000 = 256 bytes
+; 0x00700000 = 256 bytes
+;
 ;***************************************************************************
+align 4
-SIS900_set_rx_mode:
+set_rx_mode:
-   push     ebp
-   mov	    ebp,[ebx+device.io_addr]
+;----------------------------------------------
-    ;**************update Multicast Hash Table in Receive Filter
+; update Multicast Hash Table in Receive Filter
-   xor	    cl, cl
+	xor	 cl, cl
-SIS900_set_rx_mode_Loop:
-   mov	    eax, ecx
+  .loop:
-   shl	    eax, 1
+	set_io	 0
-   lea	    edx,[ebp+SIS900_rfcr]	    ; Receive Filter Control Reg offset
+	set_io	 rfcr			; Receive Filter Control Reg offset
-   mov	    eax, 4					    ;determine table entry
+	mov	 eax, 4 		; determine table entry
-   add	    al, cl
+	add	 al, cl
-   shl	    eax, 16
+	shl	 eax, 16
-   out	    dx, eax					    ;tell card which entry to modify
+	out	 dx, eax		; tell card which entry to modify
-   lea	    edx,[ebp+SIS900_rfdr]	    ; Receive Filter Control Reg offset
+	set_io	 rfdr			; Receive Filter Control Reg offset
-   mov	    eax, 0xffff 			    ;entry value
+	mov	 eax, 0xffff		; entry value
-   out	    dx, ax					    ;write value to table in card
+	out	 dx, ax 		; write value to table in card
-   inc	    cl						    ;next entry
+	inc	 cl			; next entry
-   cmp	    cl,[sis900_table_entries]	;
+	cmp	 cl, [table_entries]
+	jl	 .loop
-   jl	    SIS900_set_rx_mode_Loop
+;------------------------------------
-   ;*******Set Receive Filter Control Register*************
+; Set Receive Filter Control Register
-   lea	    edx,[ebp+SIS900_rfcr]	; Receive Filter Control Register offset
+	set_io	rfcr			; Receive Filter Control Register offset
+	mov	eax, RFAAB + RFAAM + RFAAP + RFEN
-   mov	    eax, SIS900_RFAAB		;accecpt all broadcast packets
+	; accecpt all broadcast packets
-   or	    eax, SIS900_RFAAM		;accept all multicast packets
+	; accept all multicast packets
-   or	    eax, SIS900_RFAAP		;Accept all packets
+	; Accept all packets
-   or	    eax, SIS900_RFEN		;enable receiver filter
+	; enable receiver filter
-   out	    dx, eax
+	out	dx, eax
+;----------------
-   ;******Enable Receiver************
+; Enable Receiver
-   lea	    edx,[ebp+SIS900_cr] ; Command Register offset
+	set_io	cr
-   in	    eax, dx			    ; Get current Command Register
+	in	eax, dx 		; Get current Command Register
-   or	    eax, SIS900_RxENA	;Enable Receive
+	or	eax, RxENA		; Enable Receive
-   out	    dx, eax
+	out	dx, eax
+;-------------------
-   ;*********Set
+; Configure Receiver
-   lea	    edx,[ebp+SIS900_rxcfg]	; Receive Config Register offset
+	set_io	rxcfg			; Receive Config Register offset
+	mov	eax, ATX + 0x00600002
-   mov	    eax, SIS900_ATX			;Accept Transmit Packets
+	; Accept Transmit Packets
-				    ; (Req for full-duplex and PMD Loopback)
+	; (Req for full-duplex and PMD Loopback)
-   or	    eax, 0x00600000			;Max DMA Burst
+	; Max DMA Burst
-   or	    eax, 0x00000002			;RX Drain Threshold, 8X8 bytes or 64bytes
+	; RX Drain Threshold, 8X8 bytes or 64bytes
-   out	    dx, eax					;
+	out	 dx, eax
-   pop	    ebp
-   ret
+	ret
 ;***************************************************************************
+;
-; *     SIS960_get_mac_addr: - Get MAC address for SiS962 or SiS963 model
+; SIS960_get_mac_addr: - Get MAC address for SiS962 or SiS963 model
-; *     @pci_dev: the sis900 pci device
-; *     @net_dev: the net device to get address for
-; *
+;
-; *     SiS962 or SiS963 model, use EEPROM to store MAC address. And EEPROM
+; SiS962 or SiS963 model, use EEPROM to store MAC address.
-; *     is shared by
+; EEPROM is shared by LAN and 1394.
-; *     LAN and 1394. When access EEPROM, send EEREQ signal to hardware first
+; When access EEPROM, send EEREQ signal to hardware first, and wait for EEGNT.
-; *     and wait for EEGNT. If EEGNT is ON, EEPROM is permitted to be access
+; If EEGNT is ON, EEPROM is permitted to be accessed by LAN, otherwise is not.
-; *     by LAN, otherwise is not. After MAC address is read from EEPROM, send
+; After MAC address is read from EEPROM, send
-; *     EEDONE signal to refuse EEPROM access by LAN.
+; EEDONE signal to refuse EEPROM access by LAN.
-; *     The EEPROM map of SiS962 or SiS963 is different to SiS900.
+; The EEPROM map of SiS962 or SiS963 is different to SiS900.
-; *     The signature field in SiS962 or SiS963 spec is meaningless.
+; The signature field in SiS962 or SiS963 spec is meaningless.
-; *     MAC address is read into @net_dev->dev_addr.
-; *done
-;*
+;
-;* Return 0 is EAX = failure
+; Return 0 is EAX = failure
-;*Done+
+;
 ;***************************************************************************
-if defined SIS900_DEBUG
-SIS900_Debug_Str_GetMac_Start db 'Attempting to get SIS900 Mac ID: ',13,10,0
-SIS900_Debug_Str_GetMac_Failed db 'Access to EEprom Failed',13,10,0
-SIS900_Debug_Str_GetMac_Address db 'Your Mac ID is: ',0
-SIS900_Debug_Str_GetMac_Address2 db 'Your SIS96x Mac ID is: ',0
-end if
+align 4
 SIS960_get_mac_addr:
-   push     ebp
-   mov	    ebp,[ebx+device.io_addr]
+;-------------------------------
-   ;**********Send Request for eeprom access*********************
+; Send Request for eeprom access
+	set_io	0
-   lea	    edx,[ebp+SIS900_mear]		; Eeprom access register
+	set_io	mear		; Eeprom access register
-   mov	    eax, SIS900_EEREQ			; Request access to eeprom
+	mov	eax, EEREQ	; Request access to eeprom
-   out	    dx, eax						; Send request
+	out	dx, eax 	; Send request
-   xor	    ecx,ecx						;
+;-----------------------------------------------------
-   ;******Loop 4000 times and if access not granted error out*****
+; Loop 4000 times and if access not granted, error out
-SIS96X_Get_Mac_Wait:
+	mov	ecx, 4000
+  .loop:
-   in	    eax, dx					;get eeprom status
+	in	eax, dx 	; get eeprom status
-   and	    eax, SIS900_EEGNT	    ;see if eeprom access granted flag is set
+	test	eax, EEGNT	; see if eeprom access granted flag is set
-   jnz	    SIS900_Got_EEP_Access	;if it is, go access the eeprom
+	jnz	.got_access	; if it is, go access the eeprom
-   inc	    ecx 					;else keep waiting
+	loop	.loop		; else keep waiting
-   cmp	    ecx, 4000				;have we tried 4000 times yet?
+	DEBUGF	1, "Access to EEprom failed!\n", 0
-   jl	    SIS96X_Get_Mac_Wait     ;if not ask again
+	set_io	mear		; Eeprom access register
-   xor	    eax, eax		    ;return zero in eax indicating failure
+	mov	eax, EEDONE	; tell eeprom we are done
-   ;*******Debug **********************
+	out	dx, eax
-if defined SIS900_DEBUG
+	or	eax, -1 	; error
-   mov esi,SIS900_Debug_Str_GetMac_Failed
+	ret
-   call sys_msg_board_str
+  .got_access:
-end if
-   jmp SIS960_get_mac_addr_done
+;------------------------------------------
-   ;**********EEprom access granted, read MAC from card*************
+; EEprom access granted, read MAC from card
-SIS900_Got_EEP_Access:
     ; zero based so 3-16 bit reads will take place
-   mov	    ecx, 2
+	mov	ecx, 2
-SIS96x_mac_read_loop:
+  .read_loop:
-   mov	    eax, SIS900_EEPROMMACAddr	 ;Base Mac Address
+	mov	eax, EEPROMMACAddr	; Base Mac Address
-   add	    eax, ecx				     ;Current Mac Byte Offset
+	add	eax, ecx		; Current Mac Byte Offset
-   push     ecx
+	push	ecx
-   call     sis900_read_eeprom		 ;try to read 16 bits
+	call	read_eeprom		; try to read 16 bits
-   pop	    ecx
+	pop	ecx
-   mov	    word [ebx+device.mac+ecx*2], ax	   ;save 16 bits to the MAC ID varible
+	mov	word [device.mac+ecx*2], ax	; save 16 bits to the MAC ID varible
-   dec	    ecx 			 ;one less word to read
+	dec	ecx			; one less word to read
-   jns	    SIS96x_mac_read_loop	 ;if more read more
+	jns	.read_loop		; if more read more
-   mov	    eax, 1			 ;return non-zero indicating success
+	mov	eax, 1			; return non-zero indicating success
-   ;*******Debug Print MAC ID to debug window**********************
+	DEBUGF	2,"%x-%x-%x-%x-%x-%x\n",[device.mac]:2,[device.mac+1]:2,[device.mac+2]:2,[device.mac+3]:2,[device.mac+4]:2,[device.mac+5]:2
-if defined SIS900_DEBUG
-   mov esi,SIS900_Debug_Str_GetMac_Address2
+;-------------------------------------
-   call sys_msg_board_str
-   lea edx, [ebx+device.mac]
-   call Create_Mac_String
+; Tell EEPROM We are Done Accessing It
-end if
+  .done:
-   ;**********Tell EEPROM We are Done Accessing It*********************
-SIS960_get_mac_addr_done:
+	set_io	0
-   lea	    edx,[ebp+SIS900_mear]		; Eeprom access register
+	set_io	mear		; Eeprom access register
-   mov	    eax, SIS900_EEDONE		 ;tell eeprom we are done
+	mov	eax, EEDONE	; tell eeprom we are done
-   out	    dx,eax
+	out	dx, eax
-   pop	    ebp
+	xor	eax, eax	; ok
-   ret
+	ret
 ;***************************************************************************
+;
-;*      sis900_get_mac_addr: - Get MAC address for stand alone SiS900 model
+; get_mac_addr: - Get MAC address for stand alone SiS900 model
-;*      @pci_dev: the sis900 pci device
-;*      @net_dev: the net device to get address for
-;*
+;
-;*      Older SiS900 and friends, use EEPROM to store MAC address.
+; Older SiS900 and friends, use EEPROM to store MAC address.
-;*      MAC address is read from read_eeprom() into @net_dev->dev_addr.
-;* done/untested
+;
 ;***************************************************************************
+align 4
-SIS900_get_mac_addr:
+get_mac_addr:
-   ;*******Debug **********************
+;------------------------------------
-if defined SIS900_DEBUG
-   mov esi,SIS900_Debug_Str_GetMac_Start
-   call sys_msg_board_str
-end if
-   ;******** check to see if we have sane EEPROM *******
+; check to see if we have sane EEPROM
-   mov	    eax, SIS900_EEPROMSignature  ;Base Eeprom Signature
+	mov	eax, EEPROMSignature  ; Base Eeprom Signature
-   call     sis900_read_eeprom		 ;try to read 16 bits
+	call	read_eeprom	      ; try to read 16 bits
-   cmp ax, 0xffff
+	cmp	ax, 0xffff
-   je SIS900_Bad_Eeprom
+	je	.err
-   cmp ax, 0
+	test	ax, ax
-   je SIS900_Bad_Eeprom
+	je	.err
+;-----------
-   ;**************Read MacID**************
+; Read MacID
-   ; zero based so 3-16 bit reads will take place
+; zero based so 3-16 bit reads will take place
-   mov	    ecx, 2
+	mov	ecx, 2
-SIS900_mac_read_loop:
+  .loop:
-   mov	    eax, SIS900_EEPROMMACAddr	 ;Base Mac Address
+	mov	eax, EEPROMMACAddr    ;Base Mac Address
-   add	    eax, ecx				     ;Current Mac Byte Offset
+	add	eax, ecx				 ;Current Mac Byte Offset
-   push     ecx
+	push	ecx
-   call     sis900_read_eeprom		 ;try to read 16 bits
+	call	read_eeprom	      ;try to read 16 bits
-   pop	    ecx
+	pop	ecx
-   mov	    word [ebx+device.mac+ecx*2], ax	   ;save 16 bits to the MAC ID storage
+	mov	word [device.mac+ecx*2], ax	   ;save 16 bits to the MAC ID storage
-   dec	    ecx 			 ;one less word to read
+	dec	ecx			     ;one less word to read
-   jns	    SIS900_mac_read_loop	 ;if more read more
+	jns	mac_read_loop	      ;if more read more
-   mov	    eax, 1			 ;return non-zero indicating success
-   ;*******Debug Print MAC ID to debug window**********************
-if defined SIS900_DEBUG
-   mov esi,SIS900_Debug_Str_GetMac_Address
-   call sys_msg_board_str
-   lea edx, [ebx+device.mac]
-   call Create_Mac_String
-end if
-   ret
+	DEBUGF	2,"%x-%x-%x-%x-%x-%x\n",[device.mac]:2,[device.mac+1]:2,[device.mac+2]:2,[device.mac+3]:2,[device.mac+4]:2,[device.mac+5]:2
 SIS900_Bad_Eeprom:
-   xor eax, eax
-   ;*******Debug **********************
-if defined SIS900_DEBUG
-   mov esi,SIS900_Debug_Str_GetMac_Failed
-   call sys_msg_board_str
-end if
+	xor	eax, eax
+	ret
+  .err:
+	DEBUGF	1, "Access to EEprom failed!\n", 0
+	or	eax, -1
+	ret
    ret
+;***************************************************************************
-;***************************************************************************
+;
-;*      Get_Mac_SIS635_900_REV: - Get MAC address for model 635
-;*
+; Get_Mac_SIS635_900_REV: - Get MAC address for model 635
 ;*
+;***************************************************************************
-;***************************************************************************
+align 4
-Get_Mac_SIS635_900_REV:
-if defined SIS900_DEBUG
-    mov     esi,SIS900_Debug_Str_GetMac_Start
-    call    sys_msg_board_str
+Get_Mac_SIS635_900_REV:
-end if
-    push    ebp
-    mov     ebp,[ebx+device.io_addr]
+	set_io	0
-    lea     edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-    in	    eax,dx
+	in	eax, dx
+	mov	edi, eax ; EDI=rfcrSave
-    mov     edi,eax ; EDI=rfcrSave
-    lea     edx,[ebp+SIS900_cr]
+	set_io	cr
-    or	    eax,SIS900_RELOAD
+	or	eax, RELOAD
+	out	dx, eax
     out     dx,eax
-    xor     eax,eax
+	xor	eax, eax
+	out	dx, eax
-    out     dx,eax
+;-----------------------------------------------
+; Disable packet filtering before setting filter
-    ; Disable packet filtering before setting filter
-    lea     edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-    mov     eax,edi
+	mov	eax, edi
-    and     edi,not SIS900_RFEN
+	and	edi, not RFEN
+	out	dx, eax
-    out     dx,eax
+;---------------------------------
+; Load MAC to filter data register
-    ; Load MAC to filter data register
-    xor     ecx,ecx
+	mov	ecx, 3
-    lea     esi,[ebx+device.mac]
+	lea	edi, [device.mac]
+  .loop:
-.get_mac_loop:
+	set_io	0
-    lea     edx,[ebp+SIS900_rfcr]
+	set_io	rfcr
-    mov     eax,ecx
+	mov	eax, ecx
-    shl     eax,SIS900_RFADDR_shift
+	shl	eax, RFADDR_shift
+	out	dx, eax
-    out     dx,eax
-    lea     edx,[ebp+SIS900_rfdr]
+	set_io	rfdr
-    in	    eax,dx
-    mov     [esi],ax
+	in	eax, dx
-    add     esi,2
+	stosw
-    inc     ecx
+	loop	.loop
-    cmp     ecx,3
-    jne .get_mac_loop
+;------------------------
+; Enable packet filtering
-    ; Enable packet filtering
-    ;lea     edx,[ebp+SIS900_rfcr]
+;        set_io  rfcr
-    ;mov     eax,edi
+;        mov     eax, edi
-    ;or      eax,SIS900_RFEN
+;        or      eax, RFEN
-    ;out     dx, eax
-   ;*******Debug Print MAC ID to debug window**********************
-if defined SIS900_DEBUG
-    mov     esi,SIS900_Debug_Str_GetMac_Address
-    call    sys_msg_board_str
-    lea     edx, [ebx+device.mac]
-    call    Create_Mac_String
-end if
-    pop     ebp
-    ret
-;***************************************************************************
-;* Function: sis900_read_eeprom
-;*
-;* Description: reads and returns a given location from EEPROM
-;*
-;* Arguments: eax - location:       requested EEPROM location
-;*
-;* Returns:   eax :                contents of requested EEPROM location
+;        out     dx, eax
-;*
-; Read Serial EEPROM through EEPROM Access Register, Note that location is
-;   in word (16 bits) unit */
-;done+
-;***************************************************************************
-sis900_read_eeprom:
-   push      esi
-   push      edx
-   push      ecx
-   push      ebx
-   push      ebp
-   mov	     ebp,[ebx+device.io_addr]
-   mov	     ebx, eax		   ;location of Mac byte to read
-   or	     ebx, SIS900_EEread    ;
-   lea	     edx,[ebp+SIS900_mear] ; Eeprom access register
-   xor	     eax, eax		   ; start send
-   out	     dx,eax
-   call      SIS900_Eeprom_Delay_1
-   mov	     eax, SIS900_EECLK
-   out	     dx, eax
-   call      SIS900_Eeprom_Delay_1
-    ;************ Shift the read command (9) bits out. *********
-   mov	     cl, 8					;
-sis900_read_eeprom_Send:
-   mov	     eax, 1
-   shl	     eax, cl
-   and	     eax, ebx
-   jz SIS900_Read_Eeprom_8
-   mov	     eax, 9
-   jmp	     SIS900_Read_Eeprom_9
-SIS900_Read_Eeprom_8:
-   mov	     eax, 8
-SIS900_Read_Eeprom_9:
-   out	     dx, eax
-   call      SIS900_Eeprom_Delay_1
-   or	     eax, SIS900_EECLK
-   out	     dx, eax
-   call      SIS900_Eeprom_Delay_1
-   cmp	     cl, 0
-   je	     sis900_read_eeprom_Send_Done
-   dec	     cl
-   jmp	     sis900_read_eeprom_Send
-   ;*********************
-sis900_read_eeprom_Send_Done:
-   mov	     eax, SIS900_EECS		;
-   out	     dx, eax
-   call      SIS900_Eeprom_Delay_1
-    ;********** Read 16-bits of data in ***************
-    mov      cx, 16				;16 bits to read
-sis900_read_eeprom_Send2:
-    mov      eax, SIS900_EECS
-    out      dx, eax
-    call     SIS900_Eeprom_Delay_1
-    or	     eax, SIS900_EECLK
-    out      dx, eax
-    call     SIS900_Eeprom_Delay_1
-    in	     eax, dx
-    shl      ebx, 1
-    and      eax, SIS900_EEDO
-    jz	     SIS900_Read_Eeprom_0
-    or	     ebx, 1
-SIS900_Read_Eeprom_0:
-   dec	     cx
-   jnz	     sis900_read_eeprom_Send2
    ;************** Terminate the EEPROM access. **************
-   xor	     eax, eax
-   out	     dx, eax
-   call      SIS900_Eeprom_Delay_1
-   mov	     eax, SIS900_EECLK
-   out	     dx, eax
-   mov	     eax, ebx
-   and	     eax, 0x0000ffff			;return only 16 bits
-   pop	     ebp
-   pop	     ebx
-   pop	     ecx
-   pop	     edx
-   pop	     esi
+	xor	eax, eax
+	ret
    ret
-;***************************************************************************
-;   Function
-;      SIS900_Eeprom_Delay_1
-;   Description
+;***************************************************************************
+;
 ; read_eeprom
+;
 ; reads and returns a given location from EEPROM
+;
+; IN:  si = addr
 ; OUT: ax = data
+;
+;***************************************************************************
-;***************************************************************************
+align 4
+read_eeprom:
+	set_io	0
+	set_io	mear
+	xor	eax, eax	      ; start send
+	out	dx, eax
+	ee_delay
+	or	eax, EECLK
+	out	dx, eax
+	ee_delay
+;------------------------------------
+; Send the read command
+	or	esi, EEread
+	mov	ecx, 1 shl 9
+  .loop:
+	mov	eax, EECS
+	test	esi, ecx
+	jz	@f
-SIS900_Eeprom_Delay_1:
+	or	eax, EEDI
+       @@:
+	out	dx, eax
+	ee_delay
+	or	eax, EECLK
+	out	dx, eax
+	ee_delay
+	shr	esi, 1
+	jnc	.loop
+	mov	eax, EECS
+	out	dx, eax
+	ee_delay
+;------------------------
+; Read 16-bits of data in
+	xor	esi, esi
+	mov	cx, 16
+  .loop2:
+	mov	eax, EECS
+	out	dx, eax
+	ee_delay
+	or	eax, EECLK
+	out	dx, eax
+	ee_delay
    push eax
+	in	eax, dx
+	shl	esi, 1
+	test	eax, EEDO
+	jz	@f
-   in eax, dx
+	inc	esi
+       @@:
+	loop	.loop2
+;----------------------------
+; Terminate the EEPROM access
+	xor	eax, eax
+	out	dx, eax
+	ee_delay
+	mov	eax, EECLK
+	out	dx, eax
+	ee_delay
+	movzx	eax, si
    pop eax
+	ret
    ret
 align 4
 write_mac:
 	DEBUGF 1,'Setting MAC is not supported for SIS900 card.\n'
 	add	esp, 6
 	ret
 ;***************************************************************************
-;   Function
+;
-;      int_handler
+; int_handler
-;   Description
+;
-;      handles received IRQs, which signal received packets
+; handles received IRQs, which signal received packets
+;
-;  Currently only supports one descriptor per packet, if packet is fragmented
+; Currently only supports one descriptor per packet, if packet is fragmented
-;  between multiple descriptors you will lose part of the packet
+; between multiple descriptors you will lose part of the packet
+;
 ;***************************************************************************
-if defined SIS900_DEBUG
-SIS900_Debug_Pull_Packet_good db 'Good Packet Waiting: ',13,10,0
-SIS900_Debug_Pull_Bad_Packet_Status db 'Bad Packet Waiting: Status',13,10,0
-SIS900_Debug_Pull_Bad_Packet_Size db 'Bad Packet Waiting: Size',13,10,0
-end if
+align 4
 int_handler:
 ; find pointer of device which made IRQ occur
-	mov	esi, DEV_LIST
+	mov	esi, device_list
-	mov	ecx, [NUM_DEV]
+	mov	ecx, [devices]
 	test	ecx, ecx
 	jz	.nothing
 .nextdevice:
 	mov	ebx, [esi]
-	mov	edx, [ebx+device.io_addr]
+	set_io	0
-	add	edx, SIS900_isr
+	set_io	isr
 	in	eax, dx ; note that this clears all interrupts
-	test	al, SIS900_RxOK
+	test	ax, IE
 	jnz	.got_it
 	loop	.nextdevice
 .nothing:
 	ret
 .got_it:
+	test	ax, RxOK
+	jz	.no_rx
+	push	ax
+;-----------
-    ;**************Get Status **************
+; Get Status
-    movzx     eax, [ebx+device.cur_rx]		;find current discriptor
+	movzx	eax, [device.cur_rx]		; find current discriptor
-    imul      eax, 12		    ;
+	shl	eax, 4				; * 16
-    mov       ecx, [ebx+device.rxd+eax+4]	   ; get receive status
+	mov	ecx, dword[device.rxd+eax+4]	; get receive status
-    ;**************Check Status **************
+;-------------------------------------------
-    ;Check RX_Status to see if packet is waiting
+; Check RX_Status to see if packet is waiting
-    test      ecx, 0x80000000
+	test	ecx, 0x80000000
-    jnz       SIS900_poll_IS_packet
+	jnz	.is_packet
-    ret
+	ret
+;----------------------------------------------
-   ;**********There is a packet waiting check it for errors**************
+; There is a packet waiting check it for errors
-SIS900_poll_IS_packet:
+  .is_packet:
-    test      ecx, 0x67C0000		;see if there are any errors
+	test	ecx, 0x67C0000			; see if there are any errors
-    jnz       SIS900_Poll_Error_Status
+	jnz	.error_status
+;---------------------
-   ;**************Check size of packet*************
+; Check size of packet
-   and	     ecx, SIS900_DSIZE					;get packet size minus CRC
+	and	ecx, DSIZE			; get packet size minus CRC
-   cmp	     ecx, SIS900_CRC_SIZE
-   ;make sure packet contains data
+	sub	ecx, CRC_SIZE			; make sure packet contains data
-   jle	     SIS900_Poll_Error_Size
+	jle	.error_size
-   ;*******Copy Good Packet to receive buffer******
-   sub	    ecx, SIS900_CRC_SIZE			     ;dont want crc
-   ; update statistics
+; update statistics
-   inc	    dword [ebx+device.packets_rx]
+	inc	dword [device.packets_rx]
-   add	    dword [ebx+device.bytes_rx], ecx
+	add	dword [device.bytes_rx], ecx
-   adc	    dword [ebx+device.bytes_rx+4], 0
+	adc	dword [device.bytes_rx+4], 0
-   push     ecx
-   stdcall  KernelAlloc, ecx
-   pop	    ecx
-   test     eax, eax
-   jz	    int_handler.nothing
-   push     ebx
+	push	ebx
-   push     .return ; return address for EthReceiver
-   ;**********Continue copying packet****************
-   push     ecx eax ; save buffer pointer and size for EthReceiver
-   mov	    edi, eax
-   movzx    esi, byte [ebx+device.cur_rx]
-   imul     esi, RX_BUFF_SZ
-   lea	    esi, [esi+ebx+0x1000+NUM_TX_DESC*TX_BUFF_SZ]
-   ; first copy dword-wise, divide size by 4
-   shr	    ecx, 2
+	push	.return
-   rep	    movsd							; copy the dwords
+	push	ecx				; packet size
-   mov	    ecx, [esp+4]
-   and	    ecx, 3						    ;
-   rep	    movsb
-   ;********Debug, tell user we have a good packet*************
-if defined SIS900_DEBUG
-   mov	    esi, SIS900_Debug_Pull_Packet_good
+	push	[device.rxd+eax+12]		; packet ptr
-   call     sys_msg_board_str
+	DEBUGF	1, "Packet received OK\n"
-end if
-   jmp	    EthReceiver
+	jmp	EthReceiver
-.return:
+  .return:
-   pop	    ebx
+	pop	ebx
-   jmp	    SIS900_Poll_Cnt
-   ;*************Error occured let user know through debug window***********
-SIS900_Poll_Error_Status:
-if defined SIS900_DEBUG
-		mov	 esi, SIS900_Debug_Pull_Bad_Packet_Status
-		call	 sys_msg_board_str
-end if
-		jmp	 SIS900_Poll_Cnt
-SIS900_Poll_Error_Size:
-if defined SIS900_DEBUG
-		mov	 esi, SIS900_Debug_Pull_Bad_Packet_Size
-		call	 sys_msg_board_str
-end if
-   ;*************Increment to next available descriptor**************
-SIS900_Poll_Cnt:
-    ;Reset status, allow ethernet card access to descriptor
+; Reset status, allow ethernet card access to descriptor
-   movzx    eax, [ebx+device.cur_rx]
+	movzx	ecx, [device.cur_rx]
-   lea	    eax, [eax*3]
+	shl	ecx, 4				; *16
+	mov	ecx, [device.rxd+ecx]
-   mov	    ecx, RX_BUFF_SZ
+	stdcall KernelAlloc, RX_BUFF_SZ
+	test	eax, eax
+	jz	.fail
+	mov	dword [ecx+12], eax
+	GetRealAddr
-   mov	    [ebx+device.rxd+eax*4+4], ecx		 ;
+	mov	dword [ecx+8], eax
+	mov	dword [ecx+4], RX_BUFF_SZ
-   inc	    [ebx+device.cur_rx] 			 ;get next descriptor
+	inc	[device.cur_rx] 			 ; get next descriptor
-   and	    [ebx+device.cur_rx],NUM_RX_DESC-1		 ;only 4 descriptors 0-3
+	and	[device.cur_rx], NUM_RX_DESC-1		 ; only 4 descriptors 0-3
-   ;******Enable Receiver************
+; Enable Receiver
-   mov	    edx, [ebx+device.io_addr]
+	set_io	0
-   add	    edx, SIS900_cr ; Command Register offset
+	set_io	cr		; Command Register offset
-   in	    eax, dx			    ; Get current Command Register
+	in	eax, dx 	; Get current Command Register
-   or	    eax, SIS900_RxENA	;Enable Receive
+	or	eax, RxENA	; Enable Receiver
-   out	    dx, eax
+	out	dx, eax
+	pop	ax
+	jmp	.no_rx
+  .error_status:
+	DEBUGF	1, "Packet error: %x\n", ecx
+	jmp	.continue
+  .error_size:
+	DEBUGF	1, "Packet too large/small\n"
+	jmp	.continue
+  .no_rx:
+	test	ax, TxOk
+	jz	.no_tx
+	;;; TODO: free all unused buffers
+	stdcall   KernelFree, eax
+  .no_tx:
-   ret
+	ret
 ;***************************************************************************
 ;   Function
 ;      transmit
 ;   Description
 ;      Transmits a packet of data via the ethernet card
 ;         buffer pointer in [esp+4]
 ;         size of buffer in [esp+8]
 ;         pointer to device structure in ebx
+;
 ;      only one transmit descriptor is used
+;
 ;***************************************************************************
-if defined SIS900_DEBUG
-SIS900_Debug_Transmit_Packet db 'Transmitting Packet: ',13,10,0
-SIS900_Debug_Transmit_Packet_Err db 'Transmitting Packet Error: ',13,10,0
-end if
+align 4
-str1 db 'Transmitting packet:',13,10,0
-str2 db ' ',0
 transmit:
-   cmp	    dword [esp+8], MAX_ETH_FRAME_SIZE
+	cmp	dword [esp+8], MAX_ETH_FRAME_SIZE
-   jg	    transmit_finish
+	jg	transmit_finish
-   cmp	    dword [esp+8], 60
+	cmp	dword [esp+8], 60
-   jl	    transmit_finish
+	jl	transmit_finish
-   push     ebp
-   mov	    ebp, [ebx+device.io_addr] ; Base Address
-   ;******** Stop the transmitter ********
-   lea	    edx,[ebp+SIS900_cr] ; Command Register offset
-   in	    eax, dx			    ; Get current Command Register
-   or	    eax, SIS900_TxDIS	; Disable Transmitter
-   out	    dx, eax
-   ;*******load Transmit Descriptor Register *******
-   lea	    edx,[ebp+SIS900_txdp]
-   mov	    eax, ebx
-   call     GetPgAddr
-   add	    eax, device.txd
-   out	    dx, eax
-   ;******* copy packet to descriptor*******
-   mov	   esi, [esp+8]
-   lea	   edi, [ebx+0x1000]
-   mov	   ecx, [esp+12]
-   mov	   edx, ecx
-   shr	   ecx, 2
-   and	   edx, 3
-   rep	   movsd
-   mov	   ecx, edx
-   rep	   movsb
-   ;**************set length tag**************
-   mov	   ecx, [esp+12]		  ;restore packet size
-   and	   ecx, SIS900_DSIZE	 ;
-   inc	    [ebx+device.packets_tx]
-   add	    dword [ebx+device.bytes_tx], ecx
-   adc	    dword [ebx+device.bytes_tx+4], 0
-   ;**************pad to minimum packet size **************not needed
-   ;cmp       ecx, SIS900_ETH_ZLEN
-   ;jge       SIS900_transmit_Size_Ok
-   ;push      ecx
-   ;mov       ebx, SIS900_ETH_ZLEN
-   ;sub       ebx, ecx
-   ;mov       ecx, ebx
-   ;rep       movsb
-   ;pop       ecx
-SIS900_transmit_Size_Ok:
-   or	    ecx, 0x80000000				;card owns descriptor
-   mov	    [ebx+device.txd+4], ecx
-if defined SIS900_DEBUG
-   mov	    esi, SIS900_Debug_Transmit_Packet
-   call     sys_msg_board_str
-end if
-   ;***************restart the transmitter ********
-   lea	    edx,[ebp+SIS900_cr]
-   in	    eax, dx			    ; Get current Command Register
-   or	    eax, SIS900_TxENA	; Enable Transmitter
-   out	    dx, eax
-   ;****make sure packet transmitted successfully****
-;   mov      esi,10
-;   call     delay_ms
-   mov	    eax, [ebx+device.txd+4]
-   and	    eax, 0x6200000
-   jz	    SIS900_transmit_OK
-   ;**************Tell user there was an error through debug window
-if defined SIS900_DEBUG
-   mov	    esi, SIS900_Debug_Transmit_Packet_Err
-   call     sys_msg_board_str
-end if
-SIS900_transmit_OK:
-   pop	    ebp
-transmit_finish:
-   ret
-;***************************************************************************
-;* Function: Create_Mac_String
-;*
-;* Description: Converts the 48 bit value to a string for display
-;*
+	movzx	ecx, [device.cur_tx]
-;* String Format: XX:XX:XX:XX:XX:XX
+	mov	ecx, [device.txd+ecx*16]
-;*
-;* Arguments: node_addr is location of 48 bit MAC ID
-;*
+;; TODO: check if desc is empty (for example: check for eax, 0x6200000  at [ecx+4]
-;* Returns:   Prints string to general debug window
-;*
-;*
-;done
-;***************************************************************************
-if defined SIS900_DEBUG
+;;; or: count number of available descriptors
-SIS900_Char_String    db '0','1','2','3','4','5','6','7','8','9'
-		      db 'A','B','C','D','E','F'
-Mac_str_build: times 20 db 0
-Create_Mac_String:
-   pusha
+	mov	eax, [esp+4]
-   xor ecx, ecx
+	mov	dword [ecx + 12], eax
-Create_Mac_String_loop:
+	GetRealAddr
-   mov al,byte [edx+ecx];[node_addr+ecx]
+	mov	dword [ecx + 8], eax
-   push eax
-   shr eax, 4
+	mov	eax, [esp+8]
-   and eax, 0x0f
+	and	eax, DSIZE
-   mov bl, byte [SIS900_Char_String+eax]
+	or	eax, 0x80000000 	; card owns descriptor
-   mov [Mac_str_build+ecx*3], bl
+	mov	dword [ecx + 4], eax
-   pop eax
-   and eax, 0x0f
-   mov bl, byte [SIS900_Char_String+eax]
-   mov [Mac_str_build+1+ecx*3], bl
-   cmp ecx, 5
+; update stats
-   je Create_Mac_String_done
-   mov bl, ':'
+	inc	[device.packets_tx]
-   mov [Mac_str_build+2+ecx*3], bl
-   inc ecx
-   jmp Create_Mac_String_loop
-Create_Mac_String_done: 				;Insert CR and Zero Terminate
-   mov [Mac_str_build+2+ecx*3],byte 13
-   mov [Mac_str_build+3+ecx*3],byte 10
+	add	dword [device.bytes_tx], ecx
-   mov [Mac_str_build+4+ecx*3],byte 0
-   mov esi, Mac_str_build
-   call sys_msg_board_str				;Print String to message board
-   popa
-   ret
+	adc	dword [device.bytes_tx+4], 0
-end if
-;***************************************************************************
-;*      Set device to be a busmaster in case BIOS neglected to do so.
-;*      Also adjust PCI latency timer to a reasonable value, 64.
-;***************************************************************************
-SIS900_adjust_pci_device:
-   ;*******Get current setting************************
-   stdcall PciRead16, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x04
-   ;******see if its already set as bus master********
-   mov	    cx, ax
-   and	    cx,5
-   cmp	    cx,5
-   je	    SIS900_adjust_pci_device_Latency
-   ;******Make card a bus master*******
-   mov	    cx, ax				;value to write
-   or	    cx,5
-   stdcall PciWrite16, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x04, ecx
-   ;******Check latency setting***********
-SIS900_adjust_pci_device_Latency:
-   ;*******Get current latency setting************************
-   stdcall PciRead8, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x0D
-   ;******see if its aat least 64 clocks********
-   cmp	    al,64
-   jge	    SIS900_adjust_pci_device_Done
-   ;******Set latency to 32 clocks*******
-   stdcall PciWrite8, dword [ebx+device.pci_bus], dword [ebx+device.pci_dev], 0x0D, 64
-   ;******Check latency setting***********
 SIS900_adjust_pci_device_Done:
+	ret
    ret
 ; End of code
 align 4 					; Place all initialised data here
-NUM_DEV   dd 0
+devices 	dd 0
-sis900_specific_table:
+specific_table:
 ;    dd SIS630A_900_REV,Get_Mac_SIS630A_900_REV,0
 ;    dd SIS630E_900_REV,Get_Mac_SIS630E_900_REV,0
     dd SIS630S_900_REV,Get_Mac_SIS635_900_REV,0
     dd SIS630EA1_900_REV,Get_Mac_SIS635_900_REV,0
     dd SIS630ET_900_REV,Get_Mac_SIS635_900_REV,0;SIS630ET_900_REV_SpecialFN
     dd SIS635A_900_REV,Get_Mac_SIS635_900_REV,0
     dd SIS900_960_REV,SIS960_get_mac_addr,0
-    dd SIS900B_900_REV,SIS900_get_mac_addr,0
+    dd SIS900B_900_REV,get_mac_addr,0
-    dd 0,0,0,0 ; end of list
+    dd 0					; end of list
-version       dd (5 shl 16) or (API_VERSION and 0xFFFF)
+version 	dd (DRIVER_VERSION shl 16) or (API_VERSION and 0xFFFF)
-my_service    db 'SIS900',0			; max 16 chars include zero
+my_service	db 'SIS900',0		       ; max 16 chars include zero
-include_debug_strings				; All data wich FDO uses will be included here
+include_debug_strings			       ; All data wich FDO uses will be included here
-section '.data' data readable writable align 16 ; place all uninitialized data place here
+section '.data' data readable writable align 16; place all uninitialized data place here
-DEV_LIST rd MAX_DEVICES 		; This list contains all pointers to device structures the driver is handling
+device_list	rd MAX_DEVICES		       ; This list contains all pointers to device structures the driver is handling
+>

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/sis900.asm – Rev 1514 → 1519