fix number of chunks constant

embassy-rs · Apr 30, 2024 · 0400177 · 0400177
1 parent 0ad345e
commit 0400177
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/file.rs b/src/file.rs
@@ -10,8 +10,11 @@ pub use crate::page::ReadError;
 use crate::page::{ChunkHeader, DehydratedPageReader, Header, PageHeader, PageReader, PageWriter};
 use crate::types::{OptionPageID, PageID};
 
+
+pub(crate) const CHUNKS_PER_PAGE: usize = (PAGE_SIZE - PageHeader::SIZE - size_of::<DataHeader>()).div_ceil(MAX_CHUNK_SIZE + ChunkHeader::SIZE);
 pub const PAGE_MAX_PAYLOAD_SIZE: usize =
-    PAGE_SIZE - PageHeader::SIZE - size_of::<DataHeader>() - (page::CHUNKS_PER_PAGE * ChunkHeader::SIZE);
+    PAGE_SIZE - PageHeader::SIZE - (CHUNKS_PER_PAGE * ChunkHeader::SIZE) - size_of::<DataHeader>();
+
 
 pub type FileID = u8;
 

diff --git a/src/page.rs b/src/page.rs
@@ -59,7 +59,6 @@ pub(crate) const MAX_CHUNK_SIZE: usize = if config::MAX_CHUNK_SIZE > (PAGE_SIZE
 } else {
     config::MAX_CHUNK_SIZE
 };
-pub(crate) const CHUNKS_PER_PAGE: usize = (PAGE_SIZE - PageHeader::SIZE) / (MAX_CHUNK_SIZE + ChunkHeader::SIZE);
 
 async fn write_header<F: Flash, H: Header>(flash: &mut F, page_id: PageID, header: H) -> Result<(), F::Error> {
     assert!(size_of::<H>() <= MAX_HEADER_SIZE);
@@ -649,7 +648,7 @@ mod tests {
 
     const HEADER: TestHeader = TestHeader { foo: 123456 };
     const MAX_PAYLOAD: usize =
-        PAGE_SIZE - PageHeader::SIZE - size_of::<TestHeader>() - (ChunkHeader::SIZE * CHUNKS_PER_PAGE);
+        PAGE_SIZE - PageHeader::SIZE - size_of::<TestHeader>() - ChunkHeader::SIZE;
 
     #[test_log::test]
     fn test_crc32() {