Remove legacy ATA driver

Author: Ian Seyler

README.md

@@ -54,7 +54,6 @@ BareMetal provides basic support for symmetric multiprocessing, network, and sto
 * Storage
   * NVMe
   * AHCI (SATA)
-  * IDE
   * Virtio-Blk
 * HID (Human Interface Devices)
   * Input

build.sh

@@ -7,7 +7,6 @@ BUILDFLAGS="-dNO_VGA"
 # NVS
 # -dNO_NVME	Remove NVMe driver
 # -dNO_AHCI	Remove ACHI (SATA) driver
-# -dNO_ATA	Remove legacy ATA driver
 # NET
 # -dNO_I8254X	Remove i8254x Gigabit driver
 # -dNO_I8257X	Remove i8257x Gigabit driver

src/drivers.asm

@@ -33,9 +33,6 @@
 %ifndef NO_VIRTIO
 %include "drivers/nvs/virtio-blk.asm"
 %endif
-%ifndef NO_ATA
-%include "drivers/nvs/ata.asm"
-%endif
 
 ; Network
 %ifndef NO_I8254X

src/drivers/nvs/ata.asm

@@ -39,10 +39,6 @@ init_nvs_check_bus:
 	mov ax, [rsi]			; Load Class Code / Subclass Code
 	cmp ax, 0xFFFF			; Check if at end of list
 	je init_nvs_done		; No storage controller found
-%ifndef NO_ATA
-	cmp ax, 0x0101			; Mass Storage Controller (01) / ATA Controller (01)
-	je init_nvs_ata
-%endif
 %ifndef NO_AHCI
 	cmp ax, 0x0106			; Mass Storage Controller (01) / SATA Controller (06)
 	je init_nvs_ahci
@@ -77,14 +73,6 @@ init_nvs_virtio_blk:
 	jmp init_nvs_done
 %endif
 
-%ifndef NO_ATA
-init_nvs_ata:
-	sub rsi, 8			; Move RSI back to start of Bus record
-	mov edx, [rsi]			; Load value for os_bus_read/write
-	call ata_init
-	jmp init_nvs_done
-%endif
-
 init_nvs_done:
 
 %ifndef NO_LFB

src/init/nvs.asm

@@ -71,7 +71,7 @@ app_start:		equ 0xFFFF800000000000	; Location of application memory
 ; DQ - Starting at offset 0, increments by 8
 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_SysConfEn:		equ os_SystemVariables + 0x0010	; Enabled bits: 0=PS/2 Keyboard, 2=Serial, 4=HPET, 5=xHCI
 os_StackBase:		equ os_SystemVariables + 0x0020
 os_PacketBase:		equ os_SystemVariables + 0x0028
 sys_timer:		equ os_SystemVariables + 0x0048
@@ -102,7 +102,7 @@ os_xhci_int0_count:	equ os_SystemVariables + 0x011C	; Incremented on xHCI Interr
 ; DW - Starting at offset 512, increments by 2
 os_NumCores:		equ os_SystemVariables + 0x0200
 os_CoreSpeed:		equ os_SystemVariables + 0x0202
-os_nvsVar:		equ os_SystemVariables + 0x0208	; Bit 0 for NVMe, 1 for AHCI, 2 for ATA, 3 for Virtio Block
+os_nvsVar:		equ os_SystemVariables + 0x0208	; Bit 0 for NVMe, 1 for AHCI, 2 for Virtio SCSI, 3 for Virtio Block
 os_screen_x:		equ os_SystemVariables + 0x020A
 os_screen_y:		equ os_SystemVariables + 0x020C
 os_screen_ppsl:		equ os_SystemVariables + 0x020E