Update i8257x driver

clear out old system variables

Author: Ian Seyler

src/drivers/net/i8257x.asm

@@ -13,16 +13,29 @@
 ; Initialize an Intel 8257x NIC
 ;  IN:	RDX = Packed Bus address (as per syscalls/bus.asm)
 net_i8257x_init:
+	push rdi
 	push rsi
 	push rdx
 	push rcx
 	push rax
 
+	mov rdi, net_table
+	xor eax, eax
+	mov al, [os_net_icount]
+	shl eax, 7			; Quick multiply by 128
+	add rdi, rax
+
+	mov ax, 0x8257			; Driver tag for i8257x
+	stosw
+	add rdi, 14
+
 	; Get the Base Memory Address of the device
 	mov al, 0			; Read BAR0
 	call os_bus_read_bar
-	mov [os_NetIOBaseMem], rax	; Save it as the base
-	mov [os_NetIOLength], rcx	; Save the length
+	stosq				; Save the base
+	push rax			; Save the base for gathering the MAC later
+	mov rax, rcx
+	stosq				; Save the length
 
 	; Set PCI Status/Command values
 	mov dl, 0x01			; Read Status/Command
@@ -33,29 +46,53 @@ net_i8257x_init:
 	call os_bus_write		; Write updated Status/Command
 
 	; Get the MAC address
-	mov rsi, [os_NetIOBaseMem]
+	pop rsi				; Restore the base
+	sub rdi, 24			; 8 bytes into net table entry
 	mov eax, [rsi+i8257x_RAL]	; RAL
-	mov [os_NetMAC], al
+	stosb
 	shr eax, 8
-	mov [os_NetMAC+1], al
+	stosb
 	shr eax, 8
-	mov [os_NetMAC+2], al
+	stosb
 	shr eax, 8
-	mov [os_NetMAC+3], al
+	stosb
 	mov eax, [rsi+i8257x_RAH]	; RAH
-	mov [os_NetMAC+4], al
+	stosb
 	shr eax, 8
-	mov [os_NetMAC+5], al
+	stosb
+
+	; Set base addresses for TX and RX descriptors
+	xor ecx, ecx
+	mov cl, byte [os_net_icount]
+	shl ecx, 15
+
+	add rdi, 0x22
+	mov rax, os_tx_desc
+	add rax, rcx
+	stosq
+	mov rax, os_rx_desc
+	add rax, rcx
+	stosq
 
 	; Reset the device
+	xor edx, edx
+	mov dl, [os_net_icount]
 	call net_i8257x_reset
 
+	; Store call addresses
+	sub rdi, 0x20
+	mov rax, net_i8257x_transmit
+	stosq
+	mov rax, net_i8257x_poll
+	stosq
+
 net_i8257x_init_error:
 
 	pop rax
 	pop rcx
 	pop rdx
 	pop rsi
+	pop rdi
 	ret
 ; -----------------------------------------------------------------------------
 
@@ -69,7 +106,14 @@ net_i8257x_reset:
 	push rsi
 	push rax
 
-	mov rsi, [os_NetIOBaseMem]
+	; Gather Base Address from net_table
+	mov rsi, net_table
+	xor eax, eax
+	mov al, [os_net_icount]
+	shl eax, 7			; Quick multiply by 128
+	add rsi, rax
+	add rsi, 16
+	mov rsi, [rsi]
 	mov rdi, rsi
 
 	; Disable Interrupts (14.4)
@@ -114,7 +158,11 @@ net_i8257x_init_reset_wait:
 	; Create RX descriptors
 	push rdi
 	mov ecx, i8257x_MAX_DESC
+	xor eax, eax
+	mov al, byte [os_net_icount]
+	shl eax, 15
 	mov rdi, os_rx_desc
+	add rdi, rax
 net_i8257x_reset_nextdesc:	
 	mov rax, os_PacketBuffers	; Default packet will go here
 	stosq
@@ -125,7 +173,10 @@ net_i8257x_reset_nextdesc:
 	pop rdi
 
 	; Initialize receive (14.6)
-	mov rax, os_rx_desc
+	xor eax, eax
+	mov al, byte [os_net_icount]
+	shl eax, 15
+	add rax, os_rx_desc
 	mov [rsi+i8257x_RDBAL], eax	; Receive Descriptor Base Address Low
 	shr rax, 32
 	mov [rsi+i8257x_RDBAH], eax	; Receive Descriptor Base Address High
@@ -139,7 +190,10 @@ net_i8257x_reset_nextdesc:
 	mov [rsi+i8257x_RCTL], eax	; Receive Control Register
 
 	; Initialize transmit (14.7)
-	mov rax, os_tx_desc
+	xor eax, eax
+	mov al, byte [os_net_icount]
+	shl eax, 15
+	add rax, os_tx_desc
 	mov [rsi+i8257x_TDBAL], eax	; Transmit Descriptor Base Address Low
 	shr rax, 32
 	mov [rsi+i8257x_TDBAH], eax	; Transmit Descriptor Base Address High
@@ -184,10 +238,10 @@ net_i8257x_transmit:
 	push rdi
 	push rax
 
-	mov rdi, os_tx_desc		; Transmit Descriptor Base Address
+	mov rdi, [rdx+nt_tx_desc]	; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-	mov eax, [i8257x_tx_lasttail]
+	mov eax, [rdx+nt_tx_head]	; Get tx_lasttail
 	push rax			; Save lasttail
 	shl eax, 4			; Quick multiply by 16
 	add rdi, rax			; Add offset to RDI
@@ -205,8 +259,8 @@ net_i8257x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8257x_MAX_DESC - 1
-	mov [i8257x_tx_lasttail], eax
-	mov rdi, [os_NetIOBaseMem]
+	mov [rdx+nt_tx_head], eax	; Set tx_lasttail
+	mov rdi, [rdx+nt_base]		; Load the base MMIO of the NIC
 	mov [rdi+i8257x_TDT], eax	; TDL - Transmit Descriptor Tail
 
 	pop rax
@@ -233,11 +287,11 @@ net_i8257x_poll:
 	push rsi			; Used for the base MMIO of the NIC
 	push rax
 
-	mov rdi, os_rx_desc
-	mov rsi, [os_NetIOBaseMem]	; Load the base MMIO of the NIC
+	mov rdi, [rdx+nt_rx_desc]
+	mov rsi, [rdx+nt_base]		; Load the base MMIO of the NIC
 
 	; Calculate the descriptor to read from
-	mov eax, [i8257x_rx_lasthead]
+	mov eax, [rdx+nt_rx_head]	; Get rx_lasthead
 	shl eax, 4			; Quick multiply by 16
 	add eax, 8			; Offset to bytes received
 	add rdi, rax			; Add offset to RDI
@@ -251,10 +305,11 @@ net_i8257x_poll:
 	stosq				; Clear the descriptor length and status
 
 	; Increment i8257x_rx_lasthead and the Receive Descriptor Tail
-	mov eax, [i8257x_rx_lasthead]
+	mov eax, [rdx+nt_rx_head]	; Get rx_lasthead
 	add eax, 1
 	and eax, i8257x_MAX_DESC - 1
-	mov [i8257x_rx_lasthead], eax
+	mov [rdx+nt_rx_head], eax	; Set rx_lasthead
+
 	mov eax, [rsi+i8257x_RDT]	; Read the current Receive Descriptor Tail
 	add eax, 1			; Add 1 to the Receive Descriptor Tail
 	and eax, i8257x_MAX_DESC - 1
@@ -274,10 +329,6 @@ net_i8257x_poll_end:
 ; -----------------------------------------------------------------------------
 
 
-; Variables
-i8257x_tx_lasttail: dd 0
-i8257x_rx_lasthead: dd 0
-
 ; Constants
 i8257x_MAX_PKT_SIZE	equ 16384
 i8257x_MAX_DESC		equ 16		; Must be 16, 32, 64, 128, etc.

src/sysvar.asm

@@ -62,24 +62,14 @@ app_start:		equ 0xFFFF800000000000	; Location of application memory
 os_LocalAPICAddress:	equ os_SystemVariables + 0x0000
 os_IOAPICAddress:	equ os_SystemVariables + 0x0008
 os_SysConfEn:		equ os_SystemVariables + 0x0010	; Enabled bits: 0=PS/2 Keyboard, 1=PS/2 Mouse, 2=Serial, 4=HPET, 5=xHCI
-os_PacketAddress:	equ os_SystemVariables + 0x0018
 os_StackBase:		equ os_SystemVariables + 0x0020
-;os_net_transmit:	equ os_SystemVariables + 0x0028
-;os_net_poll:		equ os_SystemVariables + 0x0030
-;os_net_ackint:		equ os_SystemVariables + 0x0038
 os_NetIOBaseMem:	equ os_SystemVariables + 0x0040
 os_NetMAC:		equ os_SystemVariables + 0x0048
 os_HPET_Address:	equ os_SystemVariables + 0x0050
 os_AHCI_Base:		equ os_SystemVariables + 0x0058
 os_NetworkCallback:	equ os_SystemVariables + 0x0060
 os_KeyboardCallback:	equ os_SystemVariables + 0x0068
 os_ClockCallback:	equ os_SystemVariables + 0x0070
-os_net_TXBytes:		equ os_SystemVariables + 0x0078
-os_net_TXPackets:	equ os_SystemVariables + 0x0080
-os_net_RXBytes:		equ os_SystemVariables + 0x0088
-os_net_RXPackets:	equ os_SystemVariables + 0x0090
-;os_hdd_BytesRead:	equ os_SystemVariables + 0x0098
-;os_hdd_BytesWrite:	equ os_SystemVariables + 0x00A0
 os_NVMe_Base:		equ os_SystemVariables + 0x00A8
 os_nvs_io:		equ os_SystemVariables + 0x00B0
 os_nvs_id:		equ os_SystemVariables + 0x00B8