NVS reorg and Virtio-SCSI driver start

Author: Ian Seyler

src/drivers.asm

@@ -31,7 +31,9 @@
 %include "drivers/nvs/ahci.asm"
 %endif
 %ifndef NO_VIRTIO
+%include "drivers/nvs/virtio.asm"
 %include "drivers/nvs/virtio-blk.asm"
+%include "drivers/nvs/virtio-scsi.asm"
 %endif
 
 ; Network

src/drivers/nvs/ahci.asm

@@ -7,7 +7,7 @@
 
 
 ; -----------------------------------------------------------------------------
-ahci_init:
+nvs_ahci_init:
 	push rsi			; Used in init_storage
 	push rdx			; RDX should already point to a supported device for os_bus_read/write
 
@@ -176,9 +176,9 @@ ahci_init_search_ports_done:
 ahci_init_done:
 	bts word [os_nvsVar], 1	; Set the bit flag that AHCI has been initialized
 	mov rdi, os_nvs_io
-	mov eax, ahci_io
+	mov eax, nvs_ahci_io
 	stosq
-	mov eax, ahci_id
+	mov eax, nvs_ahci_id
 	stosq
 	pop rdx
 	pop rsi
@@ -203,7 +203,7 @@ ahci_init_error:
 ;	RDI = memory location used for reading/writing data from/to device
 ; OUT:	Nothing
 ;	All other registers preserved
-ahci_io:
+nvs_ahci_io:
 	push r8
 	push rdx
 	push rbx
@@ -354,7 +354,7 @@ achi_io_error:
 ; IN:	RDX = Port # to query
 ;	RDI = memory location to store details (512 bytes)
 ; OUT:	Nothing, all registers preserved
-ahci_id:
+nvs_ahci_id:
 	push rdi
 	push rsi
 	push rdx

src/drivers/nvs/nvme.asm

@@ -7,7 +7,7 @@
 
 
 ; -----------------------------------------------------------------------------
-nvme_init:
+nvs_nvme_init:
 	push rsi			; Used in init_storage
 	push rdx			; RDX should already point to a supported device for os_bus_read/write
 
@@ -174,9 +174,9 @@ nvme_init_LBA_end:
 nvme_init_done:
 	bts word [os_nvsVar], 0	; Set the bit flag that NVMe has been initialized
 	mov rdi, os_nvs_io
-	mov eax, nvme_io
+	mov eax, nvs_nvme_io
 	stosq
-	mov eax, nvme_id
+	mov eax, nvs_nvme_id
 	stosq
 	pop rdx
 	pop rsi
@@ -193,15 +193,15 @@ nvme_init_error:
 
 
 ; -----------------------------------------------------------------------------
-; nvme_admin -- Perform an Admin operation on a NVMe controller
+; nvs_nvme_admin -- Perform an Admin operation on a NVMe controller
 ; IN:	EAX = CDW0
 ;	EBX = CDW1
 ;	ECX = CDW10
 ;	EDX = CDW11
 ;	RDI = CDW6-7
 ; OUT:	Nothing
 ;	All other registers preserved
-nvme_admin:
+nvs_nvme_admin:
 	push r9
 	push rdi
 	push rdx
@@ -278,15 +278,15 @@ nvme_admin_wait:
 
 
 ; -----------------------------------------------------------------------------
-; nvme_io -- Perform an I/O operation on a NVMe device
+; nvs_nvme_io -- Perform an I/O operation on a NVMe device
 ; IN:	RAX = starting sector #
 ;	RBX = I/O Opcode
 ;	RCX = number of sectors
 ;	RDX = drive #
 ;	RDI = memory location used for reading/writing data from/to device
 ; OUT:	Nothing
 ;	All other registers preserved
-nvme_io:
+nvs_nvme_io:
 	push rdi
 	push rcx
 	push rbx
@@ -417,12 +417,12 @@ nvme_io_error:
 
 
 ; -----------------------------------------------------------------------------
-; nvme_id -- Identify a NVMe device
+; nvs_nvme_id -- Identify a NVMe device
 ; IN:	RBX = NameSpace ID
 ;	RDI = memory location to store data
 ; OUT:	Nothing
 ;	All other registers preserved
-nvme_id:
+nvs_nvme_id:
 	ret
 ; -----------------------------------------------------------------------------
 

src/drivers/nvs/virtio-blk.asm

@@ -7,29 +7,12 @@
 
 
 ; -----------------------------------------------------------------------------
-virtio_blk_init:
+nvs_virtio_blk_init:
 	push rsi
 	push rdx			; RDX should already point to a supported device for os_bus_read/write
 	push rbx
 	push rax
 
-	; Verify this driver supports the Vendor
-	mov eax, [rsi+4]		; Offset to Vendor/Device ID in the Bus Table
-	mov rsi, virtio_blk_driverid
-	mov bx, [rsi]			; Load the Vendor (0x1AF4)
-	cmp ax, bx
-	jne virtio_blk_init_error	; Bail out if it wasn't a match
-
-	; Verify this driver support the Device
-	shr eax, 16			; Move Device ID into AX
-virtio_blk_init_next_dev:
-	add rsi, 2
-	mov bx, [rsi]			; Load the Device
-	cmp bx, 0			; End of list?
-	je virtio_blk_init_error	; If so, bail out
-	cmp ax, bx			; Check against the list
-	jne virtio_blk_init_next_dev	; No match? Try next entry
-
 	; Grab the Base I/O Address of the device
 	mov al, 4			; Read BAR4
 	call os_bus_read_bar
@@ -202,9 +185,9 @@ virtio_blk_init_pop:
 virtio_blk_init_done:
 	bts word [os_nvsVar], 3	; Set the bit flag that Virtio Block has been initialized
 	mov rdi, os_nvs_io		; Write over the storage function addresses
-	mov eax, virtio_blk_io
+	mov eax, nvs_virtio_blk_io
 	stosq
-	mov eax, virtio_blk_id
+	mov eax, nvs_virtio_blk_id
 	stosq
 	pop rax
 	pop rbx
@@ -225,15 +208,15 @@ virtio_blk_init_error:
 
 
 ; -----------------------------------------------------------------------------
-; virtio_blk_io -- Perform an I/O operation on a VIRTIO Block device
+; nvs_virtio_blk_io -- Perform an I/O operation on a VIRTIO Block device
 ; IN:	RAX = starting sector #
 ;	RBX = I/O Opcode
 ;	RCX = number of sectors
 ;	RDX = drive #
 ;	RDI = memory location used for reading/writing data from/to device
 ; OUT:	Nothing
 ;	All other registers preserved
-virtio_blk_io:
+nvs_virtio_blk_io:
 	push r9
 	push rdi
 	push rdx
@@ -331,15 +314,15 @@ virtio_blk_io_wait:
 
 
 ; -----------------------------------------------------------------------------
-; virtio_blk_id --
+; nvs_virtio_blk_id --
 ; IN:	EAX = CDW0
 ;	EBX = CDW1
 ;	ECX = CDW10
 ;	EDX = CDW11
 ;	RDI = CDW6-7
 ; OUT:	Nothing
 ;	All other registers preserved
-virtio_blk_id:
+nvs_virtio_blk_id:
 	ret
 ; -----------------------------------------------------------------------------
 
@@ -349,13 +332,6 @@ notify_offset_multiplier: dq 0
 descindex: dw 0
 availindex: dw 1
 
-; Driver
-virtio_blk_driverid:
-dw 0x1AF4				; Vendor ID
-dw 0x1001				; Device ID - legacy
-dw 0x1042				; Device ID - v1.0
-dw 0x0000				; End of list
-
 align 16
 footer:
 db 0x00