Cleanup

Author: Ian Seyler

src/drivers/net/i8254x.asm

@@ -22,7 +22,7 @@ net_i8254x_init:
 	shl eax, 7			; Quick multiply by 128
 	add rdi, rax
 
-	mov ax, 0x8254
+	mov ax, 0x8254			; Driver tag for i8254x
 	stosw
 	add rdi, 14
 
@@ -98,7 +98,6 @@ net_i8254x_reset:
 	add rsi, rax
 	add rsi, 16
 	mov rsi, [rsi]
-;	mov rsi, [os_NetIOBaseMem]
 	mov rdi, rsi
 
 	; Disable Interrupts
@@ -144,7 +143,7 @@ net_i8254x_reset:
 	mov ecx, i8254x_MAX_DESC
 ; TODO - Adjust value based on iid
 	mov rdi, os_rx_desc
-net_i8254x_reset_nextdesc:	
+net_i8254x_reset_nextdesc:
 	mov rax, os_PacketBuffers	; Default packet will go here
 	stosq
 	xor eax, eax
@@ -221,7 +220,6 @@ net_i8254x_transmit:
 	mov rdi, os_tx_desc		; Transmit Descriptor Base Address
 
 	; Calculate the descriptor to write to
-;	mov eax, [i8254x_tx_lasttail]
 	mov eax, [rdx+0x30]		; Get tx_lasttail
 	push rax			; Save lasttail
 	shl eax, 4			; Quick multiply by 16
@@ -240,9 +238,7 @@ net_i8254x_transmit:
 	pop rax				; Restore lasttail
 	add eax, 1
 	and eax, i8254x_MAX_DESC - 1
-;	mov [i8254x_tx_lasttail], eax
 	mov [rdx+0x30], eax		; Set tx_lasttail
-;	mov rdi, [os_NetIOBaseMem]
 	mov rdi, [rdx+0x10]		; Load the base MMIO of the NIC
 	mov [rdi+i8254x_TDT], eax	; TDL - Transmit Descriptor Tail
 
@@ -272,11 +268,9 @@ net_i8254x_poll:
 	push rax
 
 	mov rdi, os_rx_desc
-;	mov rsi, [os_NetIOBaseMem]	; Load the base MMIO of the NIC
 	mov rsi, [rdx+0x10]		; Load the base MMIO of the NIC
 
 	; Calculate the descriptor to read from
-;	mov eax, [i8254x_rx_lasthead]
 	mov eax, [rdx+0x34]		; Get rx_lasthead
 	shl eax, 4			; Quick multiply by 16
 	add eax, 8			; Offset to bytes received
@@ -291,11 +285,9 @@ net_i8254x_poll:
 	stosq				; Clear the descriptor length and status
 
 	; Increment i8254x_rx_lasthead and the Receive Descriptor Tail
-;	mov eax, [i8254x_rx_lasthead]
 	mov eax, [rdx+0x34]		; Get rx_lasthead
 	add eax, 1
 	and eax, i8254x_MAX_DESC - 1
-;	mov [i8254x_rx_lasthead], eax
 	mov [rdx+0x34], eax		; Set rx_lasthead
 
 	mov eax, [rsi+i8254x_RDT]	; Read the current Receive Descriptor Tail
@@ -333,10 +325,6 @@ net_i8254x_poll_end:
 ; -----------------------------------------------------------------------------
 
 
-; Variables
-;i8254x_tx_lasttail: dd 0
-;i8254x_rx_lasthead: dd 0
-
 ; Constants
 i8254x_MAX_PKT_SIZE	equ 16384
 i8254x_MAX_DESC		equ 16		; Must be 16, 32, 64, 128, etc.

src/syscalls/net.asm

@@ -50,6 +50,9 @@ b_net_tx:
 	cmp byte [os_NetEnabled], 1	; Check if networking is enabled
 	jne b_net_tx_fail
 
+	shl edx, 7			; Quick multiply by 128
+	add edx, net_table		; Add offset to net_table
+
 b_net_tx_maxcheck:
 	cmp rcx, 1522			; Fail if more than 1522 bytes
 	ja b_net_tx_fail
@@ -63,15 +66,13 @@ b_net_tx_maxcheck:
 	call os_virt_to_phys
 	xchg rax, rsi
 
-; TODO - This should be per interface
-;	inc qword [os_net_TXPackets]
-;	add qword [os_net_TXBytes], rcx
-
 	; Call the driver transmit function
-	shl edx, 7			; Quick multiply by 128
-	add edx, net_table		; Add offset to net_table
 	call [rdx+0x20]			; Call driver transmit function passing RDX as interface
 
+	; Increment interface counters
+	inc qword [rdx+0x40]		; Increment TXPackets
+	add qword [rdx+0x48], rcx	; Increment TXBytes
+
 ; TODO - This should be per interface
 	mov rax, os_NetLock
 	call b_smp_unlock
@@ -101,22 +102,26 @@ b_net_rx:
 	cmp byte [os_NetEnabled], 1	; Check if networking is enabled
 	jne b_net_rx_nodata
 
-	; Call the driver poll function
 	shl edx, 7			; Quick multiply by 128
 	add edx, net_table		; Add offset to net_table
+
+	; Call the driver poll function
 	call [rdx+0x28]			; Call driver poll function passing RDX as interface
 
 	cmp cx, 0
 	je b_net_rx_nodata
-; TODO - This should be per interface
-;	inc qword [os_net_RXPackets]
-;	add qword [os_net_RXBytes], rcx
+
+	; Increment interface counters
+	inc qword [rdx+0x50]		; Increment RXPackets
+	add qword [rdx+0x58], rcx	; Increment RXBytes
 
 	mov rsi, os_PacketBuffers	; Packet exists here
 	push rcx
 	rep movsb			; Copy packet to requested address
 	pop rcx
 
+; TODO is b_net_rx_nodata needed if CX is already set
+b_net_rx_end:
 	pop rax
 	pop rdx
 	pop rsi

src/sysvar.asm

@@ -183,6 +183,13 @@ net_table:		equ os_SystemVariables + 0xA000
 ; 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
 
 
 ; Misc