From 797f475dbaae2cdd215c9cb6fa3e9ac02a02af1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 30 Apr 2009 00:04:08 +0000
Subject: [PATCH] If I got it right this should enable switching the ata vs ide
 stack by just adding HAIKU_ATA_STACK = 1 ; in your UserBuildConfig.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30496 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage              | 22 ++++++++++++++++++----
 src/add-ons/kernel/busses/Jamfile |  9 +++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b218f497d2..2f535b8577 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -18,6 +18,15 @@ if $(INCLUDE_GPL_ADDONS) = 1 {
 	GPL_ONLY = "" ;
 }
 
+#HACK: remove when old ide code is removed!
+local ATA_ONLY = ;
+local IDE_ONLY = ;
+if $(HAIKU_ATA_STACK) = 1 {
+	ATA_ONLY = "" ;
+} else {
+	IDE_ONLY = "" ;
+}
+
 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp comm compress copyattr CortexAddOnHost cp
@@ -138,7 +147,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
 	$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
 ;
 #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
-SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa $(IDE_ONLY)ide $(ATA_ONLY)ata scsi
 	config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
@@ -151,8 +160,13 @@ AddFilesToHaikuImage system add-ons kernel bus_managers
 	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
 AddFilesToHaikuImage system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
+if $(HAIKU_ATA_STACK) = 1 {
 AddFilesToHaikuImage system add-ons kernel busses ide
 	: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
+} else {
+AddFilesToHaikuImage system add-ons kernel busses ata
+	: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
+}
 AddFilesToHaikuImage system add-ons kernel busses scsi
 	: ahci ;
 AddFilesToHaikuImage system add-ons kernel busses usb
@@ -164,7 +178,7 @@ AddFilesToHaikuImage system add-ons kernel debugger
 AddFilesToHaikuImage system add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToHaikuImage system add-ons kernel generic
-	: dpc ide_adapter locked_pool mpu401 scsi_periph ;
+	: dpc $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool mpu401 scsi_periph ;
 AddFilesToHaikuImage system add-ons kernel partitioning_systems
 	: intel session ;
 AddFilesToHaikuImage system add-ons kernel interrupt_controllers
@@ -407,9 +421,9 @@ AddFilesToHaikuImage system : haiku_loader ;
 
 # boot module links
 AddBootModuleSymlinksToHaikuImage
-	$(X86_ONLY)acpi pci $(X86_ONLY)isa config_manager ide scsi usb
+	$(X86_ONLY)acpi pci $(X86_ONLY)isa config_manager $(IDE_ONLY)ide $(ATA_ONLY)ata scsi usb
 	$(PPC_ONLY)openpic
-	ide_adapter locked_pool scsi_periph
+	$(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph
 	ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa
 	<usb>uhci <usb>ohci <usb>ehci
 	scsi_cd scsi_disk usb_disk
diff --git a/src/add-ons/kernel/busses/Jamfile b/src/add-ons/kernel/busses/Jamfile
index 1ff2887c90..006690d842 100644
--- a/src/add-ons/kernel/busses/Jamfile
+++ b/src/add-ons/kernel/busses/Jamfile
@@ -1,7 +1,12 @@
 SubDir HAIKU_TOP src add-ons kernel busses ; 
 
-#SubInclude HAIKU_TOP src add-ons kernel busses ata ;
-SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ;
+# HACK: remove this when the old ide code is removed!
+if $(HAIKU_ATA_STACK) {
+SubInclude HAIKU_TOP src add-ons kernel busses ata ;
+} else {
 SubInclude HAIKU_TOP src add-ons kernel busses ide ;
+}
+
+SubInclude HAIKU_TOP src add-ons kernel busses agp_gart ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi ;
 SubInclude HAIKU_TOP src add-ons kernel busses usb ;