Rename nt_tx_head to nt_tx_tail

Author: Ian Seyler

src/drivers/net/i8254x.asm

@@ -240,7 +240,7 @@ net_i8254x_transmit:
 	mov rdi, [rdx+nt_tx_desc]	; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-	mov eax, [rdx+nt_tx_head]	; Get tx_lasttail
+	mov eax, [rdx+nt_tx_tail]	; Get tx_lasttail
 	push rax			; Save lasttail
 	shl eax, 4			; Quick multiply by 16
 	add rdi, rax			; Add offset to RDI
@@ -258,7 +258,7 @@ net_i8254x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8254x_MAX_DESC - 1
-	mov [rdx+nt_tx_head], eax	; Set tx_lasttail
+	mov [rdx+nt_tx_tail], 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
 

src/drivers/net/i8257x.asm

@@ -242,7 +242,7 @@ net_i8257x_transmit:
 	mov rdi, [rdx+nt_tx_desc]	; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-	mov eax, [rdx+nt_tx_head]	; Get tx_lasttail
+	mov eax, [rdx+nt_tx_tail]	; Get tx_lasttail
 	push rax			; Save lasttail
 	shl eax, 4			; Quick multiply by 16
 	add rdi, rax			; Add offset to RDI
@@ -260,7 +260,7 @@ net_i8257x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8257x_MAX_DESC - 1
-	mov [rdx+nt_tx_head], eax	; Set tx_lasttail
+	mov [rdx+nt_tx_tail], 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
 

src/drivers/net/i8259x.asm

@@ -394,7 +394,7 @@ net_i8259x_transmit:
 	mov rdi, [rdx+nt_tx_desc]	; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-	mov eax, [rdx+nt_tx_head]	; Get tx_lasttail
+	mov eax, [rdx+nt_tx_tail]	; Get tx_lasttail
 	push rax			; Save lasttail
 	shl eax, 4			; Quick multiply by 16
 	add rdi, rax			; Add offset to RDI
@@ -412,7 +412,7 @@ net_i8259x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8259x_MAX_DESC - 1
-	mov [rdx+nt_tx_head], eax	; Set tx_lasttail
+	mov [rdx+nt_tx_tail], eax	; Set tx_lasttail
 	mov rdi, [rdx+nt_base]		; Load the base MMIO of the NIC
 	mov [rdi+i8259x_TDT], eax	; TDL - Transmit Descriptor Tail
 

src/sysvar.asm

@@ -43,10 +43,11 @@ os_nvs_mem:		equ 0x0000000000130000	; 0x130000 -> 0x15FFFF	192K NVS structures/b
 os_usb_mem:		equ 0x0000000000160000	; 0x160000 -> 0x19FFFF	256K USB structures/buffers
 
 ; Network memory
-os_net_mem:		equ 0x00000000001A0000	; 0x1A0000 -> 0x1CFFFF	192K Network descriptors/buffers
+os_net_mem:		equ 0x00000000001A0000	; 0x1A0000 -> 0x1BFFFF	128K Network descriptors/buffers
 os_rx_desc:		equ 0x00000000001A0000	; 0x1A0000 -> 0x1AFFFF	64K Ethernet receive descriptors
 os_tx_desc:		equ 0x00000000001B0000	; 0x1B0000 -> 0x1BFFFF	64K Ethernet transmit descriptors
-os_PacketBuffers:	equ 0x00000000001C0000	; 0x1C0000 -> 0x1CFFFF	64K Ethernet packet buffers
+
+						; 0x1C0000 -> 0x1CFFFF	64K Free
 
 ; LFB font data
 os_font:		equ 0x00000000001D0000	; 0x1D0000 -> 0x1DFFFF	64K Font video data
@@ -58,6 +59,8 @@ os_SMP:			equ 0x00000000001FF800	; SMP table. Each item is 8 bytes. (2KiB before
 app_start:		equ 0xFFFF800000000000	; Location of application memory
 
 
+; System Variables
+
 ; DQ - Starting at offset 0, increments by 8
 os_LocalAPICAddress:	equ os_SystemVariables + 0x0000
 os_IOAPICAddress:	equ os_SystemVariables + 0x0008
@@ -118,7 +121,7 @@ key:			equ os_SystemVariables + 0x0301
 key_shift:		equ os_SystemVariables + 0x0302
 os_BusEnabled:		equ os_SystemVariables + 0x0303	; 1 if PCI is enabled, 2 if PCIe is enabled
 os_NetEnabled:		equ os_SystemVariables + 0x0304	; 1 if a supported network card was enabled
-os_NetIRQ:		equ os_SystemVariables + 0x0305	; Set to Interrupt line that NIC is connected to
+;os_NetIRQ:		equ os_SystemVariables + 0x0305	; Set to Interrupt line that NIC is connected to
 ;os_NetActivity_TX:	equ os_SystemVariables + 0x0306
 ;os_NetActivity_RX:	equ os_SystemVariables + 0x0307
 ;os_EthernetBuffer_C1:	equ os_SystemVariables + 0x0308	; Counter 1 for the Ethernet RX Ring Buffer
@@ -142,22 +145,14 @@ os_BSP:			equ os_SystemVariables + 0x0319
 os_HPET_IRQ:		equ os_SystemVariables + 0x031A
 os_net_icount:		equ os_SystemVariables + 0x031B
 
-; Network Device Table Base
-os_net_table:		equ os_SystemVariables + 0x2000
-
-; Network Devices Entries - each entry is 64 bytes
-os_net_entry_base:	equ os_SystemVariables + 0x2000
-os_net_entry_transmit:	equ os_SystemVariables + 0x2008
-os_net_entry_poll:	equ os_SystemVariables + 0x2010
-os_net_entry_stats:	equ os_SystemVariables + 0x2018
-os_net_entry_MAC:	equ os_SystemVariables + 0x2020
-os_net_entry_tx_tail:	equ os_SystemVariables + 0x2028
-os_net_entry_rx_tail:	equ os_SystemVariables + 0x202C
-; Next Device starts at 0x8040
 
+; System tables
 bus_table:		equ os_SystemVariables + 0x8000
 net_table:		equ os_SystemVariables + 0xA000
 
+; Buffers
+os_PacketBuffers:	equ os_SystemVariables + 0xC000	; 16KiB
+
 ; net_table values (per device - 128 bytes)
 nt_ID:			equ 0x00 ; 16-bit
 nt_MAC:			equ 0x08 ; 48-bit
@@ -167,7 +162,7 @@ nt_transmit:		equ 0x20 ; 64-bit
 nt_poll:		equ 0x28 ; 64-bit
 nt_tx_desc:		equ 0x30 ; 64-bit
 nt_rx_desc:		equ 0x38 ; 64-bit
-nt_tx_head:		equ 0x40 ; 64-bit
+nt_tx_tail:		equ 0x40 ; 64-bit
 nt_rx_head:		equ 0x44 ; 64-bit
 nt_tx_packets:		equ 0x50 ; 64-bit
 nt_tx_bytes:		equ 0x58 ; 64-bit