src/hal/*: update header files to conform to new errhand lib

b368b98b · Lucas Russo · 3fba95b0 · b368b98b · b368b98b · b368b98b
Commit b368b98b authored Apr 16, 2015 by Lucas Russo
48 changed files
--- a/src/hal/dev_io/dev_io.c
+++ b/src/hal/dev_io/dev_io.c
@@ -5,8 +5,8 @@

 #include "czmq.h"
 #include "dev_io.h"
-#include "debug_print.h"
 #include "board.h"
+#include "errhand.h"
 #include "bpm_client.h"

 #define DEVIO_SERVICE_LEN           50

--- a/src/hal/dev_io/dev_io_cfg.c
+++ b/src/hal/dev_io/dev_io_cfg.c
@@ -5,7 +5,7 @@

 #include "czmq.h"
 #include "dev_io.h"
-#include "debug_print.h"
+#include "errhand.h"
 #include "board.h"

 #define DEVIO_SERVICE_LEN       50

--- a/src/hal/dev_io/dev_io_core.c
+++ b/src/hal/dev_io/dev_io_core.c
@@ -10,7 +10,7 @@

 #include "dev_io_core.h"
 #include "dev_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_mod_dispatch.h"
 #include "msg.h"
 #include "rw_param.h"
@@ -66,7 +66,7 @@ devio_t * devio_new (char *name, char *endpoint_dev, llio_type_e type,

    /* Set logfile available for all dev_mngr and dev_io instances.
     * We accept NULL as a parameter, meaning to suppress all messages */
-    debug_set_log (log_file_name, DEVIO_DFLT_LOG_MODE);
+    errhand_set_log (log_file_name, DEVIO_DFLT_LOG_MODE);

    char *dev_type_c = llio_type_to_str (type);
    DBE_DEBUG (DBG_DEV_IO | DBG_LVL_INFO, "[dev_io_core] Spawing DEVIO worker"

--- a/src/hal/dev_io/utils/dev_io_utils.c
+++ b/src/hal/dev_io/utils/dev_io_utils.c
@@ -7,7 +7,7 @@

 #include "dev_io_utils.h"
 #include "ll_io_utils.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/dev_mngr/dev_mngr.c
+++ b/src/hal/dev_mngr/dev_mngr.c
@@ -16,8 +16,8 @@
 #include <sys/stat.h>   /* chmod */

 #include "dev_mngr.h"
-#include "debug_print.h"
 #include "varg_macros.h"
+#include "errhand.h"
 #include "hal_utils.h"

 #define DFLT_BIND_FOLDER            "/tmp/bpm"

--- a/src/hal/dev_mngr/dev_mngr_core.c
+++ b/src/hal/dev_mngr/dev_mngr_core.c
@@ -9,8 +9,7 @@
 #include <glob.h>

 #include "dev_mngr_core.h"
-#include "hal_assert.h"
-#include "debug_print.h"
+#include "errhand.h"
 #include "hal_utils.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
@@ -131,7 +130,7 @@ dmngr_t * dmngr_new (char *name, char *endpoint, int verbose,

    /* Set logfile available for all dev_mngr and dev_io instances.
     * We accept NULL as a parameter, meaning to suppress all messages */
-    debug_set_log (log_filename, DEVMNGR_DFLT_LOG_MODE);
+    errhand_set_log (log_filename, DEVMNGR_DFLT_LOG_MODE);

    DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_INFO, "[dev_mngr_core] Spawing DEV_MNGR worker"
            " with \n\tdiscovery endpoint (ignored for now) %s, with logfile %s"

--- a/src/hal/dev_mngr/dev_mngr_dev_info.c
+++ b/src/hal/dev_mngr/dev_mngr_dev_info.c
@@ -8,8 +8,7 @@
 #include <string.h>

 #include "dev_mngr_dev_info.h"
-#include "hal_assert.h"
-#include "debug_print.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/hal.mk
+++ b/src/hal/hal.mk
 # debug.mk must be declared before dev_mngr.mk, as they are variables
 # exported by the former used by the latter
-include $(SRC_DIR)/hal/debug/debug.mk
 include $(SRC_DIR)/hal/ll_io/ll_io.mk
 include $(SRC_DIR)/hal/sm_io/sm_io.mk
 include $(SRC_DIR)/hal/sdb/sdb.mk

--- a/src/hal/hal_utils/dispatch_table.c
+++ b/src/hal/hal_utils/dispatch_table.c
@@ -16,7 +16,7 @@
 #include "hal_utils.h"
 #include "dispatch_table.h"
 #include "msg.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/hal_utils/hal_utils.c
+++ b/src/hal/hal_utils/hal_utils.c
@@ -11,7 +11,7 @@

 #include "hal_utils.h"
 #include "hal_utils_err.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "revision.h"
 #include "czmq.h"


--- a/src/hal/ll_io/ll_io.c
+++ b/src/hal/ll_io/ll_io.c
@@ -12,7 +12,7 @@
 #include "ll_io.h"
 #include "ll_io_pcie.h"
 #include "ll_io_eth.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/ll_io/ll_io_dev_info.c
+++ b/src/hal/ll_io/ll_io_dev_info.c
@@ -9,7 +9,7 @@
 #include <stdio.h>

 #include "ll_io_dev_info.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/ll_io/ll_io_endpoint.c
+++ b/src/hal/ll_io/ll_io_endpoint.c
@@ -10,7 +10,7 @@
 #include <stdio.h>

 #include "ll_io_endpoint.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/ll_io/ll_io_utils.c
+++ b/src/hal/ll_io/ll_io_utils.c
@@ -10,7 +10,7 @@
 #include <stdio.h>

 #include "ll_io.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/ll_io/ops/ll_io_eth.c
+++ b/src/hal/ll_io/ops/ll_io_eth.c
@@ -19,7 +19,7 @@
 #include <netinet/tcp.h>

 #include "ll_io_eth.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "ll_io_utils.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */

--- a/src/hal/ll_io/ops/ll_io_pcie.c
+++ b/src/hal/ll_io/ops/ll_io_pcie.c
@@ -6,7 +6,7 @@
 */

 #include "ll_io_pcie.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/msg/msg.c
+++ b/src/hal/msg/msg.c
@@ -7,7 +7,7 @@

 #include "msg.h"
 #include "msg_err.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io.h"
 #include "sm_io_exports.h"
 #include "rw_param_codes.h"

--- a/src/hal/msg/smio_thsafe_ops/smio_thsafe_zmq_client.c
+++ b/src/hal/msg/smio_thsafe_ops/smio_thsafe_zmq_client.c
@@ -6,7 +6,7 @@
 */

 #include "smio_thsafe_zmq_client.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "msg_err.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */

--- a/src/hal/msg/smio_thsafe_ops/smio_thsafe_zmq_server.c
+++ b/src/hal/msg/smio_thsafe_ops/smio_thsafe_zmq_server.c
@@ -7,7 +7,7 @@

 #include "smio_thsafe_zmq_server.h"
 #include "dev_io_exports.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "msg_err.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */

--- a/src/hal/sm_io/chips/sm_ch_24aa64.c
+++ b/src/hal/sm_io/chips/sm_ch_24aa64.c
@@ -13,7 +13,7 @@

 #include "sm_ch_24aa64.h"
 #include "sm_pr.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "e24aa64_regs.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */

--- a/src/hal/sm_io/chips/sm_ch_ad9510.c
+++ b/src/hal/sm_io/chips/sm_ch_ad9510.c
@@ -13,7 +13,7 @@

 #include "sm_ch_ad9510.h"
 #include "sm_pr.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "ad9510_regs.h"
 #include "sm_ch_ad9510_defaults.h"


--- a/src/hal/sm_io/chips/sm_ch_pca9547.c
+++ b/src/hal/sm_io/chips/sm_ch_pca9547.c
@@ -9,7 +9,7 @@

 #include "sm_ch_pca9547.h"
 #include "sm_pr.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "pca9547_regs.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */

--- a/src/hal/sm_io/chips/sm_ch_rffe.c
+++ b/src/hal/sm_io/chips/sm_ch_rffe.c
@@ -13,7 +13,7 @@

 #include "sm_ch_rffe.h"
 #include "sm_pr.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/chips/sm_ch_si57x.c
+++ b/src/hal/sm_io/chips/sm_ch_si57x.c
@@ -13,7 +13,7 @@

 #include "sm_ch_si57x.h"
 #include "sm_pr.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "hal_stddef.h"
 #include "si57x_regs.h"
 #include "sm_ch_si57x_defaults.h"

--- a/src/hal/sm_io/modules/acq/sm_io_acq_core.c
+++ b/src/hal/sm_io/modules/acq/sm_io_acq_core.c
@@ -11,7 +11,7 @@

 #include "sm_io_acq_core.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/modules/acq/sm_io_acq_exp.c
+++ b/src/hal/sm_io/modules/acq/sm_io_acq_exp.c
@@ -12,7 +12,7 @@
 #include "sm_io.h"
 #include "sm_io_exports.h"
 #include "dev_io_core.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "ddr3_map.h"
 #include "board.h"
 #include "rw_param.h"

--- a/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_core.c
+++ b/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_core.c
@@ -11,7 +11,7 @@

 #include "sm_io_afc_diag_core.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_defaults.c
+++ b/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_defaults.c
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_err.h"
 #include "sm_io_afc_diag_defaults.h"
 /* We actually use the libclient to do the "heavy" work for us */

--- a/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_exp.c
+++ b/src/hal/sm_io/modules/afc_diag/sm_io_afc_diag_exp.c
@@ -11,7 +11,7 @@
 #include "sm_io_afc_diag_codes.h"
 #include "sm_io.h"
 #include "dev_io_core.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "board.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"

--- a/src/hal/sm_io/modules/dsp/sm_io_dsp_core.c
+++ b/src/hal/sm_io/modules/dsp/sm_io_dsp_core.c
@@ -11,7 +11,7 @@

 #include "sm_io_dsp_core.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/modules/dsp/sm_io_dsp_defaults.c
+++ b/src/hal/sm_io/modules/dsp/sm_io_dsp_defaults.c
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_err.h"
 #include "sm_io_dsp_defaults.h"
 /* We actually use the libclient to do the "heavy" work for us */

--- a/src/hal/sm_io/modules/dsp/sm_io_dsp_exp.c
+++ b/src/hal/sm_io/modules/dsp/sm_io_dsp_exp.c
@@ -11,7 +11,7 @@
 #include "sm_io_dsp_codes.h"
 #include "sm_io.h"
 #include "dev_io_core.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "board.h"
 #include "wb_pos_calc_regs.h"
 #include "rw_param.h"

--- a/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c
+++ b/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c
@@ -12,7 +12,7 @@
 #include "sm_io_fmc130m_4ch_core.h"
 #include "sm_io_fmc130m_4ch_defaults.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "hal_stddef.h"
 #include "board.h"


--- a/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c
+++ b/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_err.h"
 #include "sm_io_fmc130m_4ch_defaults.h"
 /* We actually use the libclient to do the "heavy" work for us */

--- a/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c
+++ b/src/hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c
@@ -13,7 +13,7 @@
 #include "sm_io.h"
 #include "dev_io_core.h"
 #include "board.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "rw_param.h"
 #include "wb_fmc130m_4ch_regs.h"
 #include "sm_io_fmc130m_4ch_exports.h"

--- a/src/hal/sm_io/modules/rffe/sm_io_rffe_core.c
+++ b/src/hal/sm_io/modules/rffe/sm_io_rffe_core.c
@@ -11,7 +11,7 @@

 #include "sm_io_rffe_core.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/modules/rffe/sm_io_rffe_defaults.c
+++ b/src/hal/sm_io/modules/rffe/sm_io_rffe_defaults.c
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_err.h"
 #include "sm_io_rffe_defaults.h"
 /* We actually use the libclient to do the "heavy" work for us */

--- a/src/hal/sm_io/modules/rffe/sm_io_rffe_exp.c
+++ b/src/hal/sm_io/modules/rffe/sm_io_rffe_exp.c
@@ -11,7 +11,7 @@
 #include "sm_io_rffe_codes.h"
 #include "sm_io.h"
 #include "dev_io_core.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "board.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"

--- a/src/hal/sm_io/modules/swap/sm_io_swap_core.c
+++ b/src/hal/sm_io/modules/swap/sm_io_swap_core.c
@@ -11,7 +11,7 @@

 #include "sm_io_swap_core.h"
 #include "sm_io_err.h"
-#include "hal_assert.h"
+#include "errhand.h"

    /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/modules/swap/sm_io_swap_defaults.c
+++ b/src/hal/sm_io/modules/swap/sm_io_swap_defaults.c
-#include "hal_assert.h"
+#include "errhand.h"
 #include "sm_io_err.h"
 #include "sm_io_swap_defaults.h"
 /* We actually use the libclient to do the "heavy" work for us */

--- a/src/hal/sm_io/modules/swap/sm_io_swap_exp.c
+++ b/src/hal/sm_io/modules/swap/sm_io_swap_exp.c
@@ -11,7 +11,7 @@
 #include "sm_io_swap_codes.h"
 #include "sm_io.h"
 #include "dev_io_core.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "board.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"

--- a/src/hal/sm_io/protocols/ops/sm_pr_bsmp.c
+++ b/src/hal/sm_io/protocols/ops/sm_pr_bsmp.c
@@ -10,7 +10,7 @@
 #include "sm_pr_bsmp_defaults.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/protocols/ops/sm_pr_i2c.c
+++ b/src/hal/sm_io/protocols/ops/sm_pr_i2c.c
@@ -18,7 +18,7 @@
 #include "wb_i2c_regs.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/protocols/ops/sm_pr_spi.c
+++ b/src/hal/sm_io/protocols/ops/sm_pr_spi.c
@@ -20,7 +20,7 @@
 #include "wb_spi_regs.h"
 #include "rw_param.h"
 #include "rw_param_codes.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/protocols/sm_pr.c
+++ b/src/hal/sm_io/protocols/sm_pr.c
@@ -14,7 +14,7 @@
 #include "sm_pr_spi.h"
 #include "sm_pr_i2c.h"
 #include "sm_pr_bsmp.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/rw_param/rw_param.c
+++ b/src/hal/sm_io/rw_param/rw_param.c
@@ -7,7 +7,7 @@

 #include "sm_io.h"
 #include "rw_param.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/sm_io.c
+++ b/src/hal/sm_io/sm_io.c
@@ -8,7 +8,7 @@
 #include "sm_io.h"
 #include "exp_ops_codes.h"
 #include "rw_param.h"
-#include "hal_assert.h"
+#include "errhand.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */
 #ifdef ASSERT_TEST

--- a/src/hal/sm_io/sm_io_bootstrap.c
+++ b/src/hal/sm_io/sm_io_bootstrap.c
@@ -10,7 +10,7 @@
 #include "sm_io_bootstrap.h"
 #include "sm_io.h"
 #include "exp_ops_codes.h"
-#include "hal_assert.h"
+#include "errhand.h"
 #include "hal_utils.h"

 /* Undef ASSERT_ALLOC to avoid conflicting with other ASSERT_ALLOC */