diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h
index 7da57b62000eb4978a40ccfafb6c5266e285f33d..c9c261f64c5730c33e0b5e672955ef27af757cb7 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h
@@ -12,16 +12,6 @@
#define FMC130M_4CH_OPCODE_TYPE uint32_t
#define FMC130M_4CH_OPCODE_SIZE (sizeof (FMC130M_4CH_OPCODE_TYPE))
-#define FMC130M_4CH_OPCODE_LEDS 0
-#define FMC130M_4CH_NAME_LEDS "fmc130m_4ch_leds"
-#define FMC130M_4CH_OPCODE_SI571_OE 1
-#define FMC130M_4CH_NAME_SI571_OE "fmc130m_4ch_si571_oe"
-#define FMC130M_4CH_OPCODE_PLL_FUNCTION 2
-#define FMC130M_4CH_NAME_PLL_FUNCTION "fmc130m_4ch_pll_function"
-#define FMC130M_4CH_OPCODE_PLL_STATUS 3
-#define FMC130M_4CH_NAME_PLL_STATUS "fmc130m_4ch_pll_status"
-#define FMC130M_4CH_OPCODE_CLK_SEL 4
-#define FMC130M_4CH_NAME_CLK_SEL "fmc130m_4ch_clk_sel"
#define FMC130M_4CH_OPCODE_ADC_RAND 5
#define FMC130M_4CH_NAME_ADC_RAND "fmc130m_4ch_adc_rand"
#define FMC130M_4CH_OPCODE_ADC_DITH 6
@@ -70,39 +60,7 @@
#define FMC130M_4CH_NAME_ADC_DLY2 "fmc130m_4ch_adc_dly2"
#define FMC130M_4CH_OPCODE_ADC_DLY3 28
#define FMC130M_4CH_NAME_ADC_DLY3 "fmc130m_4ch_adc_dly3"
-#define FMC130M_4CH_OPCODE_TEST_DATA_EN 29
-#define FMC130M_4CH_NAME_TEST_DATA_EN "fmc130m_4ch_adc_test_data_en"
-#define FMC130M_4CH_OPCODE_TRIG_DIR 30
-#define FMC130M_4CH_NAME_TRIG_DIR "fmc130m_4ch_trig_dir"
-#define FMC130M_4CH_OPCODE_TRIG_TERM 31
-#define FMC130M_4CH_NAME_TRIG_TERM "fmc130m_4ch_trig_term"
-#define FMC130M_4CH_OPCODE_TRIG_VAL 32
-#define FMC130M_4CH_NAME_TRIG_VAL "fmc130m_4ch_trig_val"
-#define FMC130M_4CH_OPCODE_AD9510_CFG_DEFAULTS 33
-#define FMC130M_4CH_NAME_AD9510_CFG_DEFAULTS "fmc130m_4ch_ad9510_cfg_defaults"
-#define FMC130M_4CH_OPCODE_AD9510_PLL_A_DIV 34
-#define FMC130M_4CH_NAME_AD9510_PLL_A_DIV "fmc130m_4ch_ad9510_pll_a_div"
-#define FMC130M_4CH_OPCODE_AD9510_PLL_B_DIV 35
-#define FMC130M_4CH_NAME_AD9510_PLL_B_DIV "fmc130m_4ch_ad9510_pll_b_div"
-#define FMC130M_4CH_OPCODE_AD9510_PLL_PRESCALER 36
-#define FMC130M_4CH_NAME_AD9510_PLL_PRESCALER "fmc130m_4ch_ad9510_pll_prescaler"
-#define FMC130M_4CH_OPCODE_AD9510_R_DIV 37
-#define FMC130M_4CH_NAME_AD9510_R_DIV "fmc130m_4ch_ad9510_r_div"
-#define FMC130M_4CH_OPCODE_AD9510_PLL_PDOWN 38
-#define FMC130M_4CH_NAME_AD9510_PLL_PDOWN "fmc130m_4ch_ad9510_pll_pdown"
-#define FMC130M_4CH_OPCODE_AD9510_MUX_STATUS 39
-#define FMC130M_4CH_NAME_AD9510_MUX_STATUS "fmc130m_4ch_ad9510_mux_status"
-#define FMC130M_4CH_OPCODE_AD9510_CP_CURRENT 40
-#define FMC130M_4CH_NAME_AD9510_CP_CURRENT "fmc130m_4ch_ad9510_cp_current"
-#define FMC130M_4CH_OPCODE_AD9510_OUTPUTS 41
-#define FMC130M_4CH_NAME_AD9510_OUTPUTS "fmc130m_4ch_ad9510_outputs"
-#define FMC130M_4CH_OPCODE_AD9510_PLL_CLK_SEL 42
-#define FMC130M_4CH_NAME_AD9510_PLL_CLK_SEL "fmc130m_4ch_ad9510_pll_clk_sel"
-#define FMC130M_4CH_OPCODE_SI571_SET_FREQ 43
-#define FMC130M_4CH_NAME_SI571_SET_FREQ "fmc130m_4ch_si571_set_freq"
-#define FMC130M_4CH_OPCODE_SI571_GET_DEFAULTS 44
-#define FMC130M_4CH_NAME_SI571_GET_DEFAULTS "fmc130m_4ch_si571_get_defaults"
-#define FMC130M_4CH_OPCODE_END 45
+#define FMC130M_4CH_OPCODE_END 29
/* Messaging Reply OPCODES */
#define FMC130M_4CH_REPLY_TYPE uint32_t
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c
index 2e6a58bb28b5cce9e42da2b2db95f0fd3fdb0490..fc55443356cf60578e16df0f00612bd62ceca634 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.c
@@ -109,42 +109,25 @@ smio_fmc130m_4ch_t * smio_fmc130m_4ch_new (smio_t *parent)
/* Determine the type of the FMC130M_4CH board */
_smio_fmc130m_4ch_set_type (self, data_24aa64);
+ DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_core] Registering FMC_ADC_COMMON SMIO\n");
+ smio_register_sm (parent, 0x2403f569, FMC_130M_FMC_ADC_COMMON_REGS_OFFS, inst_id);
+
/* Now, initialize the FMC130M_4CH with the appropriate structures*/
if (self->type == TYPE_FMC130M_4CH_ACTIVE) {
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_core] AD9510 initializing, "
- "addr: 0x%08X, Inst ID: %u\n", fmc130m_4ch_ad9510_addr[inst_id],
- inst_id);
- self->smch_ad9510 = smch_ad9510_new (parent, FMC_130M_AD9510_SPI_OFFS,
- fmc130m_4ch_ad9510_addr[inst_id], 0);
- ASSERT_ALLOC(self->smch_ad9510, err_smch_ad9510_alloc);
-
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_core] SI571 initializing, "
- "addr: 0x%08X, Inst ID: %u\n", fmc130m_4ch_si571_addr[inst_id],
- inst_id);
- self->smch_si571 = smch_si57x_new (parent, FMC_130M_SI571_I2C_OFFS,
- fmc130m_4ch_si571_addr[inst_id], 0);
- ASSERT_ALLOC(self->smch_si571, err_smch_si571_alloc);
+ DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_core] Active Board detected. "
+ "Registering FMC_ADC_ACTIVE SMIO\n");
+ smio_register_sm (parent, 0x88c67d9c, FMC_130M_FMC_ACTIVE_CLK_OFFS, inst_id);
}
else { /* PASSIVE or Unsupported*/
-
if (self->type != TYPE_FMC130M_4CH_PASSIVE) {
DBE_DEBUG (DBG_SM_IO | DBG_LVL_WARN,
"[sm_io:fmc130m_4ch_core] Unsupported FMC130M_4CH card (maybe EEPROM not configured?).\n"
"\t Defaulting to PASSIVE board\n");
}
-
- self->smch_ad9510 = NULL;
- self->smch_si571 = NULL;
}
return self;
-err_smch_si571_alloc:
- if (self->smch_ad9510 != NULL) {
- smch_ad9510_destroy (&self->smch_ad9510);
- }
-err_smch_ad9510_alloc:
- smch_24aa64_destroy (&self->smch_24aa64);
err_smch_24aa64_alloc:
if (self->smch_pca9547 != NULL) {
smch_pca9547_destroy (&self->smch_pca9547);
@@ -164,8 +147,6 @@ smio_err_e smio_fmc130m_4ch_destroy (smio_fmc130m_4ch_t **self_p)
if (*self_p) {
smio_fmc130m_4ch_t *self = *self_p;
- smch_si57x_destroy (&self->smch_si571);
- smch_ad9510_destroy (&self->smch_ad9510);
smch_24aa64_destroy (&self->smch_24aa64);
if (self->smch_pca9547 != NULL) {
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.h b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.h
index 10b25cb35c2b016a151846d3107829f8598cb34b..bd6f0309156ff5cc85101c905a9bf339eb068787 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.h
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_core.h
@@ -8,9 +8,6 @@
#ifndef _SM_IO_FMC130M_4CH_CORE_H_
#define _SM_IO_FMC130M_4CH_CORE_H_
-#define SMIO_AD9510_HANDLER(smio_handler) ((smch_ad9510_t *) smio_handler->smch_ad9510)
-#define SMIO_SI57X_HANDLER(smio_handler) ((smch_si57x_t *) smio_handler->smch_si571)
-
/* The follosing codes were generated via the following command:
* > echo FMC130M_4CH_ACTIVE | md5sum | cut -c 1-8
* > cb04db4d
@@ -31,8 +28,6 @@ typedef enum {
typedef struct {
fmc130m_4ch_type_e type; /* FMC130M_4CH type */
- smch_ad9510_t *smch_ad9510; /* AD9510 chip handler */
- smch_si57x_t *smch_si571; /* SI571 chip handler */
smch_24aa64_t *smch_24aa64; /* 24AA64 chip handler */
smch_pca9547_t *smch_pca9547; /* FPGA I2C Switch */
} smio_fmc130m_4ch_t;
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c
index 1ea43bff1426510edc861f7244a23791d792a10b..93d5d4784ee753dd5180912f1b1f4bc884338dc4 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.c
@@ -55,36 +55,8 @@ smio_err_e fmc130m_4ch_config_defaults (char *broker_endp, char *service,
log_file_name, SMIO_FMC130M_4CH_LIBBPMCLIENT_LOG_MODE);
ASSERT_ALLOC(config_client, err_alloc_client);
- client_err = bpm_set_fmc_pll_function (config_client, service, FMC130M_4CH_DFLT_PLL_FUNC);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not set FMC PLL function",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
+ /* Configure defaults here */
- client_err = bpm_set_fmc_clk_sel (config_client, service, FMC130M_4CH_DFLT_CLK_SEL);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not set FMC CLK SEL function",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
- client_err = bpm_set_trig_dir (config_client, service, FMC130M_4CH_DFLT_TRIG_DIR);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not set FMC TRIG DIR function",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
- client_err = bpm_ad9510_cfg_defaults (config_client, service, 0);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS ||
- client_err == BPM_CLIENT_ERR_AGAIN, "Could not configure AD9510",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
- client_err = bpm_set_si571_defaults (config_client, service, FMC130M_4CH_DFLT_SI57X_FOUT_FACTORY);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not get Si571 defaults",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
- client_err = bpm_set_si571_set_freq (config_client, service, FMC130M_4CH_DFLT_SI57X_FOUT);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not set Si571 frequency",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
- client_err = bpm_set_si571_oe (config_client, service, FMC130M_4CH_DFLT_SI571_OE);
- ASSERT_TEST(client_err == BPM_CLIENT_SUCCESS, "Could not enable SI571 Output",
- err_param_set, SMIO_ERR_CONFIG_DFLT);
-
-err_param_set:
bpm_client_destroy (&config_client);
err_alloc_client:
DBE_DEBUG (DBG_SM_IO | DBG_LVL_INFO, "[sm_io:fmc130m_4ch_defaults] Exiting Config thread %s\n",
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.h b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.h
index 5b7e52f93deeba0616af3293ab28d45ed0626891..c9214105090556fba8cb5df79da3fd8b2c7956a3 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.h
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_defaults.h
@@ -9,17 +9,9 @@
#define _FMC130M_4CH_DEFAULTS_H_
#include "sm_io_err.h"
-#include "chips/si57x_regs.h"
#include "sm_ch_pca9547.h"
-#define FMC130M_4CH_DFLT_PLL_FUNC 0x1
-#define FMC130M_4CH_DFLT_CLK_SEL 0x0 /* Clock from FMC front panel */
-#define FMC130M_4CH_DFLT_TRIG_DIR 0x0 /* Output direction */
#define FMC130M_4CH_DFLT_PCA9547_CFG SMCH_PCA9547_NO_CHANNEL /* No channel selected */
-#define FMC130M_4CH_DFLT_SI571_OE 0x1
-
-#define FMC130M_4CH_DFLT_SI57X_FOUT_FACTORY SI57X_FOUT_FACTORY_DFLT
-#define FMC130M_4CH_DFLT_SI57X_FOUT 113040445 /* 113.040445 MHz default */
smio_err_e fmc130m_4ch_config_defaults (char *broker_endp, char *service,
const char *log_file_name);
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c
index 2ceeb2d1fc3d0e80a9e078ea5eb224ceed7c6d57..b74d3a32bfd5eea744b0fc657c064dcf1164dede 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exp.c
@@ -53,68 +53,10 @@
} \
})
-static smch_err_e smch_ad9510_cfg_defaults_compat (smch_ad9510_t *self,
- uint32_t *param);
-
/************************************************************/
/************ Specific FMC_130M_4CH Operations **************/
/************************************************************/
-#define BPM_FMC130M_4CH_LEDS_MIN 0 /* LED 0 = 0, LED 1 = 0, LED 3 = 0*/
-#define BPM_FMC130M_4CH_LEDS_MAX 7 /* LED 0 = 1, LED 1 = 1, LED 2 = 1*/
-#define WB_FMC_130M_4CH_CSR_MONITOR_GLOBAL_MASK WBGEN2_GEN_MASK(1, 3)
-#define WB_FMC_130M_4CH_CSR_MONITOR_GLOBAL_W(val) WBGEN2_GEN_WRITE(val, 1, 3)
-#define WB_FMC_130M_4CH_CSR_MONITOR_GLOBAL_R(reg) WBGEN2_GEN_READ(reg, 1, 3)
-
-RW_PARAM_FUNC(fmc130m_4ch, leds) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- MONITOR, GLOBAL, MULT_BIT_PARAM,
- BPM_FMC130M_4CH_LEDS_MIN, BPM_FMC130M_4CH_LEDS_MAX, NO_CHK_FUNC,
- NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_SI571_OE_MIN 0 /* SI571 Output disable */
-#define BPM_FMC130M_4CH_SI571_OE_MAX 1 /* SI571 Output enable */
-
-RW_PARAM_FUNC(fmc130m_4ch, si571_oe) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- CLK_DISTRIB, SI571_OE, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_SI571_OE_MIN, BPM_FMC130M_4CH_SI571_OE_MAX, NO_CHK_FUNC,
- NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_PLL_FUNC_MIN 0 /* PLL FUNCTION pin 0 */
-#define BPM_FMC130M_4CH_PLL_FUNC_MAX 1 /* PLL FUNCTION pin 1 */
-
-RW_PARAM_FUNC(fmc130m_4ch, pll_func) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- CLK_DISTRIB, PLL_FUNCTION, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_PLL_FUNC_MIN, BPM_FMC130M_4CH_PLL_FUNC_MAX, NO_CHK_FUNC,
- NO_FMT_FUNC, SET_FIELD);
-}
-
-
-#define BPM_FMC130M_4CH_PLL_STATUS_MIN 0 /* PLL STATUS pin 0 */
-#define BPM_FMC130M_4CH_PLL_STATUS_MAX 1 /* PLL STATUS pin 1 */
-
-RW_PARAM_FUNC(fmc130m_4ch, pll_status) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- CLK_DISTRIB, PLL_STATUS, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_PLL_STATUS_MIN, BPM_FMC130M_4CH_PLL_STATUS_MAX, NO_CHK_FUNC,
- NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_CLK_SEL_MIN 0 /* PLL CLK_SEL pin 0 */
-#define BPM_FMC130M_4CH_CLK_SEL_MAX 1 /* PLL CLK_SEL pin 1 */
-
-RW_PARAM_FUNC(fmc130m_4ch, clk_sel) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- CLK_DISTRIB, CLK_SEL, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_CLK_SEL_MIN, BPM_FMC130M_4CH_CLK_SEL_MAX, NO_CHK_FUNC,
- NO_FMT_FUNC, SET_FIELD);
-}
-
-
/***************************** ADC LT2208 Control ***************************/
#define BPM_FMC130M_4CH_RAND_MIN 0 /* RAND disabled */
#define BPM_FMC130M_4CH_RAND_MAX 1 /* RAND enabled */
@@ -419,251 +361,8 @@ FMC130M_4CH_ADC_DLY_FUNC_HEADER(3)
FMC130M_4CH_ADC_DLY_FUNC_BODY(owner, args, ret, 3);
}
-/***************************** FPGA Control ***************************/
-
-#define BPM_FMC130M_4CH_TEST_DATA_EN_MIN 0 /* TEST data enable off */
-#define BPM_FMC130M_4CH_TEST_DATA_EN_MAX 1 /* TEST data enable on */
-
-RW_PARAM_FUNC(fmc130m_4ch, test_data_en) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- FPGA_CTRL, TEST_DATA_EN, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_TEST_DATA_EN_MIN, BPM_FMC130M_4CH_TEST_DATA_EN_MAX,
- NO_CHK_FUNC, NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_TRIG_DIR_MIN 0 /* Trigger direction input */
-#define BPM_FMC130M_4CH_TRIG_DIR_MAX 1 /* Trigger direction output */
-
-RW_PARAM_FUNC(fmc130m_4ch, trig_dir) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- TRIGGER, DIR, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_TRIG_DIR_MIN, BPM_FMC130M_4CH_TRIG_DIR_MAX,
- NO_CHK_FUNC, NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_TRIG_TERM_MIN 0 /* Trigger termination disabled */
-#define BPM_FMC130M_4CH_TRIG_TERM_MAX 1 /* Trigger termination enabled */
-
-RW_PARAM_FUNC(fmc130m_4ch, trig_term) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- TRIGGER, TERM, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_TRIG_TERM_MIN, BPM_FMC130M_4CH_TRIG_TERM_MAX,
- NO_CHK_FUNC, NO_FMT_FUNC, SET_FIELD);
-}
-
-#define BPM_FMC130M_4CH_TRIG_VAL_MIN 0 /* Trigger value 0 */
-#define BPM_FMC130M_4CH_TRIG_VAL_MAX 1 /* Trigger value 1 */
-
-RW_PARAM_FUNC(fmc130m_4ch, trig_val) {
- SET_GET_PARAM(fmc130m_4ch, FMC_130M_CTRL_REGS_OFFS, WB_FMC_130M_4CH_CSR,
- TRIGGER, TRIG_VAL, SINGLE_BIT_PARAM,
- BPM_FMC130M_4CH_TRIG_VAL_MIN, BPM_FMC130M_4CH_TRIG_VAL_MAX,
- NO_CHK_FUNC, NO_FMT_FUNC, SET_FIELD);
-}
-
-/******************************** Chips Export functions *************************/
-
-/* Macros to avoid repetition of the function body AD9510 */
-typedef smch_err_e (*smch_ad9510_func_fp) (smch_ad9510_t *self, uint32_t *param);
-
-#define FMC130M_4CH_AD9510_FUNC_NAME(func_name) \
- _fmc130m_4ch_ad9510_ ## func_name
-
-#define FMC130M_4CH_AD9510_FUNC_NAME_HEADER(func_name) \
- static int FMC130M_4CH_AD9510_FUNC_NAME(func_name) (void *owner, void *args, void *ret)
-
-#define FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, read_func, write_func, \
- error_msg) \
- do { \
- assert (owner); \
- assert (args); \
- \
- int err = -FMC130M_4CH_OK; \
- SMIO_OWNER_TYPE *self = SMIO_EXP_OWNER(owner); \
- smio_fmc130m_4ch_t *fmc130m = smio_get_handler (self); \
- ASSERT_TEST(fmc130m != NULL, "Could not get SMIO FMC130M handler", \
- err_get_fmc130m_handler, -FMC130M_4CH_ERR); \
- smch_ad9510_t *smch_ad9510 = SMIO_AD9510_HANDLER(fmc130m); \
- uint32_t rw = *(uint32_t *) EXP_MSG_ZMQ_FIRST_ARG(args); \
- uint32_t param = *(uint32_t *) EXP_MSG_ZMQ_NEXT_ARG(args); \
- \
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_exp] Calling " \
- "AD9510 function\n"); \
- \
- FMC130M_4CH_CHECK_ACTIVE(self); \
- \
- smch_err_e serr = SMCH_SUCCESS; \
- /* Call specific function */ \
- if (rw) { \
- WHEN(ISEMPTY(read_func))( \
- (void) ret; \
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_exp] " \
- "AD9510 read function not implemented\n"); \
- err = -FMC130M_4CH_UNINPL; \
- return err; \
- ) \
- WHENNOT(ISEMPTY(read_func))( \
- uint32_t value = 0; \
- serr = ((smch_ad9510_func_fp) read_func) (smch_ad9510, \
- &value); \
- if (serr != SMCH_SUCCESS) { \
- err = -FMC130M_4CH_ERR; \
- } \
- else { \
- *((uint32_t *) ret) = value; \
- err = sizeof (value); \
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_exp] " \
- "AD9510 function read value = 0x%08X\n", value); \
- } \
- ) \
- } \
- else { \
- WHEN(ISEMPTY(write_func))( \
- DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:fmc130m_4ch_exp] " \
- "AD9510 write function not implemented\n"); \
- err = -FMC130M_4CH_UNINPL; \
- return err; \
- ) \
- WHENNOT(ISEMPTY(write_func))( \
- serr = ((smch_ad9510_func_fp) write_func) (smch_ad9510, \
- ¶m); \
- if (serr != SMCH_SUCCESS) { \
- err = -FMC130M_4CH_ERR; \
- } \
- else { \
- err = -FMC130M_4CH_OK; \
- } \
- ) \
- } \
- \
-err_get_fmc130m_handler: \
- return err; \
- } while(0)
-
-static smch_err_e smch_ad9510_cfg_defaults_compat (smch_ad9510_t *self, uint32_t *param)
-{
- (void) param;
- return smch_ad9510_cfg_defaults (self);
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(cfg_defaults)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, /* No read function */,
- smch_ad9510_cfg_defaults_compat, "Could not set/get AD9510 defaults");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(pll_a_div)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_pll_a_div,
- smch_ad9510_set_pll_a_div, "Could not set/get AD9510 PLL A divider");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(pll_b_div)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_pll_b_div,
- smch_ad9510_set_pll_b_div, "Could not set/get AD9510 PLL B divider");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(pll_prescaler)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_pll_prescaler,
- smch_ad9510_set_pll_prescaler, "Could not set/get AD9510 PLL Prescaler");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(r_div)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_r_div,
- smch_ad9510_set_r_div, "Could not set/get AD9510 R Divider");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(pll_pdown)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_pll_pdown,
- smch_ad9510_set_pll_pdown, "Could not set/get AD9510 PLL power down");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(mux_status)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_mux_status,
- smch_ad9510_set_mux_status, "Could not set/get AD9510 MUX status");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(cp_current)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_cp_current,
- smch_ad9510_set_cp_current, "Could not set/get AD9510 CP current");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(outputs)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_outputs,
- smch_ad9510_set_outputs, "Could not set/get AD9510 Outputs");
-}
-
-FMC130M_4CH_AD9510_FUNC_NAME_HEADER(pll_clk_sel)
-{
- FMC130M_4CH_AD9510_FUNC_BODY(owner, args, ret, smch_ad9510_get_pll_clk_sel,
- smch_ad9510_set_pll_clk_sel,
- "Could not set/get AD9510 PLL CLK selection");
-}
-
-/* Macros to avoid repetition of the function body Si57X */
-typedef smch_err_e (*smch_si57x_func_fp) (smch_si57x_t *self, double param);
-
-#define FMC130M_4CH_SI571_FUNC_NAME(func_name) \
- _fmc130m_4ch_si571_ ## func_name
-
-#define FMC130M_4CH_SI571_FUNC_NAME_HEADER(func_name) \
- static int FMC130M_4CH_SI571_FUNC_NAME(func_name) (void *owner, void *args, void *ret)
-
-#define FMC130M_4CH_SI571_FUNC_BODY(owner, args, ret, func, error_msg) \
- do { \
- (void) ret; \
- assert (owner); \
- assert (args); \
- \
- int err = -FMC130M_4CH_OK; \
- SMIO_OWNER_TYPE *self = SMIO_EXP_OWNER(owner); \
- smio_fmc130m_4ch_t *fmc130m = smio_get_handler (self); \
- ASSERT_TEST(fmc130m != NULL, "Could not get SMIO FMC130M handler", \
- err_get_fmc130m_handler, -FMC130M_4CH_ERR); \
- smch_si57x_t *smch_si57x = SMIO_SI57X_HANDLER(fmc130m); \
- uint32_t rw = *(uint32_t *) EXP_MSG_ZMQ_FIRST_ARG(args); \
- (void) rw; /* Ignored for now */ \
- double param = *(double *) EXP_MSG_ZMQ_NEXT_ARG(args); \
- \
- FMC130M_4CH_CHECK_ACTIVE(self); \
- \
- /* Call specific function */ \
- smch_err_e serr = ((smch_si57x_func_fp) func) (smch_si57x, param); \
- ASSERT_TEST(serr == SMCH_SUCCESS, error_msg, \
- err_smpr_write, -FMC130M_4CH_ERR); \
- \
-err_smpr_write: \
-err_get_fmc130m_handler: \
- return err; \
- \
- } while(0)
-
-FMC130M_4CH_SI571_FUNC_NAME_HEADER(set_freq)
-{
- FMC130M_4CH_SI571_FUNC_BODY(owner, args, ret, smch_si57x_set_freq,
- "Could not set SI571 frequency");
-}
-
-FMC130M_4CH_SI571_FUNC_NAME_HEADER(get_defaults)
-{
- FMC130M_4CH_SI571_FUNC_BODY(owner, args, ret, smch_si57x_get_defaults,
- "Could not restart SI571 to its defaults");
-}
-
/* Exported function pointers */
const disp_table_func_fp fmc130m_4ch_exp_fp [] = {
- RW_PARAM_FUNC_NAME(fmc130m_4ch, leds),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, si571_oe),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, pll_func),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, pll_status),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, clk_sel),
RW_PARAM_FUNC_NAME(fmc130m_4ch, adc_rand),
RW_PARAM_FUNC_NAME(fmc130m_4ch, adc_dith),
RW_PARAM_FUNC_NAME(fmc130m_4ch, adc_shdn),
@@ -688,22 +387,6 @@ const disp_table_func_fp fmc130m_4ch_exp_fp [] = {
FMC130M_4CH_ADC_DLY_FUNC_NAME(1),
FMC130M_4CH_ADC_DLY_FUNC_NAME(2),
FMC130M_4CH_ADC_DLY_FUNC_NAME(3),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, test_data_en),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, trig_dir),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, trig_term),
- RW_PARAM_FUNC_NAME(fmc130m_4ch, trig_val),
- FMC130M_4CH_AD9510_FUNC_NAME(cfg_defaults),
- FMC130M_4CH_AD9510_FUNC_NAME(pll_a_div),
- FMC130M_4CH_AD9510_FUNC_NAME(pll_b_div),
- FMC130M_4CH_AD9510_FUNC_NAME(pll_prescaler),
- FMC130M_4CH_AD9510_FUNC_NAME(r_div),
- FMC130M_4CH_AD9510_FUNC_NAME(pll_pdown),
- FMC130M_4CH_AD9510_FUNC_NAME(mux_status),
- FMC130M_4CH_AD9510_FUNC_NAME(cp_current),
- FMC130M_4CH_AD9510_FUNC_NAME(outputs),
- FMC130M_4CH_AD9510_FUNC_NAME(pll_clk_sel),
- FMC130M_4CH_SI571_FUNC_NAME(set_freq),
- FMC130M_4CH_SI571_FUNC_NAME(get_defaults),
NULL
};
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.c b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.c
index 370b29650572866e0624d111b7e97e4cd90d113d..ff5eab7886b31602f475e447e1f8d68845afff97 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.c
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.c
@@ -10,67 +10,6 @@
/* Description SMIO FMC130M_4CH functions */
-disp_op_t fmc130m_4ch_leds_exp = {
- .name = FMC130M_4CH_NAME_LEDS,
- .opcode = FMC130M_4CH_OPCODE_LEDS,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_si571_oe_exp = {
- .name = FMC130M_4CH_NAME_SI571_OE,
- .opcode = FMC130M_4CH_OPCODE_SI571_OE,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-
-disp_op_t fmc130m_4ch_pll_func_exp = {
- .name = FMC130M_4CH_NAME_PLL_FUNCTION,
- .opcode = FMC130M_4CH_OPCODE_PLL_FUNCTION,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_pll_status_exp = {
- .name = FMC130M_4CH_NAME_PLL_STATUS,
- .opcode = FMC130M_4CH_OPCODE_PLL_STATUS,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_clk_sel_exp = {
- .name = FMC130M_4CH_NAME_CLK_SEL,
- .opcode = FMC130M_4CH_OPCODE_CLK_SEL,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
disp_op_t fmc130m_4ch_adc_rand_exp = {
.name = FMC130M_4CH_NAME_ADC_RAND,
.opcode = FMC130M_4CH_OPCODE_ADC_RAND,
@@ -360,205 +299,8 @@ disp_op_t fmc130m_4ch_adc_dly3_exp = {
}
};
-disp_op_t fmc130m_4ch_test_data_en_exp = {
- .name = FMC130M_4CH_NAME_TEST_DATA_EN,
- .opcode = FMC130M_4CH_OPCODE_TEST_DATA_EN,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_trig_dir_exp = {
- .name = FMC130M_4CH_NAME_TRIG_DIR,
- .opcode = FMC130M_4CH_OPCODE_TRIG_DIR,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_trig_term_exp = {
- .name = FMC130M_4CH_NAME_TRIG_TERM,
- .opcode = FMC130M_4CH_OPCODE_TRIG_TERM,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_trig_val_exp = {
- .name = FMC130M_4CH_NAME_TRIG_VAL,
- .opcode = FMC130M_4CH_OPCODE_TRIG_VAL,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_cfg_defaults_exp = {
- .name = FMC130M_4CH_NAME_AD9510_CFG_DEFAULTS,
- .opcode = FMC130M_4CH_OPCODE_AD9510_CFG_DEFAULTS,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_pll_a_div_exp = {
- .name = FMC130M_4CH_NAME_AD9510_PLL_A_DIV,
- .opcode = FMC130M_4CH_OPCODE_AD9510_PLL_A_DIV,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_pll_b_div_exp = {
- .name = FMC130M_4CH_NAME_AD9510_PLL_B_DIV,
- .opcode = FMC130M_4CH_OPCODE_AD9510_PLL_B_DIV,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_pll_prescaler_exp = {
- .name = FMC130M_4CH_NAME_AD9510_PLL_PRESCALER,
- .opcode = FMC130M_4CH_OPCODE_AD9510_PLL_PRESCALER,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_r_div_exp = {
- .name = FMC130M_4CH_NAME_AD9510_R_DIV,
- .opcode = FMC130M_4CH_OPCODE_AD9510_R_DIV,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_pll_pdown_exp = {
- .name = FMC130M_4CH_NAME_AD9510_PLL_PDOWN,
- .opcode = FMC130M_4CH_OPCODE_AD9510_PLL_PDOWN,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_mux_status_exp = {
- .name = FMC130M_4CH_NAME_AD9510_MUX_STATUS,
- .opcode = FMC130M_4CH_OPCODE_AD9510_MUX_STATUS,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_cp_current_exp = {
- .name = FMC130M_4CH_NAME_AD9510_CP_CURRENT,
- .opcode = FMC130M_4CH_OPCODE_AD9510_CP_CURRENT,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_outputs_exp = {
- .name = FMC130M_4CH_NAME_AD9510_OUTPUTS,
- .opcode = FMC130M_4CH_OPCODE_AD9510_OUTPUTS,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_ad9510_pll_clk_sel_exp = {
- .name = FMC130M_4CH_NAME_AD9510_PLL_CLK_SEL,
- .opcode = FMC130M_4CH_OPCODE_AD9510_PLL_CLK_SEL,
- .retval = DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_si571_set_freq_exp = {
- .name = FMC130M_4CH_NAME_SI571_SET_FREQ,
- .opcode = FMC130M_4CH_OPCODE_SI571_SET_FREQ,
- .retval = DISP_ARG_END,
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_DOUBLE, double),
- DISP_ARG_END
- }
-};
-
-disp_op_t fmc130m_4ch_si571_get_defaults_exp = {
- .name = FMC130M_4CH_NAME_SI571_GET_DEFAULTS,
- .opcode = FMC130M_4CH_OPCODE_SI571_GET_DEFAULTS,
- .retval = DISP_ARG_END,
- .retval_owner = DISP_OWNER_OTHER,
- .args = {
- DISP_ARG_ENCODE(DISP_ATYPE_UINT32, uint32_t),
- DISP_ARG_ENCODE(DISP_ATYPE_DOUBLE, double),
- DISP_ARG_END
- }
-};
-
/* Exported function description */
const disp_op_t *fmc130m_4ch_exp_ops [] = {
- &fmc130m_4ch_leds_exp,
- &fmc130m_4ch_si571_oe_exp,
- &fmc130m_4ch_pll_func_exp,
- &fmc130m_4ch_pll_status_exp,
- &fmc130m_4ch_clk_sel_exp,
&fmc130m_4ch_adc_rand_exp,
&fmc130m_4ch_adc_dith_exp,
&fmc130m_4ch_adc_shdn_exp,
@@ -583,22 +325,6 @@ const disp_op_t *fmc130m_4ch_exp_ops [] = {
&fmc130m_4ch_adc_dly1_exp,
&fmc130m_4ch_adc_dly2_exp,
&fmc130m_4ch_adc_dly3_exp,
- &fmc130m_4ch_test_data_en_exp,
- &fmc130m_4ch_trig_dir_exp,
- &fmc130m_4ch_trig_term_exp,
- &fmc130m_4ch_trig_val_exp,
- &fmc130m_4ch_ad9510_cfg_defaults_exp,
- &fmc130m_4ch_ad9510_pll_a_div_exp,
- &fmc130m_4ch_ad9510_pll_b_div_exp,
- &fmc130m_4ch_ad9510_pll_prescaler_exp,
- &fmc130m_4ch_ad9510_r_div_exp,
- &fmc130m_4ch_ad9510_pll_pdown_exp,
- &fmc130m_4ch_ad9510_mux_status_exp,
- &fmc130m_4ch_ad9510_cp_current_exp,
- &fmc130m_4ch_ad9510_outputs_exp,
- &fmc130m_4ch_ad9510_pll_clk_sel_exp,
- &fmc130m_4ch_si571_set_freq_exp,
- &fmc130m_4ch_si571_get_defaults_exp,
NULL
};
diff --git a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h
index f9cd0902fde98a49bada7501c858a6910fb39424..d835404ff2b165325a7b75dadff79a5c79725f37 100644
--- a/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h
+++ b/src/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h
@@ -10,11 +10,6 @@
#include "disptable.h"
-extern disp_op_t fmc130m_4ch_leds_exp;
-extern disp_op_t fmc130m_4ch_si571_oe_exp;
-extern disp_op_t fmc130m_4ch_pll_func_exp;
-extern disp_op_t fmc130m_4ch_pll_status_exp;
-extern disp_op_t fmc130m_4ch_clk_sel_exp;
extern disp_op_t fmc130m_4ch_adc_rand_exp;
extern disp_op_t fmc130m_4ch_adc_dith_exp;
extern disp_op_t fmc130m_4ch_adc_shdn_exp;
@@ -39,22 +34,6 @@ extern disp_op_t fmc130m_4ch_adc_dly0_exp;
extern disp_op_t fmc130m_4ch_adc_dly1_exp;
extern disp_op_t fmc130m_4ch_adc_dly2_exp;
extern disp_op_t fmc130m_4ch_adc_dly3_exp;
-extern disp_op_t fmc130m_4ch_test_data_en_exp;
-extern disp_op_t fmc130m_4ch_trig_dir_exp;
-extern disp_op_t fmc130m_4ch_trig_term_exp;
-extern disp_op_t fmc130m_4ch_trig_val_exp;
-extern disp_op_t fmc130m_4ch_ad9510_cfg_defaults_exp;
-extern disp_op_t fmc130m_4ch_ad9510_pll_a_div_exp;
-extern disp_op_t fmc130m_4ch_ad9510_pll_b_div_exp;
-extern disp_op_t fmc130m_4ch_ad9510_pll_prescaler_exp;
-extern disp_op_t fmc130m_4ch_ad9510_r_div_exp;
-extern disp_op_t fmc130m_4ch_ad9510_pll_pdown_exp;
-extern disp_op_t fmc130m_4ch_ad9510_mux_status_exp;
-extern disp_op_t fmc130m_4ch_ad9510_cp_current_exp;
-extern disp_op_t fmc130m_4ch_ad9510_outputs_exp;
-extern disp_op_t fmc130m_4ch_ad9510_pll_clk_sel_exp;
-extern disp_op_t fmc130m_4ch_si571_set_freq_exp;
-extern disp_op_t fmc130m_4ch_si571_get_defaults_exp;
extern const disp_op_t *fmc130m_4ch_exp_ops [];