Use aliases in net_table

Author: Ian Seyler

src/drivers/net/i8254x.asm

@@ -220,7 +220,7 @@ net_i8254x_transmit:
 	mov rdi, os_tx_desc		; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-	mov eax, [rdx+0x30]		; Get 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
@@ -238,8 +238,8 @@ net_i8254x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8254x_MAX_DESC - 1
-	mov [rdx+0x30], eax		; Set tx_lasttail
-	mov rdi, [rdx+0x10]		; Load the base MMIO of the NIC
+	mov [rdx+nt_tx_head], eax	; Set tx_lasttail
+	mov rdi, [rdx+nt_base]		; Load the base MMIO of the NIC
 	mov [rdi+i8254x_TDT], eax	; TDL - Transmit Descriptor Tail
 
 	pop rax
@@ -268,10 +268,10 @@ net_i8254x_poll:
 	push rax
 
 	mov rdi, os_rx_desc
-	mov rsi, [rdx+0x10]		; Load the base MMIO of the NIC
+	mov rsi, [rdx+nt_base]		; Load the base MMIO of the NIC
 
 	; Calculate the descriptor to read from
-	mov eax, [rdx+0x34]		; Get 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
@@ -285,10 +285,10 @@ net_i8254x_poll:
 	stosq				; Clear the descriptor length and status
 
 	; Increment i8254x_rx_lasthead and the Receive Descriptor Tail
-	mov eax, [rdx+0x34]		; Get rx_lasthead
+	mov eax, [rdx+nt_rx_head]	; Get rx_lasthead
 	add eax, 1
 	and eax, i8254x_MAX_DESC - 1
-	mov [rdx+0x34], eax		; Set rx_lasthead
+	mov [rdx+nt_rx_head], eax	; Set rx_lasthead
 
 	mov eax, [rsi+i8254x_RDT]	; Read the current Receive Descriptor Tail
 	add eax, 1			; Add 1 to the Receive Descriptor Tail

src/sysvar.asm

@@ -168,28 +168,19 @@ os_net_entry_rx_tail:	equ os_SystemVariables + 0x202C
 bus_table:		equ os_SystemVariables + 0x8000
 net_table:		equ os_SystemVariables + 0xA000
 
-; net_table layout - each entry is 128 bytes
-; 0x00
-; 16-bit driver ID
-; 6 bytes of padding
-; 48-bit MAC address
-; 2 bytes of padding
-; 0x10
-; 64-bit device base
-; 64-bit device length
-; 0x20
-; 64-bit transmit
-; 64-bit poll
-; 0x30
-; 32-bit tx_last_head
-; 32-bit rx_last_head
-; 8 bytes of padding
-; 0x40
-; 64-bit TXPackets
-; 64-bit TXBytes
-; 0x50
-; 64-bit RXPackets
-; 64-bit RXBytes
+; net_table values (per device - 128 bytes)
+nt_ID:			equ 0x00 ; 16-bit
+nt_MAC:			equ 0x08 ; 48-bit
+nt_base:		equ 0x10 ; 64-bit
+nt_len:			equ 0x18 ; 64-bit
+nt_transmit:		equ 0x20 ; 64-bit
+nt_poll:		equ 0x28 ; 64-bit
+nt_tx_head:		equ 0x30 ; 64-bit
+nt_rx_head:		equ 0x34 ; 64-bit
+nt_tx_packets:		equ 0x40 ; 64-bit
+nt_tx_bytes:		equ 0x48 ; 64-bit
+nt_rx_packets:		equ 0x50 ; 64-bit
+nt_rx_bytes:		equ 0x58 ; 64-bit
 
 
 ; Misc