rust/cfdp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

some more renaming
Some checks failed
Rust/cfdp/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2024-09-05 14:49:50 +02:00
parent 80c91b59d3
commit a51ab5e878
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dest.rs
View File

@@ -88,7 +88,7 @@ pub enum TransactionStep {
// This contains transfer state parameters for destination transaction. // This contains transfer state parameters for destination transaction.
#[derive(Debug)] #[derive(Debug)]
struct TransferState<CheckTimer: CountdownProvider> { struct TransferState<Countdown: CountdownProvider> {
transaction_id: Option<TransactionId>, transaction_id: Option<TransactionId>,
metadata_params: MetadataGenericParams, metadata_params: MetadataGenericParams,
progress: u64, progress: u64,
@@ -99,7 +99,7 @@ struct TransferState<CheckTimer: CountdownProvider> {
completion_disposition: CompletionDisposition, completion_disposition: CompletionDisposition,
checksum: u32, checksum: u32,
current_check_count: u32, current_check_count: u32,
current_check_timer: Option<CheckTimer>, current_check_timer: Option<Countdown>,
} }
impl<CheckTimer: CountdownProvider> Default for TransferState<CheckTimer> { impl<CheckTimer: CountdownProvider> Default for TransferState<CheckTimer> {
@@ -122,8 +122,8 @@ impl<CheckTimer: CountdownProvider> Default for TransferState<CheckTimer> {
// This contains parameters for destination transaction. // This contains parameters for destination transaction.
#[derive(Debug)] #[derive(Debug)]
struct TransactionParams<CheckTimer: CountdownProvider> { struct TransactionParams<Countdown: CountdownProvider> {
tstate: TransferState<CheckTimer>, tstate: TransferState<Countdown>,
pdu_conf: CommonPduConfig, pdu_conf: CommonPduConfig,
file_properties: FileProperties, file_properties: FileProperties,
cksum_buf: [u8; 1024], cksum_buf: [u8; 1024],
@@ -315,7 +315,7 @@ impl<
pdu_sender: PduSender, pdu_sender: PduSender,
vfs: Vfs, vfs: Vfs,
remote_cfg_table: RemoteCfgTable, remote_cfg_table: RemoteCfgTable,
check_timer_creator: TimerCreator, timer_creator: TimerCreator,
) -> Self { ) -> Self {
Self { Self {
local_cfg, local_cfg,
@@ -326,7 +326,7 @@ impl<
pdu_sender, pdu_sender,
vfs, vfs,
remote_cfg_table, remote_cfg_table,
check_timer_creator, check_timer_creator: timer_creator,
} }
} }

14
src/source.rs
View File

@@ -238,8 +238,8 @@ impl<
UserFaultHook: UserFaultHookProvider, UserFaultHook: UserFaultHookProvider,
Vfs: VirtualFilestore, Vfs: VirtualFilestore,
RemoteCfgTable: RemoteEntityConfigProvider, RemoteCfgTable: RemoteEntityConfigProvider,
CheckTimerCreator: TimerCreatorProvider<Countdown = CheckTimerProvider>, TimerCreator: TimerCreatorProvider<Countdown = Countdown>,
CheckTimerProvider: CountdownProvider, Countdown: CountdownProvider,
SeqCountProvider: SequenceCountProvider, SeqCountProvider: SequenceCountProvider,
> >
SourceHandler< SourceHandler<
@@ -247,8 +247,8 @@ impl<
UserFaultHook, UserFaultHook,
Vfs, Vfs,
RemoteCfgTable, RemoteCfgTable,
CheckTimerCreator, TimerCreator,
CheckTimerProvider, Countdown,
SeqCountProvider, SeqCountProvider,
> >
{ {
@@ -269,7 +269,7 @@ impl<
/// example 2048 or 4096 bytes. /// example 2048 or 4096 bytes.
/// * `remote_cfg_table` - The [RemoteEntityConfigProvider] used to look up remote /// * `remote_cfg_table` - The [RemoteEntityConfigProvider] used to look up remote
/// entities and target specific configuration for file copy operations. /// entities and target specific configuration for file copy operations.
/// * `check_timer_creator` - [CheckTimerProviderCreator] used by the CFDP handler to generate /// * `timer_creator` - [TimerCreatorProvider] used by the CFDP handler to generate
/// timers required by various tasks. This allows to use this handler for embedded systems /// timers required by various tasks. This allows to use this handler for embedded systems
/// where the standard time APIs might not be available. /// where the standard time APIs might not be available.
/// * `seq_count_provider` - The [SequenceCountProvider] used to generate the [TransactionId] /// * `seq_count_provider` - The [SequenceCountProvider] used to generate the [TransactionId]
@@ -282,7 +282,7 @@ impl<
put_request_cacher: StaticPutRequestCacher, put_request_cacher: StaticPutRequestCacher,
pdu_and_cksum_buf_size: usize, pdu_and_cksum_buf_size: usize,
remote_cfg_table: RemoteCfgTable, remote_cfg_table: RemoteCfgTable,
check_timer_creator: CheckTimerCreator, timer_creator: TimerCreator,
seq_count_provider: SeqCountProvider, seq_count_provider: SeqCountProvider,
) -> Self { ) -> Self {
Self { Self {
@@ -297,7 +297,7 @@ impl<
fparams: Default::default(), fparams: Default::default(),
pdu_conf: Default::default(), pdu_conf: Default::default(),
countdown: None, countdown: None,
timer_creator: check_timer_creator, timer_creator,
seq_count_provider, seq_count_provider,
} }
} }