diff options
Diffstat (limited to 'src/usr/hwpf')
19 files changed, 25 insertions, 119 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C index b955a0f59..9a87e0bbd 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C +++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C index 5cddd5adc..3ed8bfa38 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C +++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C index ca455cf1b..879821424 100644 --- a/src/usr/hwpf/hwp/core_activate/core_activate.C +++ b/src/usr/hwpf/hwp/core_activate/core_activate.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C index 766232947..1ab3e494c 100644 --- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C +++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C @@ -48,15 +48,7 @@ #include <initservice/isteps_trace.H> // targeting support. -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> - +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C index b2b252b62..cf293ccd4 100644 --- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C +++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C index d49d10ada..80bff34aa 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.C +++ b/src/usr/hwpf/hwp/dram_training/dram_training.C @@ -45,20 +45,13 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> +#include <targeting/common/util.H> // fapi support #include <fapi.H> #include <fapiPlatHwpInvoker.H> -#include <targeting/util.H> const uint8_t UNLIMITED_RUN = 0xFF; const uint8_t VPO_NUM_OF_MBAS_TO_RUN = 1; const uint8_t VPO_NUM_OF_MEMBUF_TO_RUN = 1; diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C index 4e8ca3dee..ca7c6b246 100644 --- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C +++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C index a517ce5a4..0f9015739 100644 --- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C +++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/fapiTestHwpAttr.C b/src/usr/hwpf/hwp/fapiTestHwpAttr.C index 731c82720..0d22b984b 100755 --- a/src/usr/hwpf/hwp/fapiTestHwpAttr.C +++ b/src/usr/hwpf/hwp/fapiTestHwpAttr.C @@ -45,9 +45,7 @@ */ #include <fapiTestHwpAttr.H> -#include <targeting/targetservice.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/iterators/rangefilter.H> +#include <targeting/common/commontargeting.H> extern "C" { diff --git a/src/usr/hwpf/hwp/load_payload/load_payload.C b/src/usr/hwpf/hwp/load_payload/load_payload.C index ee2531d1c..403f962eb 100644 --- a/src/usr/hwpf/hwp/load_payload/load_payload.C +++ b/src/usr/hwpf/hwp/load_payload/load_payload.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/mc_init/mc_init.C b/src/usr/hwpf/hwp/mc_init/mc_init.C index abfcf6200..10ba1fca3 100644 --- a/src/usr/hwpf/hwp/mc_init/mc_init.C +++ b/src/usr/hwpf/hwp/mc_init/mc_init.C @@ -45,12 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicates.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C index 8e6611d8e..333609205 100644 --- a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C +++ b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C @@ -41,13 +41,8 @@ #include <initservice/taskargs.H> #include <errl/errlentry.H> #include <initservice/isteps_trace.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> #include <fapi.H> -#include <targeting/target.H> #include <fapiPoreVeArg.H> #include <fapiTarget.H> #include <fapi.H> @@ -55,10 +50,9 @@ #include <list> #include "sbe_centaur_init.H" -//@todo - These two include files are to workaround -//1. Avoid running test case in VBU -//2. To call isSlavePresent(). Need to be removed when PD works. -#include <targeting/util.H> +//@todo - The following workarounds need to be readdressed +//1. Avoid running test case in VBU below +//2. To call isSlavePresent(). Need to remove following header when PD works. #include <fsi/fsiif.H> // Extern function declaration diff --git a/src/usr/hwpf/hwp/start_clocks_on_nest_chiplets/start_clocks_on_nest_chiplets.C b/src/usr/hwpf/hwp/start_clocks_on_nest_chiplets/start_clocks_on_nest_chiplets.C index dec4dd82b..ee378ac89 100644 --- a/src/usr/hwpf/hwp/start_clocks_on_nest_chiplets/start_clocks_on_nest_chiplets.C +++ b/src/usr/hwpf/hwp/start_clocks_on_nest_chiplets/start_clocks_on_nest_chiplets.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C index 85061f667..ecc2ba3e9 100644 --- a/src/usr/hwpf/hwp/start_payload/start_payload.C +++ b/src/usr/hwpf/hwp/start_payload/start_payload.C @@ -45,14 +45,7 @@ #include <initservice/isteps_trace.H> // targeting support -#include <targeting/attributes.H> -#include <targeting/entitypath.H> -#include <targeting/target.H> -#include <targeting/targetservice.H> -#include <targeting/iterators/rangefilter.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/predicates/predicatepostfixexpr.H> -#include <targeting/predicates/predicateisfunctional.H> +#include <targeting/common/commontargeting.H> // fapi support #include <fapi.H> diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index b7a0e1904..72c4a5b3e 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -33,7 +33,7 @@ //****************************************************************************** #include <hwpf/fapi/fapiTarget.H> -#include <targeting/targetservice.H> +#include <targeting/common/targetservice.H> #include <errl/errlentry.H> #include <hwpf/plat/fapiPlatAttributeService.H> #include <hwpf/plat/fapiPlatReasonCodes.H> diff --git a/src/usr/hwpf/plat/fapiPlatHwAccess.C b/src/usr/hwpf/plat/fapiPlatHwAccess.C index c2a3d143b..1464ff906 100644 --- a/src/usr/hwpf/plat/fapiPlatHwAccess.C +++ b/src/usr/hwpf/plat/fapiPlatHwAccess.C @@ -53,12 +53,11 @@ #include <fapiPlatTrace.H> #include <fapiPlatHwAccess.H> #include <errl/errlentry.H> -#include <targeting/targetservice.H> #include <devicefw/userif.H> #include <ecmdDataBufferBase.H> #include <fapiPlatReasonCodes.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/targetservice.H> +#include <targeting/common/predicates/predicates.H> +#include <targeting/common/targetservice.H> extern "C" { diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C index 4e86de714..f96ab4a8d 100644 --- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C +++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C @@ -32,8 +32,8 @@ #include <fapiSystemConfig.H> #include <fapiPlatReasonCodes.H> #include <errl/errlentry.H> -#include <targeting/targetservice.H> -#include <targeting/predicates/predicatectm.H> +#include <targeting/common/targetservice.H> +#include <targeting/common/predicates/predicates.H> extern "C" { diff --git a/src/usr/hwpf/plat/fapiPlatTarget.C b/src/usr/hwpf/plat/fapiPlatTarget.C index bd84316ab..50a5d873b 100644 --- a/src/usr/hwpf/plat/fapiPlatTarget.C +++ b/src/usr/hwpf/plat/fapiPlatTarget.C @@ -38,7 +38,7 @@ #include <fapiTarget.H> #include <fapiPlatTrace.H> -#include <targeting/target.H> +#include <targeting/common/attributes.H> #include <string.h> namespace fapi diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H index e482f4caa..ee308701c 100644 --- a/src/usr/hwpf/test/hwpftest.H +++ b/src/usr/hwpf/test/hwpftest.H @@ -34,11 +34,9 @@ #include <fapiPlatHwpInvoker.H> #include <errl/errlentry.H> #include <errl/errlmanager.H> -#include <targeting/targetservice.H> +#include <targeting/common/commontargeting.H> #include <fapiHwpExecInitFile.H> #include <spd/spdenums.H> -#include <targeting/predicates/predicatectm.H> -#include <targeting/iterators/rangefilter.H> using namespace fapi; using namespace TARGETING; |
