SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Code refactoring 9

Browse Source
This commit is contained in:
dreamsourcelabTAI
2022-08-11 20:09:49 +08:00
parent 05219259f8
commit 76aeeed8ae
21 changed files with 480 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
libsigrok4DSL/trigger.c
View File

@@ -51,7 +51,7 @@ struct ds_trigger *trigger = NULL;
*
* @return SR_OK upon success.
*/
SR_API int ds_trigger_init(void)
SR_PRIV int ds_trigger_init(void)
{
int i, j;
@@ -83,7 +83,7 @@ SR_API int ds_trigger_init(void)
return SR_OK;
}
SR_API int ds_trigger_destroy(void)
SR_PRIV int ds_trigger_destroy(void)
{
if (trigger)
g_free(trigger);
@@ -91,15 +91,6 @@ SR_API int ds_trigger_destroy(void)
return SR_OK;
}
/**
*
*
*/
SR_API struct ds_trigger *ds_trigger_get(void)
{
return trigger;
}
/**
* set trigger based on stage
@@ -111,6 +102,11 @@ SR_API int ds_trigger_stage_set_value(uint16_t stage, uint16_t probes, char *tri
assert(stage < TriggerStages);
assert(probes <= MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_stage_set_value() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
int j;
for (j = 0; j< probes; j++) {
@@ -125,6 +121,11 @@ SR_API int ds_trigger_stage_set_logic(uint16_t stage, uint16_t probes, unsigned
assert(stage < TriggerStages);
assert(probes <= MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_stage_set_logic() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger_logic[stage] = trigger_logic;
return SR_OK;
@@ -134,6 +135,11 @@ SR_API int ds_trigger_stage_set_inv(uint16_t stage, uint16_t probes, unsigned ch
assert(stage < TriggerStages);
assert(probes <= MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_stage_set_inv() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger0_inv[stage] = trigger0_inv;
trigger->trigger1_inv[stage] = trigger1_inv;
@@ -144,6 +150,11 @@ SR_API int ds_trigger_stage_set_count(uint16_t stage, uint16_t probes, uint32_t
assert(stage < TriggerStages);
assert(probes <= MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_stage_set_count() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger0_count[stage] = trigger0_count;
trigger->trigger1_count[stage] = trigger1_count;
@@ -159,6 +170,11 @@ SR_API int ds_trigger_probe_set(uint16_t probe, unsigned char trigger0, unsigned
{
assert(probe < MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_probe_set() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger0[TriggerStages][probe] = trigger0;
trigger->trigger1[TriggerStages][probe] = trigger1;
@@ -174,6 +190,11 @@ SR_API int ds_trigger_set_stage(uint16_t stages)
{
assert(stages <= TriggerStages);
if (trigger == NULL){
sr_err("%s", "ds_trigger_set_stage() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger_stages = stages;
return SR_OK;
@@ -188,6 +209,11 @@ SR_API int ds_trigger_set_pos(uint16_t position)
{
assert(position <= 100);
if (trigger == NULL){
sr_err("%s", "ds_trigger_set_pos() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger_pos = position;
return SR_OK;
@@ -200,6 +226,11 @@ SR_API int ds_trigger_set_pos(uint16_t position)
*/
SR_API uint16_t ds_trigger_get_pos()
{
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_pos() error, trigger have'nt be inited.");
return 0;
}
return trigger->trigger_pos;
}
@@ -210,6 +241,10 @@ SR_API uint16_t ds_trigger_get_pos()
*/
SR_API int ds_trigger_set_en(uint16_t enable)
{
if (trigger == NULL){
sr_err("%s", "ds_trigger_set_en() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger_en = enable;
@@ -236,6 +271,10 @@ SR_API uint16_t ds_trigger_get_en()
*/
SR_API int ds_trigger_set_mode(uint16_t mode)
{
if (trigger == NULL){
sr_err("%s", "ds_trigger_set_en() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
trigger->trigger_mode = mode;
@@ -251,6 +290,11 @@ SR_PRIV uint16_t ds_trigger_get_mask0(uint16_t stage, uint16_t msc, uint16_t lsc
assert(lsc <= msc);
assert(msc < MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_mask0() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
uint16_t mask = 0;
const uint16_t qutr_mask = (0xffff >> (TriggerProbes - TriggerProbes/4));
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
@@ -278,6 +322,11 @@ SR_PRIV uint16_t ds_trigger_get_mask1(uint16_t stage, uint16_t msc, uint16_t lsc
assert(lsc <= msc);
assert(msc < MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_mask1() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
uint16_t mask = 0;
const uint16_t qutr_mask = (0xffff >> (TriggerProbes - TriggerProbes/4));
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
@@ -305,6 +354,11 @@ SR_PRIV uint16_t ds_trigger_get_value0(uint16_t stage, uint16_t msc, uint16_t ls
assert(lsc <= msc);
assert(msc < MaxTriggerProbes);
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_value0() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
uint16_t value = 0;
const uint16_t qutr_mask = (0xffff >> (TriggerProbes - TriggerProbes/4));
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
@@ -337,6 +391,11 @@ SR_PRIV uint16_t ds_trigger_get_value1(uint16_t stage, uint16_t msc, uint16_t ls
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
int i;
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_value1() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
for (i = msc; i >= lsc ; i--) {
value = (value << 1);
value += ((trigger->trigger1[stage][i] == '1') | (trigger->trigger1[stage][i] == 'R'));
@@ -364,6 +423,11 @@ SR_PRIV uint16_t ds_trigger_get_edge0(uint16_t stage, uint16_t msc, uint16_t lsc
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
int i;
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_edge0() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
for (i = msc; i >= lsc ; i--) {
edge = (edge << 1);
edge += ((trigger->trigger0[stage][i] == 'R') | (trigger->trigger0[stage][i] == 'F') |
@@ -392,6 +456,11 @@ SR_PRIV uint16_t ds_trigger_get_edge1(uint16_t stage, uint16_t msc, uint16_t lsc
const uint16_t half_mask = (0xffff >> (TriggerProbes - TriggerProbes/2));
int i;
if (trigger == NULL){
sr_err("%s", "ds_trigger_get_edge1() error, trigger have'nt be inited.");
return SR_ERR_CALL_STATUS;
}
for (i = msc; i >= lsc ; i--) {
edge = (edge << 1);
edge += ((trigger->trigger1[stage][i] == 'R') | (trigger->trigger1[stage][i] == 'F') |