From dc80fc524437a88ef31afef26b0bd506cf3474a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 28 Apr 2009 23:04:39 +0000 Subject: [PATCH] Pass ATA_STACK from jam now, so one can override it with HAIKU_ATA_STACK=1 in their UserBuildConfig. Probably needs to conditionalize some targets on it too... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30478 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 1 + src/add-ons/kernel/generic/ide_adapter/Jamfile | 4 ++++ src/add-ons/kernel/generic/ide_adapter/ide_adapter.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index b97ba69cdb..3c31b67469 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -203,6 +203,7 @@ HAIKU_ARCH ?= $(HAIKU_CPU) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; +HAIKU_ATA_STACK ?= 0 ; # directories HAIKU_OBJECT_BASE_DIR = [ FDirName $(HAIKU_OBJECT_DIR) haiku ] ; diff --git a/src/add-ons/kernel/generic/ide_adapter/Jamfile b/src/add-ons/kernel/generic/ide_adapter/Jamfile index 83d8b92d3b..c1a05f9082 100644 --- a/src/add-ons/kernel/generic/ide_adapter/Jamfile +++ b/src/add-ons/kernel/generic/ide_adapter/Jamfile @@ -2,6 +2,10 @@ SubDir HAIKU_TOP src add-ons kernel generic ide_adapter ; UsePrivateHeaders drivers kernel ; +local defines = [ FDefines ATA_STACK=$(HAIKU_ATA_STACK) ] ; +SubDirCcFlags $(defines) ; +SubDirC++Flags $(defines) ; + KernelAddon ide_adapter : ide_adapter.c ; diff --git a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c index ab791cea66..732ce25710 100644 --- a/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c +++ b/src/add-ons/kernel/generic/ide_adapter/ide_adapter.c @@ -32,7 +32,7 @@ #define TRACE dprintf // set this to 1 for the ata stack, or 0 for the ide stack -#define ATA_STACK 0 +// #define ATA_STACK 0 static ide_for_controller_interface *ide; static device_manager_info *pnp;