Skip to content

Commit 9bf3ee4

Browse files
CourtneyDrantCourtneyDrant
committed
Formatting changes
1 parent cf6862f commit 9bf3ee4

File tree

9 files changed

+105
-129
lines changed

9 files changed

+105
-129
lines changed

‎pldm-common/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ pub mod codec;
66
pub mod error;
77
pub mod message;
88
pub mod protocol;
9-
pub mod util;
9+
pub mod util;

‎pldm-interface/src/cmd_interface.rs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ pub struct CmdInterface<'a> {
3434
}
3535

3636
impl<'a> CmdInterface<'a> {
37-
pub fn new(
38-
protocol_capabilities: &'a [ProtocolCapability],
39-
) -> Self {
37+
pub fn new(protocol_capabilities: &'a [ProtocolCapability]) -> Self {
4038
let ctrl_ctx = ControlContext::new(protocol_capabilities);
4139
let fd_ctx = FirmwareDeviceContext::new();
4240
Self {
@@ -46,21 +44,14 @@ impl<'a> CmdInterface<'a> {
4644
}
4745
}
4846

49-
pub fn handle_responder_msg(
50-
&mut self,
51-
msg_buf: &mut [u8],
52-
) -> Result<usize, MsgHandlerError> {
47+
pub fn handle_responder_msg(&mut self, msg_buf: &mut [u8]) -> Result<usize, MsgHandlerError> {
5348
// Process the request
5449
let resp_len = self.process_request(msg_buf)?;
5550

5651
Ok(resp_len)
5752
}
5853

59-
pub fn handle_initiator_msg(
60-
&mut self,
61-
msg_buf: &mut [u8],
62-
) -> Result<(), MsgHandlerError> {
63-
54+
pub fn handle_initiator_msg(&mut self, msg_buf: &mut [u8]) -> Result<(), MsgHandlerError> {
6455
// Prepare the request payload
6556
let payload = construct_mctp_pldm_msg(msg_buf).map_err(MsgHandlerError::Util)?;
6657

‎pldm-interface/src/config.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ pub static PLDM_PROTOCOL_CAPABILITIES: [ProtocolCapability<'static>; PLDM_PROTOC
4141
FwUpdateCmd::CancelUpdate as u8,
4242
],
4343
},
44-
];
44+
];

‎pldm-interface/src/control_context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,4 +305,4 @@ impl CtrlCmdResponder for ControlContext<'_> {
305305
}
306306
}
307307
}
308-
}
308+
}

‎pldm-interface/src/firmware_device/fd_context.rs‎

Lines changed: 64 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl FirmwareDeviceContext {
6767
pub fn new() -> Self {
6868
Self {
6969
ops: FdOps::new(),
70-
internal: FdInternal::new(0,0,0)
70+
internal: FdInternal::new(0, 0, 0),
7171
}
7272
}
7373

@@ -81,7 +81,7 @@ impl FirmwareDeviceContext {
8181
// Get the device identifiers
8282
let descriptor_cnt = self
8383
.ops
84-
.get_device_identifiers(&mut device_identifiers) //CAD Driver Call
84+
.get_device_identifiers(&mut device_identifiers)
8585
.map_err(MsgHandlerError::FdOps)?;
8686

8787
// Create the response message
@@ -252,8 +252,7 @@ impl FirmwareDeviceContext {
252252
if transfer_flag == TransferRespFlag::End
253253
|| transfer_flag == TransferRespFlag::StartAndEnd
254254
{
255-
self.internal
256-
.set_fd_state(FirmwareDeviceState::ReadyXfer);
255+
self.internal.set_fd_state(FirmwareDeviceState::ReadyXfer);
257256
}
258257
Ok(bytes)
259258
}
@@ -339,8 +338,7 @@ impl FirmwareDeviceContext {
339338
.set_fd_req(FdReqState::Ready, false, None, None, None, None);
340339

341340
// Move FD state machine to download state.
342-
self.internal
343-
.set_fd_state(FirmwareDeviceState::Download);
341+
self.internal.set_fd_state(FirmwareDeviceState::Download);
344342
}
345343
Ok(bytes)
346344
}
@@ -350,10 +348,7 @@ impl FirmwareDeviceContext {
350348
}
351349
}
352350

353-
pub fn activate_firmware_rsp(
354-
&mut self,
355-
payload: &mut [u8],
356-
) -> Result<usize, MsgHandlerError> {
351+
pub fn activate_firmware_rsp(&mut self, payload: &mut [u8]) -> Result<usize, MsgHandlerError> {
357352
// Check if FD is in 'ReadyTransfer' state. Otherwise returns 'INVALID_STATE' completion code
358353
if self.internal.get_fd_state() != FirmwareDeviceState::ReadyXfer {
359354
return generate_failure_response(
@@ -392,10 +387,8 @@ impl FirmwareDeviceContext {
392387
if completion_code == PldmBaseCompletionCode::Success as u8
393388
|| completion_code == FwUpdateCompletionCode::ActivationNotRequired as u8
394389
{
395-
self.internal
396-
.set_fd_state(FirmwareDeviceState::Activate);
397-
self.internal
398-
.set_fd_idle(GetStatusReasonCode::ActivateFw);
390+
self.internal.set_fd_state(FirmwareDeviceState::Activate);
391+
self.internal.set_fd_idle(GetStatusReasonCode::ActivateFw);
399392
}
400393
Ok(bytes)
401394
}
@@ -423,8 +416,7 @@ impl FirmwareDeviceContext {
423416
FirmwareDeviceState::Apply => {
424417
// In apply state, only cancel if not completed successfully
425418
!(self.internal.is_fd_req_complete()
426-
&& self.internal.get_fd_req_result()
427-
== Some(ApplyResult::ApplySuccess as u8))
419+
&& self.internal.get_fd_req_result() == Some(ApplyResult::ApplySuccess as u8))
428420
}
429421
_ => {
430422
return generate_failure_response(
@@ -453,8 +445,7 @@ impl FirmwareDeviceContext {
453445
Ok(bytes) => {
454446
if should_cancel {
455447
// Set FD state to 'ReadyTransfer'
456-
self.internal
457-
.set_fd_state(FirmwareDeviceState::ReadyXfer);
448+
self.internal.set_fd_state(FirmwareDeviceState::ReadyXfer);
458449
}
459450
Ok(bytes)
460451
}
@@ -482,8 +473,7 @@ impl FirmwareDeviceContext {
482473
FirmwareDeviceState::Apply => {
483474
// In apply state, only cancel if not completed successfully
484475
!(self.internal.is_fd_req_complete()
485-
&& self.internal.get_fd_req().result
486-
== Some(ApplyResult::ApplySuccess as u8))
476+
&& self.internal.get_fd_req().result == Some(ApplyResult::ApplySuccess as u8))
487477
}
488478
_ => false,
489479
};
@@ -518,8 +508,7 @@ impl FirmwareDeviceContext {
518508
Ok(bytes) => {
519509
if should_cancel {
520510
// Set FD state to 'Idle'
521-
self.internal
522-
.set_fd_idle(GetStatusReasonCode::CancelUpdate);
511+
self.internal.set_fd_idle(GetStatusReasonCode::CancelUpdate);
523512
}
524513
Ok(bytes)
525514
}
@@ -561,10 +550,7 @@ impl FirmwareDeviceContext {
561550
let update_flags = self.internal.get_update_flags();
562551
(progress, update_flags)
563552
}
564-
_ => (
565-
ProgressPercent::default(),
566-
self.internal.get_update_flags(),
567-
),
553+
_ => (ProgressPercent::default(), self.internal.get_update_flags()),
568554
};
569555

570556
let (aux_state, aux_state_status) = match self.internal.get_fd_req_state() {
@@ -625,8 +611,7 @@ impl FirmwareDeviceContext {
625611
}
626612

627613
pub fn set_fd_t1_ts(&mut self) {
628-
self.internal
629-
.set_fd_t1_update_ts(self.ops.now());
614+
self.internal.set_fd_t1_update_ts(self.ops.now());
630615
}
631616

632617
pub fn should_start_initiator_mode(&mut self) -> bool {
@@ -715,15 +700,14 @@ impl FirmwareDeviceContext {
715700
code if code == PldmBaseCompletionCode::Success as u8 => {}
716701
code if code == FwUpdateCompletionCode::RetryRequestFwData as u8 => return Ok(()),
717702
_ => {
718-
self.internal
719-
.set_fd_req(
720-
FdReqState::Ready,
721-
true,
722-
Some(TransferResult::FdAbortedTransfer as u8),
723-
None,
724-
None,
725-
None,
726-
);
703+
self.internal.set_fd_req(
704+
FdReqState::Ready,
705+
true,
706+
Some(TransferResult::FdAbortedTransfer as u8),
707+
None,
708+
None,
709+
None,
710+
);
727711
return Ok(());
728712
}
729713
}
@@ -743,15 +727,14 @@ impl FirmwareDeviceContext {
743727
if res == TransferResult::TransferSuccess {
744728
if self.ops.is_download_complete(fw_component) {
745729
// Mark as complete, next progress() call will send the TransferComplete request
746-
self.internal
747-
.set_fd_req(
748-
FdReqState::Ready,
749-
true,
750-
Some(TransferResult::TransferSuccess as u8),
751-
None,
752-
None,
753-
None,
754-
);
730+
self.internal.set_fd_req(
731+
FdReqState::Ready,
732+
true,
733+
Some(TransferResult::TransferSuccess as u8),
734+
None,
735+
None,
736+
None,
737+
);
755738
} else {
756739
// Invoke another request if there is more data to download
757740
self.internal
@@ -786,8 +769,7 @@ impl FirmwareDeviceContext {
786769
.set_initiator_mode(InitiatorModeState::Verify(VerifyState::default()));
787770
self.internal
788771
.set_fd_req(FdReqState::Ready, false, None, None, None, None);
789-
self.internal
790-
.set_fd_state(FirmwareDeviceState::Verify);
772+
self.internal.set_fd_state(FirmwareDeviceState::Verify);
791773
} else {
792774
// Wait for UA to cancel
793775
self.internal
@@ -797,10 +779,7 @@ impl FirmwareDeviceContext {
797779
Ok(())
798780
}
799781

800-
fn process_verify_complete_rsp(
801-
&mut self,
802-
_payload: &mut [u8],
803-
) -> Result<(), MsgHandlerError> {
782+
fn process_verify_complete_rsp(&mut self, _payload: &mut [u8]) -> Result<(), MsgHandlerError> {
804783
let fd_state = self.internal.get_fd_state();
805784
if fd_state != FirmwareDeviceState::Verify {
806785
return Err(MsgHandlerError::FdInitiatorModeError);
@@ -843,8 +822,7 @@ impl FirmwareDeviceContext {
843822
// Switch to Xfer
844823
self.internal
845824
.set_fd_req(FdReqState::Unused, false, None, None, None, None);
846-
self.internal
847-
.set_fd_state(FirmwareDeviceState::ReadyXfer);
825+
self.internal.set_fd_state(FirmwareDeviceState::ReadyXfer);
848826
} else {
849827
// Wait for UA to cancel
850828
self.internal
@@ -877,15 +855,14 @@ impl FirmwareDeviceContext {
877855

878856
// Set fd req state to sent
879857
let req_sent_timestamp = self.ops.now();
880-
self.internal
881-
.set_fd_req(
882-
FdReqState::Sent,
883-
true,
884-
Some(result),
885-
Some(instance_id),
886-
Some(FwUpdateCmd::TransferComplete as u8),
887-
Some(req_sent_timestamp),
888-
);
858+
self.internal.set_fd_req(
859+
FdReqState::Sent,
860+
true,
861+
Some(result),
862+
Some(instance_id),
863+
Some(FwUpdateCmd::TransferComplete as u8),
864+
Some(req_sent_timestamp),
865+
);
889866

890867
Ok(msg_len)
891868
} else {
@@ -913,15 +890,14 @@ impl FirmwareDeviceContext {
913890

914891
// Set fd req state to sent
915892
let req_sent_timestamp = self.ops.now();
916-
self.internal
917-
.set_fd_req(
918-
FdReqState::Sent,
919-
false,
920-
None,
921-
Some(instance_id),
922-
Some(FwUpdateCmd::RequestFirmwareData as u8),
923-
Some(req_sent_timestamp),
924-
);
893+
self.internal.set_fd_req(
894+
FdReqState::Sent,
895+
false,
896+
None,
897+
Some(instance_id),
898+
Some(FwUpdateCmd::RequestFirmwareData as u8),
899+
Some(req_sent_timestamp),
900+
);
925901
Ok(msg_len)
926902
} else {
927903
Err(MsgHandlerError::FdInitiatorModeError)
@@ -961,15 +937,14 @@ impl FirmwareDeviceContext {
961937
.encode(_payload)
962938
.map_err(MsgHandlerError::Codec)?;
963939

964-
self.internal
965-
.set_fd_req(
966-
FdReqState::Sent,
967-
true,
968-
Some(res as u8),
969-
Some(instance_id),
970-
Some(FwUpdateCmd::VerifyComplete as u8),
971-
Some(self.ops.now()),
972-
);
940+
self.internal.set_fd_req(
941+
FdReqState::Sent,
942+
true,
943+
Some(res as u8),
944+
Some(instance_id),
945+
Some(FwUpdateCmd::VerifyComplete as u8),
946+
Some(self.ops.now()),
947+
);
973948

974949
Ok(msg_len)
975950
}
@@ -1010,15 +985,14 @@ impl FirmwareDeviceContext {
1010985
.encode(_payload)
1011986
.map_err(MsgHandlerError::Codec)?;
1012987

1013-
self.internal
1014-
.set_fd_req(
1015-
FdReqState::Sent,
1016-
true,
1017-
Some(res as u8),
1018-
Some(instance_id),
1019-
Some(FwUpdateCmd::ApplyComplete as u8),
1020-
Some(self.ops.now()),
1021-
);
988+
self.internal.set_fd_req(
989+
FdReqState::Sent,
990+
true,
991+
Some(res as u8),
992+
Some(instance_id),
993+
Some(FwUpdateCmd::ApplyComplete as u8),
994+
Some(self.ops.now()),
995+
);
1022996

1023997
Ok(msg_len)
1024998
}

‎pldm-interface/src/firmware_device/fd_internal.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ impl FdInternal {
163163

164164
pub fn alloc_next_instance_id(&mut self) -> Option<u8> {
165165
self.req.instance_id = Some(
166-
self
167-
.req
166+
self.req
168167
.instance_id
169168
.map_or(1, |id| (id + 1) % crate::config::INSTANCE_ID_COUNT),
170169
);

0 commit comments

Comments
 (0)