Skip to content

Commit

Permalink
Merge pull request #507 from ut-issl/feature/fix_ds_small
Browse files Browse the repository at this point in the history 
DS の関数の順序を微修正
  • Loading branch information
@meltingrabbit
meltingrabbit committed Mar 9, 2023
2 parents d072800 + cc32a26 commit aae0e30
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 34 deletions.
50 changes: 25 additions & 25 deletions Drivers/Super/driver_super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1400,13 +1400,6 @@ void DSSC_disable_strict_frame_search(DS_StreamConfig* p_stream_config)
p_stream_config->settings.is_strict_frame_search_ = 0;
}

void DSSC_set_tx_frame(DS_StreamConfig* p_stream_config,
uint8_t* tx_frame)
{
p_stream_config->settings.tx_frame_ = tx_frame;
p_stream_config->internal.is_validation_needed_for_send_ = 1;
}

const uint8_t* DSSC_get_tx_frame(DS_StreamConfig* p_stream_config)
{
return p_stream_config->settings.tx_frame_;
Expand All @@ -1417,10 +1410,10 @@ uint8_t* DSSC_get_tx_frame_as_non_const_pointer(DS_StreamConfig* p_stream_config
return p_stream_config->settings.tx_frame_;
}

void DSSC_set_tx_frame_size(DS_StreamConfig* p_stream_config,
const uint16_t tx_frame_size)
void DSSC_set_tx_frame(DS_StreamConfig* p_stream_config,
uint8_t* tx_frame)
{
p_stream_config->settings.tx_frame_size_ = tx_frame_size;
p_stream_config->settings.tx_frame_ = tx_frame;
p_stream_config->internal.is_validation_needed_for_send_ = 1;
}

Expand All @@ -1429,10 +1422,10 @@ uint16_t DSSC_get_tx_frame_size(const DS_StreamConfig* p_stream_config)
return (uint16_t)p_stream_config->settings.tx_frame_size_;
}

void DSSC_set_tx_frame_buffer_size(DS_StreamConfig* p_stream_config,
const int16_t tx_frame_buffer_size)
void DSSC_set_tx_frame_size(DS_StreamConfig* p_stream_config,
const uint16_t tx_frame_size)
{
p_stream_config->settings.tx_frame_buffer_size_ = tx_frame_buffer_size;
p_stream_config->settings.tx_frame_size_ = tx_frame_size;
p_stream_config->internal.is_validation_needed_for_send_ = 1;
}

Expand All @@ -1441,6 +1434,13 @@ int16_t DSSC_get_tx_frame_buffer_size(DS_StreamConfig* p_stream_config)
return (int16_t)p_stream_config->settings.tx_frame_buffer_size_;
}

void DSSC_set_tx_frame_buffer_size(DS_StreamConfig* p_stream_config,
const int16_t tx_frame_buffer_size)
{
p_stream_config->settings.tx_frame_buffer_size_ = tx_frame_buffer_size;
p_stream_config->internal.is_validation_needed_for_send_ = 1;
}

void DSSC_set_rx_buffer(DS_StreamConfig* p_stream_config,
DS_StreamRecBuffer* rx_buffer)
{
Expand All @@ -1457,6 +1457,11 @@ void DSSC_set_rx_header(DS_StreamConfig* p_stream_config,
p_stream_config->internal.is_validation_needed_for_rec_ = 1;
}

uint16_t DSSC_get_rx_header_size(const DS_StreamConfig* p_stream_config)
{
return (uint16_t)p_stream_config->settings.rx_header_size_;
}

void DSSC_set_rx_footer(DS_StreamConfig* p_stream_config,
const uint8_t* rx_footer,
const uint16_t rx_footer_size)
Expand All @@ -1466,18 +1471,6 @@ void DSSC_set_rx_footer(DS_StreamConfig* p_stream_config,
p_stream_config->internal.is_validation_needed_for_rec_ = 1;
}

void DSSC_set_rx_frame_size(DS_StreamConfig* p_stream_config,
const int16_t rx_frame_size)
{
p_stream_config->settings.rx_frame_size_ = rx_frame_size;
p_stream_config->internal.is_validation_needed_for_rec_ = 1;
}

uint16_t DSSC_get_rx_header_size(const DS_StreamConfig* p_stream_config)
{
return (uint16_t)p_stream_config->settings.rx_header_size_;
}

uint16_t DSSC_get_rx_footer_size(const DS_StreamConfig* p_stream_config)
{
return (uint16_t)p_stream_config->settings.rx_footer_size_;
Expand All @@ -1488,6 +1481,13 @@ int16_t DSSC_get_rx_frame_size(const DS_StreamConfig* p_stream_config)
return (int16_t)p_stream_config->settings.rx_frame_size_;
}

void DSSC_set_rx_frame_size(DS_StreamConfig* p_stream_config,
const int16_t rx_frame_size)
{
p_stream_config->settings.rx_frame_size_ = rx_frame_size;
p_stream_config->internal.is_validation_needed_for_rec_ = 1;
}

void DSSC_set_rx_framelength_pos(DS_StreamConfig* p_stream_config,
const int16_t rx_framelength_pos)
{
Expand Down
17 changes: 8 additions & 9 deletions Drivers/Super/driver_super.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ void DSC_set_time_threshold_for_rx_disruption(DriverSuper* p_super,
const uint32_t time_threshold_for_rx_disruption);


// ###### DS_Config Getter/Setter of Info ######
// ###### DS_Config Getter of Info ######
const DS_RecStatus* DSC_get_rec_status(const DriverSuper* p_super);
uint32_t DSC_get_rx_count(const DriverSuper* p_super);
uint32_t DSC_get_rx_call_count(const DriverSuper* p_super);
Expand All @@ -565,31 +565,30 @@ uint8_t DSSC_get_is_strict_frame_search(const DS_StreamConfig* p_stream_config);
void DSSC_enable_strict_frame_search(DS_StreamConfig* p_stream_config);
void DSSC_disable_strict_frame_search(DS_StreamConfig* p_stream_config);

// FIXME: get, set 順番逆？
void DSSC_set_tx_frame(DS_StreamConfig* p_stream_config,
uint8_t* tx_frame);
const uint8_t* DSSC_get_tx_frame(DS_StreamConfig* p_stream_config);
uint8_t* DSSC_get_tx_frame_as_non_const_pointer(DS_StreamConfig* p_stream_config);
void DSSC_set_tx_frame(DS_StreamConfig* p_stream_config,
uint8_t* tx_frame);
uint16_t DSSC_get_tx_frame_size(const DS_StreamConfig* p_stream_config);
void DSSC_set_tx_frame_size(DS_StreamConfig* p_stream_config,
const uint16_t tx_frame_size);
uint16_t DSSC_get_tx_frame_size(const DS_StreamConfig* p_stream_config);
int16_t DSSC_get_tx_frame_buffer_size(DS_StreamConfig* p_stream_config);
void DSSC_set_tx_frame_buffer_size(DS_StreamConfig* p_stream_config,
const int16_t tx_frame_buffer_size);
int16_t DSSC_get_tx_frame_buffer_size(DS_StreamConfig* p_stream_config);

void DSSC_set_rx_buffer(DS_StreamConfig* p_stream_config,
DS_StreamRecBuffer* rx_buffer);
void DSSC_set_rx_header(DS_StreamConfig* p_stream_config,
const uint8_t* rx_header,
const uint16_t rx_header_size);
uint16_t DSSC_get_rx_header_size(const DS_StreamConfig* p_stream_config);
void DSSC_set_rx_footer(DS_StreamConfig* p_stream_config,
const uint8_t* rx_footer,
const uint16_t rx_footer_size);
void DSSC_set_rx_frame_size(DS_StreamConfig* p_stream_config,
const int16_t rx_frame_size);
uint16_t DSSC_get_rx_header_size(const DS_StreamConfig* p_stream_config);
uint16_t DSSC_get_rx_footer_size(const DS_StreamConfig* p_stream_config);
int16_t DSSC_get_rx_frame_size(const DS_StreamConfig* p_stream_config);
void DSSC_set_rx_frame_size(DS_StreamConfig* p_stream_config,
const int16_t rx_frame_size);

void DSSC_set_rx_framelength_pos(DS_StreamConfig* p_stream_config,
const int16_t rx_framelength_pos);
Expand Down

0 comments on commit aae0e30

Please sign in to comment.