i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: Remove old IDE bus + stack.

Browse Source 
* Hasn't been used for quite some time
* Everything was ported over to a new ATA stack
  some time ago.
* No huge regressions were seen from the new ATA
  stack.
This commit is contained in:
Alexander von Gluck IV
2017-06-28 08:13:37 -05:00
parent 85b0c3209d
commit 7600fdd8e2
28 changed files with 23 additions and 5941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+2 -8
View File
@@ -672,11 +672,5 @@ if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
EnableBuildFeatures gpl ;
}
# ATA vs. IDE
#HACK: remove when old ide code is removed!
if $(HAIKU_ATA_STACK) = 1 {
EnableBuildFeatures ata ;
} else {
EnableBuildFeatures ide ;
}
# ATA Drivers + Bus
EnableBuildFeatures ata ;
build/jam/BuildSetup
-3
View File
@@ -160,14 +160,11 @@ if $(HAIKU_INCLUDE_PATENTED_CODE) {
+= HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ;
}
HAIKU_ATA_STACK ?= 1 ;
# network libraries
HAIKU_NETWORK_LIBS = network ;
HAIKU_NETAPI_LIB = bnetapi ;
HAIKU_SELECT_UNAME_ETC_LIB = ; # libroot, against which we link anyway
HAIKU_EXECUTABLE_MIME_TYPE = "application/x-vnd.Be-elfexecutable" ;
# TODO: The version stuff should probably go into a separate file and be made
build/jam/images/FloppyBootImage
+6 -12
View File
@@ -27,7 +27,7 @@ if $(NET_BOOT) = 1 {
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
acpi@x86,x86_64 ata@ata config_manager dpc pci
ide@ide isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm
isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm
] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS =
attribute_overlay bfs iso9660 packagefs write_overlay
@@ -37,15 +37,9 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS =
AddFilesToFloppyBootArchive system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToFloppyBootArchive system add-ons kernel busses ata
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
it8211 ;
} else {
AddFilesToFloppyBootArchive system add-ons kernel busses ide
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
it8211 ;
}
AddFilesToFloppyBootArchive system add-ons kernel busses ata
: generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
it8211 ;
AddFilesToFloppyBootArchive system add-ons kernel busses scsi
: ahci ;
@@ -53,7 +47,7 @@ AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
AddFilesToFloppyBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive system add-ons kernel generic
: ata_adapter@ata ide_adapter@ide locked_pool scsi_periph ;
: ata_adapter@ata locked_pool scsi_periph ;
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ;
AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
@@ -113,7 +107,7 @@ if $(NET_BOOT) = 1 {
AddBootModuleSymlinksToFloppyBootArchive [ FFilterByBuildFeatures
$(SYSTEM_ADD_ONS_BUS_MANAGERS)
openpic@ppc
ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
ata_adapter@ata locked_pool scsi_periph
generic_x86@x86
ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata
it8211
build/jam/images/NetBootArchive
+3 -3
View File
@@ -20,7 +20,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
#vlance
] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
pci isa@x86 ide@ide ata@ata
pci isa@x86 ata@ata
scsi config_manager agp_gart
] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs packagefs ;
@@ -40,7 +40,7 @@ AddFilesToNetBootArchive system add-ons kernel console
AddFilesToNetBootArchive system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToNetBootArchive system add-ons kernel generic
: ide_adapter@ide ata_adapter@ata locked_pool scsi_periph ;
: ata_adapter@ata locked_pool scsi_periph ;
AddFilesToNetBootArchive system add-ons kernel partitioning_systems
: intel session ;
AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
@@ -88,7 +88,7 @@ AddBootModuleSymlinksToNetBootArchive
$(SYSTEM_ADD_ONS_BUS_MANAGERS)
ahci generic_ide_pci ide_isa@x86 silicon_image_3112
$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
ide_adapter@ide ata_adapter@ata locked_pool scsi_periph
ata_adapter@ata locked_pool scsi_periph
intel session
openpic@ppc
generic_x86@x86
build/jam/images/definitions/minimum
+2 -2
View File
@@ -11,7 +11,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
ftp@libedit ftpd
getarch groupadd groupdel groupmod
hd hey
ideinfo@ide idestatus@ide ifconfig iroster isvolume
ifconfig iroster isvolume
kernel_debugger keymap keystore
launch_roster linkcatkeys listarea listattr listimage listdev listfont
listport listres listsem listusb locale logger login lsindex
@@ -222,7 +222,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
acpi@x86,x86_64 agp_gart@x86,x86_64 ata@ata
config_manager
firewire@x86
ide@ide scsi isa@x86,x86_64
scsi isa@x86,x86_64
pci ps2@x86,x86_64
random
usb
build/jam/packages/Haiku
+4 -9
View File
@@ -30,13 +30,8 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
} else {
AddFilesToPackage add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
}
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
AddFilesToPackage add-ons kernel busses random : virtio_rng ;
AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
@@ -50,7 +45,7 @@ AddFilesToPackage add-ons kernel debugger
<kdebug>run_on_exit ;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic
: ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
: ata_adapter@ata bios@x86,x86_64 dpc
locked_pool mpu401 scsi_periph <module>tty ;
AddFilesToPackage add-ons kernel partitioning_systems
: amiga_rdb@m68k apple@ppc efi_gpt intel session ;
@@ -198,7 +193,7 @@ AddBootModuleSymlinksToPackage
dpc
efi_gpt
generic_ide_pci
ide@ide ide_adapter@ide ide_isa@x86 isa@x86,x86_64 intel it8211
ide_isa@x86 isa@x86,x86_64 intel it8211
legacy_sata locked_pool
openpic@ppc
packagefs pci
build/jam/packages/HaikuBootstrap
+5 -10
View File
@@ -30,13 +30,8 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
if $(HAIKU_ATA_STACK) = 1 {
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
} else {
AddFilesToPackage add-ons kernel busses ide
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
}
AddFilesToPackage add-ons kernel busses ata
: generic_ide_pci it8211 legacy_sata silicon_image_3112 ide_isa@x86 ;
AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
@@ -48,7 +43,7 @@ AddFilesToPackage add-ons kernel debugger
<kdebug>run_on_exit ;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic
: ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
: ata_adapter@ata bios@x86,x86_64 dpc
locked_pool mpu401 scsi_periph <module>tty ;
AddFilesToPackage add-ons kernel partitioning_systems
: amiga_rdb@m68k apple@ppc efi_gpt intel session ;
@@ -169,9 +164,9 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
# boot module links
AddBootModuleSymlinksToPackage
acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc
ide@ide scsi usb
scsi usb
openpic@ppc
ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
ata_adapter@ata locked_pool scsi_periph
ahci generic_ide_pci it8211 legacy_sata silicon_image_3112
ide_isa@x86
<usb>uhci <usb>ohci <usb>ehci