fix zerocopy usage
This commit is contained in:
parent
49b50ec682
commit
406d731bbe
@ -13,10 +13,13 @@ categories = ["aerospace", "aerospace::space-protocols", "no-std", "hardware-sup
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
zerocopy = ">0.5, <=0.7"
|
|
||||||
crc = "3"
|
crc = "3"
|
||||||
delegate = ">=0.8, <0.11"
|
delegate = ">=0.8, <0.11"
|
||||||
|
|
||||||
|
[dependencies.zerocopy]
|
||||||
|
version = ">0.5, <=0.7"
|
||||||
|
features = ["derive"]
|
||||||
|
|
||||||
[dependencies.thiserror]
|
[dependencies.thiserror]
|
||||||
version = "1"
|
version = "1"
|
||||||
optional = true
|
optional = true
|
||||||
|
@ -82,9 +82,9 @@ pub trait GenericPusTcSecondaryHeader {
|
|||||||
pub mod zc {
|
pub mod zc {
|
||||||
use crate::ecss::tc::GenericPusTcSecondaryHeader;
|
use crate::ecss::tc::GenericPusTcSecondaryHeader;
|
||||||
use crate::ecss::{PusError, PusVersion};
|
use crate::ecss::{PusError, PusVersion};
|
||||||
use zerocopy::{AsBytes, FromBytes, NetworkEndian, Unaligned, U16};
|
use zerocopy::{AsBytes, FromBytes, FromZeroes, NetworkEndian, Unaligned, U16};
|
||||||
|
|
||||||
#[derive(FromBytes, AsBytes, Unaligned)]
|
#[derive(FromZeroes, FromBytes, AsBytes, Unaligned)]
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct PusTcSecondaryHeader {
|
pub struct PusTcSecondaryHeader {
|
||||||
version_ack: u8,
|
version_ack: u8,
|
||||||
|
@ -40,9 +40,9 @@ pub trait GenericPusTmSecondaryHeader {
|
|||||||
pub mod zc {
|
pub mod zc {
|
||||||
use super::GenericPusTmSecondaryHeader;
|
use super::GenericPusTmSecondaryHeader;
|
||||||
use crate::ecss::{PusError, PusVersion};
|
use crate::ecss::{PusError, PusVersion};
|
||||||
use zerocopy::{AsBytes, FromBytes, NetworkEndian, Unaligned, U16};
|
use zerocopy::{AsBytes, FromBytes, FromZeroes, NetworkEndian, Unaligned, U16};
|
||||||
|
|
||||||
#[derive(FromBytes, AsBytes, Unaligned)]
|
#[derive(FromBytes, FromZeroes, AsBytes, Unaligned)]
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct PusTmSecHeaderWithoutTimestamp {
|
pub struct PusTmSecHeaderWithoutTimestamp {
|
||||||
pus_version_and_sc_time_ref_status: u8,
|
pus_version_and_sc_time_ref_status: u8,
|
||||||
|
@ -641,9 +641,9 @@ sph_from_other!(SpHeader, crate::zc::SpHeader);
|
|||||||
pub mod zc {
|
pub mod zc {
|
||||||
use crate::{CcsdsPacket, CcsdsPrimaryHeader, PacketId, PacketSequenceCtrl, VERSION_MASK};
|
use crate::{CcsdsPacket, CcsdsPrimaryHeader, PacketId, PacketSequenceCtrl, VERSION_MASK};
|
||||||
use zerocopy::byteorder::NetworkEndian;
|
use zerocopy::byteorder::NetworkEndian;
|
||||||
use zerocopy::{AsBytes, FromBytes, Unaligned, U16};
|
use zerocopy::{AsBytes, FromBytes, FromZeroes, Unaligned, U16};
|
||||||
|
|
||||||
#[derive(FromBytes, AsBytes, Unaligned, Debug)]
|
#[derive(FromBytes, FromZeroes, AsBytes, Unaligned, Debug)]
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct SpHeader {
|
pub struct SpHeader {
|
||||||
version_packet_id: U16<NetworkEndian>,
|
version_packet_id: U16<NetworkEndian>,
|
||||||
|
Loading…
Reference in New Issue
Block a user