summaryrefslogtreecommitdiffstats
path: root/src/include/usr/isteps
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/usr/isteps')
-rw-r--r--src/include/usr/isteps/istep06list.H129
-rw-r--r--src/include/usr/isteps/istep07list.H94
-rw-r--r--src/include/usr/isteps/istep08list.H98
-rw-r--r--src/include/usr/isteps/istep09list.H41
-rw-r--r--src/include/usr/isteps/istep10list.H127
-rw-r--r--src/include/usr/isteps/istep11list.H173
-rw-r--r--src/include/usr/isteps/istep12list.H63
-rw-r--r--src/include/usr/isteps/istep13list.H110
-rw-r--r--src/include/usr/isteps/istep14list.H106
-rw-r--r--src/include/usr/isteps/istep15list.H49
-rw-r--r--src/include/usr/isteps/istep16list.H61
-rw-r--r--src/include/usr/isteps/istep18list.H130
-rw-r--r--src/include/usr/isteps/istep21list.H48
-rw-r--r--src/include/usr/isteps/istepmasterlist.H4
14 files changed, 242 insertions, 991 deletions
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 4ab331ac4..ac0a3d077 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -80,167 +80,90 @@ const TaskInfo g_istep06[] = {
{
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(06,01,""), // not used.
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(06,02,""), // not used.
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
- ISTEPNAME(06,03,"host_init_fsi"), // substep name
- HWAS::host_init_fsi, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP | MPIPL_OP,
- false, // true = check for attentions
- }
+ ISTEPNAME(06,03,"host_init_fsi"),
+ HWAS::host_init_fsi,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
{
ISTEPNAME(06,04,"host_set_ipl_parms"),
HWAS::host_set_ipl_parms,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
{
- ISTEPNAME(06,05,"host_discover_targets"), // substep name
- HWAS::host_discover_targets, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP | MPIPL_OP,
- false,
- }
+ ISTEPNAME(06,05,"host_discover_targets"),
+ HWAS::host_discover_targets,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
{
- ISTEPNAME(06,06, "host_gard"), // substep name
- HWAS::host_gard, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP | MPIPL_OP,
- false,
- }
+ ISTEPNAME(06,06, "host_gard"),
+ HWAS::host_gard,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
{
ISTEPNAME(06,07,"host_cancontinue_clear"),
HWAS::host_cancontinue_clear,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(06,08,"proc_revert_sbe_mcs_setup"),
SLAVE_SBE::call_proc_revert_sbe_mcs_setup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(06,09,"proc_cen_ref_clk_enable"),
SLAVE_SBE::call_proc_cen_ref_clk_enable,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(06,10,"host_slave_sbe_config"),
SLAVE_SBE::call_host_slave_sbe_config,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
{
ISTEPNAME(06,11,"host_sbe_start"),
SLAVE_SBE::call_host_sbe_start,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
{
ISTEPNAME(06,12,"proc_check_slave_sbe_seeprom_complete"),
SLAVE_SBE::call_proc_check_slave_sbe_seeprom_complete,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
{
ISTEPNAME(06,13,"proc_xmit_sbe"),
SLAVE_SBE::call_proc_xmit_sbe,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
- // END OF LIST!
};
-
const DepModInfo g_istep06Dependancies = {
{
DEP_LIB(libbuild_winkle_images.so), //proc_mailbox_utils
DEP_LIB(libslave_sbe.so),
DEP_LIB(libsbe.so),
- { 0 },
+ NULL
}
};
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep06TaskList = {
- &(g_istep06[0]),
- ( sizeof(g_istep06)/sizeof(TaskInfo) ),
- &(g_istep06Dependancies),
- };
-
+const ExtTaskInfo g_istep06TaskList = {
+ &(g_istep06[0]),
+ ( sizeof(g_istep06)/sizeof(TaskInfo) ),
+ &(g_istep06Dependancies),
+};
}; // end namespace
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index c407a963a..6b0682443 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -62,131 +62,71 @@
namespace INITSERVICE
{
const TaskInfo g_istep07[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(07,01,"proc_attr_update"),
NEST_CHIPLETS::call_proc_attr_update,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(07,02,"proc_a_x_pci_dmi_pll_initf"),
NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_initf,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
{
ISTEPNAME(07,03,"proc_a_x_pci_dmi_pll_setup"),
NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_setup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
{
ISTEPNAME(07,04,"proc_startclock_chiplets"),
NEST_CHIPLETS::call_proc_startclock_chiplets,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(07,05,"proc_chiplet_scominit"),
NEST_CHIPLETS::call_proc_chiplet_scominit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(07,06,"proc_xbus_scominit"),
NEST_CHIPLETS::call_proc_xbus_scominit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(07,07,"proc_abus_scominit"),
NEST_CHIPLETS::call_proc_abus_scominit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(07,08,"proc_pcie_scominit"),
NEST_CHIPLETS::call_proc_pcie_scominit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(07,09,"proc_scomoverride_chiplets"),
NEST_CHIPLETS::call_proc_scomoverride_chiplets,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
- // END OF LIST!
};
-const DepModInfo g_istep07Dependancies = {
+const DepModInfo g_istep07Dependancies = {
{
DEP_LIB(libnest_chiplets.so),
- { 0 },
+ NULL
}
};
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep07TaskList = {
- &(g_istep07[0]),
- ( sizeof(g_istep07)/sizeof(TaskInfo) ),
- &g_istep07Dependancies // later, depModules struct
+const ExtTaskInfo g_istep07TaskList = {
+ &(g_istep07[0]),
+ ( sizeof(g_istep07)/sizeof(TaskInfo) ),
+ &g_istep07Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index 77825284c..c5362c882 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -64,132 +64,66 @@
namespace INITSERVICE
{
const TaskInfo g_istep08[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(08,01,"fabric_erepair"),
EDI_EI_INITIALIZATION::call_fabric_erepair,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,02,"fabric_io_dccal"),
EDI_EI_INITIALIZATION::call_fabric_io_dccal,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,03,"fabric_pre_trainadv"),
EDI_EI_INITIALIZATION::call_fabric_pre_trainadv,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,04,"fabric_io_run_training"),
EDI_EI_INITIALIZATION::call_fabric_io_run_training,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,05,"fabric_post_trainadv"),
EDI_EI_INITIALIZATION::call_fabric_post_trainadv,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,06,"host_startprd_pbus"),
EDI_EI_INITIALIZATION::call_host_startprd_pbus,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,07,"host_attnlisten_proc"),
EDI_EI_INITIALIZATION::call_host_attnlisten_proc,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(08,08,"proc_fab_iovalid"),
EDI_EI_INITIALIZATION::call_proc_fab_iovalid,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
- // END OF LIST!
};
-const DepModInfo g_istep08Dependancies = {
+const DepModInfo g_istep08Dependancies = {
{
DEP_LIB(libedi_ei_initialization.so),
DEP_LIB(libdmi_training.so),
DEP_LIB(libnest_chiplets.so),
- { 0 },
+ NULL
}
};
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep08TaskList = {
- &(g_istep08[0]),
- ( sizeof(g_istep08)/sizeof(TaskInfo) ),
- &g_istep08Dependancies // later, depModules struct
+const ExtTaskInfo g_istep08TaskList = {
+ &(g_istep08[0]),
+ ( sizeof(g_istep08)/sizeof(TaskInfo) ),
+ &g_istep08Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H
index 87a018f21..cf6cb88ce 100644
--- a/src/include/usr/isteps/istep09list.H
+++ b/src/include/usr/isteps/istep09list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -53,42 +53,21 @@
namespace INITSERVICE
{
const TaskInfo g_istep09[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, //true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(09,01,"proc_build_smp"),
ACTIVATE_POWERBUS::call_proc_build_smp,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(09,02,"host_slave_sbe_update"),
ACTIVATE_POWERBUS::call_host_slave_sbe_update,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
- // END OF LIST!
};
const DepModInfo g_istep09Dependancies = {
@@ -97,16 +76,14 @@ const DepModInfo g_istep09Dependancies = {
DEP_LIB(libdram_initialization.so),
DEP_LIB(libsbe.so),
DEP_LIB(libbuild_winkle_images.so),
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep09TaskList = {
- &(g_istep09[0]),
- ( sizeof(g_istep09)/sizeof(TaskInfo) ),
- &g_istep09Dependancies // later, depModules struct
+const ExtTaskInfo g_istep09TaskList = {
+ &(g_istep09[0]),
+ ( sizeof(g_istep09)/sizeof(TaskInfo) ),
+ &g_istep09Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
index eea23b4f4..dd7ba50e1 100644
--- a/src/include/usr/isteps/istep10list.H
+++ b/src/include/usr/isteps/istep10list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -74,165 +74,84 @@ namespace INITSERVICE
{
const TaskInfo g_istep10[] = {
-
{
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(10,01,"host_prd_hwreconfig"),
HWAS::host_prd_hwreconfig,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,02,"cen_sbe_tp_chiplet_init1"),
SBE_CENTAUR_INIT::call_sbe_centaur_init,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,03,"cen_sbe_pll_initf"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,04,"cen_sbe_pll_setup"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
{
ISTEPNAME(10,05,"cen_sbe_tp_chiplet_init2"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,06,"cen_sbe_tp_arrayinit"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,07,"cen_sbe_tp_chiplet_init3"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,08,"cen_sbe_chiplet_init"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,09,"cen_sbe_tp_arrayinit"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,10,"cen_sbe_dts_init"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,11,"cen_sbe_initf"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,12,"cen_sbe_do_manual_inits"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(10,13,"cen_sbe_nest_startclocks"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
-
ISTEPNAME(10,14,"cen_sbe_scominits"),
HWAS::host_stub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
- // END OF LIST!
};
-const DepModInfo g_istep10Dependancies = {
+const DepModInfo g_istep10Dependancies = {
{
DEP_LIB(libsbe_centaur_init.so),
DEP_LIB(libfapiporeve.so),
@@ -240,16 +159,14 @@ const DepModInfo g_istep10Dependancies = {
DEP_LIB(libbuild_winkle_images.so),
DEP_LIB(libsbe.so),
DEP_LIB(libproc_hwreconfig.so),
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep10TaskList = {
- &(g_istep10[0]),
- ( sizeof(g_istep10)/sizeof(TaskInfo) ),
- &g_istep10Dependancies
+const ExtTaskInfo g_istep10TaskList = {
+ &(g_istep10[0]),
+ ( sizeof(g_istep10)/sizeof(TaskInfo) ),
+ &g_istep10Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H
index ac18b193a..28ff7e035 100644
--- a/src/include/usr/isteps/istep11list.H
+++ b/src/include/usr/isteps/istep11list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* COPYRIGHT International Business Machines Corp. 2011,2014 */
/* */
/* p1 */
/* */
@@ -73,171 +73,92 @@
namespace INITSERVICE
{
-
const TaskInfo g_istep11[] = {
-
{
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
- ISTEPNAME(11,01,"mss_getecid"), // substep name
- DMI_TRAINING::call_mss_getecid, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,01,"mss_getecid"),
+ DMI_TRAINING::call_mss_getecid,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,02,"dmi_attr_update"), // substep name
- DMI_TRAINING::call_dmi_attr_update, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,02,"dmi_attr_update"),
+ DMI_TRAINING::call_dmi_attr_update,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
{
- ISTEPNAME(11,03,"proc_dmi_scominit"), // substep name
- DMI_TRAINING::call_proc_dmi_scominit, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,03,"proc_dmi_scominit"),
+ DMI_TRAINING::call_proc_dmi_scominit,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
{
- ISTEPNAME(11,04,"dmi_scominit"), // substep name
- DMI_TRAINING::call_dmi_scominit, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,04,"dmi_scominit"),
+ DMI_TRAINING::call_dmi_scominit,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
{
- ISTEPNAME(11,05,"dmi_erepair"), // substep name
- DMI_TRAINING::call_dmi_erepair, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,05,"dmi_erepair"),
+ DMI_TRAINING::call_dmi_erepair,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,06,"dmi_io_dccal"), // substep name
- DMI_TRAINING::call_dmi_io_dccal, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,06,"dmi_io_dccal"),
+ DMI_TRAINING::call_dmi_io_dccal,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,07,"dmi_pre_trainadv"), // substep name
- DMI_TRAINING::call_dmi_pre_trainadv, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,07,"dmi_pre_trainadv"),
+ DMI_TRAINING::call_dmi_pre_trainadv,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,08,"dmi_io_run_training"), // substep name
- DMI_TRAINING::call_dmi_io_run_training, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,08,"dmi_io_run_training"),
+ DMI_TRAINING::call_dmi_io_run_training,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,09,"dmi_post_trainadv"), // substep name
- DMI_TRAINING::call_dmi_post_trainadv, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,09,"dmi_post_trainadv"),
+ DMI_TRAINING::call_dmi_post_trainadv,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,10,"proc_cen_framelock"), // substep name
- DMI_TRAINING::call_proc_cen_framelock, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,10,"proc_cen_framelock"),
+ DMI_TRAINING::call_proc_cen_framelock,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,11,"host_startprd_dmi"), // substep name
- DMI_TRAINING::call_host_startprd_dmi, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,11,"host_startprd_dmi"),
+ DMI_TRAINING::call_host_startprd_dmi,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,12,"host_attnlisten_cen"), // substep name
- DMI_TRAINING::call_host_attnlisten_cen, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,12,"host_attnlisten_cen"),
+ DMI_TRAINING::call_host_attnlisten_cen,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
- ISTEPNAME(11,13,"cen_set_inband_addr"), // substep name
- DMI_TRAINING::call_cen_set_inband_addr, // pointer to fn
- {
- START_FN, // task type
- EXT_IMAGE, // Extended Module
- NORMAL_IPL_OP,
- true,
- }
+ ISTEPNAME(11,13,"cen_set_inband_addr"),
+ DMI_TRAINING::call_cen_set_inband_addr,
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
- // END OF LIST!
};
-const DepModInfo g_istep11Dependancies = {
+const DepModInfo g_istep11Dependancies = {
{
DEP_LIB(libdmi_training.so),
DEP_LIB(libedi_ei_initialization.so),
DEP_LIB(libnest_chiplets.so),
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep11TaskList = {
- &(g_istep11[0]),
- ( sizeof(g_istep11)/sizeof(TaskInfo) ),
- &g_istep11Dependancies
+const ExtTaskInfo g_istep11TaskList = {
+ &(g_istep11[0]),
+ ( sizeof(g_istep11)/sizeof(TaskInfo) ),
+ &g_istep11Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index 93c7fbe65..6ec07ce9e 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -62,83 +62,46 @@ const TaskInfo g_istep12[] = {
{
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(12,01,"host_collect_dimm_spd"),
MC_CONFIG::call_host_collect_dimm_spd,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(12,02,"mss_volt"),
MC_CONFIG::call_mss_volt,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(12,03,"mss_freq"),
MC_CONFIG::call_mss_freq,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(12,04,"mss_eff_config"),
MC_CONFIG::call_mss_eff_config,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(12,05,"mss_attr_update"),
MC_CONFIG::call_mss_attr_update,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
- // END OF LIST!
};
-const DepModInfo g_istep12Dependancies = {
+const DepModInfo g_istep12Dependancies = {
{
DEP_LIB(libmc_config.so),
- { 0 },
+ NULL
}
};
-
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep12TaskList = {
- &(g_istep12[0]),
- ( sizeof(g_istep12)/sizeof(TaskInfo) ),
- &g_istep12Dependancies // later, depModules struct
+const ExtTaskInfo g_istep12TaskList = {
+ &(g_istep12[0]),
+ ( sizeof(g_istep12)/sizeof(TaskInfo) ),
+ &g_istep12Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index 4193f17bd..852b35e83 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -72,157 +72,85 @@
namespace INITSERVICE
{
const TaskInfo g_istep13[] = {
-
{
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(13,01,"host_disable_vddr"),
DRAM_TRAINING::call_host_disable_vddr,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,02,"mem_pll_initf"),
DRAM_TRAINING::call_mem_pll_initf,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,03,"mem_pll_setup"),
DRAM_TRAINING::call_mem_pll_setup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,04,"mem_startclocks"),
DRAM_TRAINING::call_mem_startclocks,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,05,"host_enable_vddr"),
DRAM_TRAINING::call_host_enable_vddr,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,06,"mss_scominit"),
DRAM_TRAINING::call_mss_scominit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,07,"mss_ddr_phy_reset"),
DRAM_TRAINING::call_mss_ddr_phy_reset,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,08,"mss_draminit"),
DRAM_TRAINING::call_mss_draminit,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,09,"mss_draminit_training"),
DRAM_TRAINING::call_mss_draminit_training,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,10,"mss_draminit_trainadv"),
DRAM_TRAINING::call_mss_draminit_trainadv,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,11,"mss_draminit_mc"),
DRAM_TRAINING::call_mss_draminit_mc,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(13,12,"mss_dimm_power_test"),
DRAM_TRAINING::call_mss_dimm_power_test,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
- // END OF LIST!
};
-const DepModInfo g_istep13Dependancies = {
+const DepModInfo g_istep13Dependancies = {
{
DEP_LIB(libdram_training.so),
DEP_LIB(libdram_initialization.so),
- { 0 },
+ NULL
}
};
-
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep13TaskList = {
- &(g_istep13[0]),
- ( sizeof(g_istep13)/sizeof(TaskInfo) ),
- &g_istep13Dependancies // later, depModules struct
+const ExtTaskInfo g_istep13TaskList = {
+ &(g_istep13[0]),
+ ( sizeof(g_istep13)/sizeof(TaskInfo) ),
+ &g_istep13Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index 8bb10ab89..f47608345 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -63,141 +63,71 @@
namespace INITSERVICE
{
const TaskInfo g_istep14[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(14,01,"host_startprd_dram"),
DRAM_INITIALIZATION::call_host_startprd_dram,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(14,02,"mss_extent_setup"),
DRAM_INITIALIZATION::call_mss_extent_setup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
{
ISTEPNAME(14,03,"mss_memdiag"),
DRAM_INITIALIZATION::call_mss_memdiag,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
{
ISTEPNAME(14,04,"mss_thermal_init"),
DRAM_INITIALIZATION::call_mss_thermal_init,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
{
ISTEPNAME(14,05,"proc_pcie_config"),
DRAM_INITIALIZATION::call_proc_pcie_config,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
{
ISTEPNAME(14,06,"mss_power_cleanup"),
DRAM_INITIALIZATION::call_mss_power_cleanup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
{
ISTEPNAME(14,07,"proc_setup_bars"),
DRAM_INITIALIZATION::call_proc_setup_bars,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
},
-
-
{
ISTEPNAME(14,08,"proc_exit_cache_contained"),
DRAM_INITIALIZATION::call_proc_exit_cache_contained,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
-
-
{
ISTEPNAME(14,09,"host_mpipl_service"),
DRAM_INITIALIZATION::call_host_mpipl_service,
- {
- START_FN,
- EXT_IMAGE,
- MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, MPIPL_OP, true }
},
+ };
-
- // END OF LIST!
-};
-
-const DepModInfo g_istep14Dependancies = {
+const DepModInfo g_istep14Dependancies = {
{
DEP_LIB(libdram_initialization.so),
DEP_LIB(libdram_training.so),
DEP_LIB(libdump.so),
- { 0 },
+ NULL
}
};
-
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep14TaskList = {
- &(g_istep14[0]),
- ( sizeof(g_istep14)/sizeof(TaskInfo) ),
- &g_istep14Dependancies // later, depModules struct
+const ExtTaskInfo g_istep14TaskList = {
+ &(g_istep14[0]),
+ ( sizeof(g_istep14)/sizeof(TaskInfo) ),
+ &g_istep14Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H
index e463d3ce5..eae652d07 100644
--- a/src/include/usr/isteps/istep15list.H
+++ b/src/include/usr/isteps/istep15list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -51,68 +51,41 @@
namespace INITSERVICE
{
const TaskInfo g_istep15[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(15,01,"host_build_winkle"),
BUILD_WINKLE_IMAGES::call_host_build_winkle,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
{
ISTEPNAME(15,02,"proc_set_pore_bar"),
BUILD_WINKLE_IMAGES::call_proc_set_pore_bar,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
{
ISTEPNAME(15,03,"p8_poreslw_init"),
BUILD_WINKLE_IMAGES::call_p8_poreslw_init,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
-
- // END OF LIST!
};
-const DepModInfo g_istep15Dependancies = {
+const DepModInfo g_istep15Dependancies = {
{
DEP_LIB(libocc.so),
DEP_LIB(libbuild_winkle_images.so),
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep15TaskList = {
- &(g_istep15[0]),
- ( sizeof(g_istep15)/sizeof(TaskInfo) ),
- &g_istep15Dependancies // later, depModules struct
+const ExtTaskInfo g_istep15TaskList = {
+ &(g_istep15[0]),
+ ( sizeof(g_istep15)/sizeof(TaskInfo) ),
+ &g_istep15Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index 43821c786..26b555936 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -57,84 +57,45 @@
namespace INITSERVICE
{
const TaskInfo g_istep16[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(16,01,"host_activate_master"),
CORE_ACTIVATE::call_host_activate_master,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
-
-
{
ISTEPNAME(16,02,"host_activate_slave_cores"),
CORE_ACTIVATE::call_host_activate_slave_cores,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- true,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
},
-
-
{
ISTEPNAME(16,03,"mss_scrub"),
CORE_ACTIVATE::call_mss_scrub,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
-
{
ISTEPNAME(16,04,"host_ipl_complete"),
CORE_ACTIVATE::call_host_ipl_complete,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP | MPIPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
},
-
-
- // END OF LIST!
};
-const DepModInfo g_istep16Dependancies = {
+const DepModInfo g_istep16Dependancies = {
{
DEP_LIB(libcore_activate.so),
DEP_LIB(libbuild_winkle_images.so),
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
const ExtTaskInfo g_istep16TaskList = {
- &(g_istep16[0]),
- ( sizeof(g_istep16)/sizeof(TaskInfo) ),
- &g_istep16Dependancies // later, depModules struct
+ &(g_istep16[0]),
+ ( sizeof(g_istep16)/sizeof(TaskInfo) ),
+ &g_istep16Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H
index 0d9720780..9701b1d54 100644
--- a/src/include/usr/isteps/istep18list.H
+++ b/src/include/usr/isteps/istep18list.H
@@ -52,183 +52,95 @@
namespace INITSERVICE
{
const TaskInfo g_istep18[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,01,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,02,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,03,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,04,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,05,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,06,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(18,07,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(18,08,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(18,09,"sys_proc_fab_iovalid"),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
-
ISTEPNAME(18,10,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(18,11,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(18,12,""),
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false,
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
{
ISTEPNAME(18,13,"proc_tod_setup"),
TOD::call_tod_setup,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
{
ISTEPNAME(18,14,"proc_tod_init"),
TOD::call_tod_init,
- {
- START_FN,
- EXT_IMAGE,
- NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
},
-
- // END OF LIST!
};
-const DepModInfo g_istep18Dependancies = {
+const DepModInfo g_istep18Dependancies = {
{
DEP_LIB(libtod_init.so),
- { 0 },
+ NULL
}
};
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep18TaskList = {
- &(g_istep18[0]),
- ( sizeof(g_istep18)/sizeof(TaskInfo) ),
- &g_istep18Dependancies // later, depModules struct
+const ExtTaskInfo g_istep18TaskList = {
+ &(g_istep18[0]),
+ ( sizeof(g_istep18)/sizeof(TaskInfo) ),
+ &g_istep18Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H
index 6a689b37c..5b64e65ba 100644
--- a/src/include/usr/isteps/istep21list.H
+++ b/src/include/usr/isteps/istep21list.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2013 */
+/* COPYRIGHT International Business Machines Corp. 2012,2014 */
/* */
/* p1 */
/* */
@@ -55,52 +55,26 @@
namespace INITSERVICE
{
const TaskInfo g_istep21[] = {
-
{
-
"", // dummy, index 0
NULL,
- {
- NONE,
- EXT_IMAGE,
- IPL_NOOP,
- false, // true = check for attentions
- }
+ { NONE, EXT_IMAGE, IPL_NOOP, false }
},
-
{
ISTEPNAME(21,01,"host_runtime_setup"),
START_PAYLOAD::call_host_runtime_setup,
- {
- START_FN,
- EXT_IMAGE,
- MPIPL_OP | NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false }
},
{
ISTEPNAME(21,02,"host_verify_hdat"),
START_PAYLOAD::call_host_verify_hdat,
- {
- START_FN,
- EXT_IMAGE,
- MPIPL_OP | NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false }
},
{
ISTEPNAME(21,03,"host_start_payload"),
START_PAYLOAD::call_host_start_payload,
- {
- START_FN,
- EXT_IMAGE,
- MPIPL_OP | NORMAL_IPL_OP,
- false,
- }
+ { START_FN, EXT_IMAGE, MPIPL_OP | NORMAL_IPL_OP, false }
},
-
-
- // END OF LIST!
};
const DepModInfo g_istep21Dependancies = {
@@ -115,16 +89,14 @@ const DepModInfo g_istep21Dependancies = {
DEP_LIB(libocc.so),
*/
- { 0 },
+ NULL
}
};
-
-// make a struct from the above with the number of items included
-const ExtTaskInfo g_istep21TaskList = {
- &(g_istep21[0]),
- ( sizeof(g_istep21)/sizeof(TaskInfo) ),
- &g_istep21Dependancies // later, depModules struct
+const ExtTaskInfo g_istep21TaskList = {
+ &(g_istep21[0]),
+ ( sizeof(g_istep21)/sizeof(TaskInfo) ),
+ &g_istep21Dependancies
};
}; // end namespace
diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H
index 74b296be8..66160c555 100644
--- a/src/include/usr/isteps/istepmasterlist.H
+++ b/src/include/usr/isteps/istepmasterlist.H
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* COPYRIGHT International Business Machines Corp. 2011,2014 */
/* */
/* p1 */
/* */
@@ -56,7 +56,7 @@
#include <initservice/initsvcstructs.H>
// macro to expand library dependancies
-#define DEP_LIB(x) { #x }
+#define DEP_LIB(x) #x
// ----- istep include files -----
OpenPOWER on IntegriCloud