Merge pull request #119 from flipperzero-rs/sdk-46.0

Migrate to SDK 46.0 (firmware 0.95.0)

Author: str4d

CHANGELOG.md

@@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Changed
 
-- Migrated to SDK 40.1 (firmware 0.94.1).
+- Migrated to SDK 46.0 (firmware 0.95.0).
 
 ## [0.11.0]
 

README.md

@@ -1,7 +1,7 @@
 # Rust for Flipper Zero 🐬❤️🦀
 
 [![crates.io](https://img.shields.io/crates/v/flipperzero)](https://crates.io/crates/flipperzero)
-[![Flipper Zero API](https://img.shields.io/badge/Flipper%20Zero%20API-40.1-orange)](https://github.com/flipperdevices/flipperzero-firmware/blob/0.94.1/firmware/targets/f7/api_symbols.csv)
+[![Flipper Zero API](https://img.shields.io/badge/Flipper%20Zero%20API-46.0-orange)](https://github.com/flipperdevices/flipperzero-firmware/blob/0.95.0/targets/f7/api_symbols.csv)
 [![docs.rs](https://img.shields.io/docsrs/flipperzero)](https://docs.rs/flipperzero)
 [![MIT license](https://img.shields.io/crates/l/flipperzero)](LICENSE)
 
@@ -17,13 +17,13 @@ This means it's not possible to use anything in the [`std`](https://doc.rust-lan
 
 ## SDK version
 
-Currently supports SDK 40.1 ([flipperzero-firmware@0.94.1](https://github.com/flipperdevices/flipperzero-firmware/tree/0.94.1)).
+Currently supports SDK 46.0 ([flipperzero-firmware@0.95.0](https://github.com/flipperdevices/flipperzero-firmware/tree/0.95.0)).
 
-The crate major version number will be updated after a bump in [API version](https://github.com/flipperdevices/flipperzero-firmware/blob/release/firmware/targets/f7/api_symbols.csv) in the Flipper Zero firmware.
+The crate major version number will be updated after a bump in [API version](https://github.com/flipperdevices/flipperzero-firmware/blob/release/targets/f7/api_symbols.csv) in the Flipper Zero firmware.
 
 | Crate version | API version |
 |---------------|-------------|
-| Unreleased    | 40.1        |
+| Unreleased    | 46.0        |
 | 0.11.x        | 35.0        |
 | 0.10.x        | 28.2        |
 | 0.9.x         | 23.0        |

crates/flipperzero/src/storage.rs

@@ -174,14 +174,13 @@ impl Drop for File {
 
 impl Read for File {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
-        let to_read = buf.len().try_into().map_err(|_| Error::InvalidParameter)?;
         let bytes_read = unsafe {
-            sys::storage_file_read(self.0.as_ptr(), buf.as_mut_ptr() as *mut c_void, to_read)
+            sys::storage_file_read(self.0.as_ptr(), buf.as_mut_ptr() as *mut c_void, buf.len())
         };
         let error = unsafe { sys::storage_file_get_error(self.0.as_ptr()) };
 
         if error == sys::FS_Error_FSE_OK {
-            Ok(bytes_read as usize)
+            Ok(bytes_read)
         } else {
             Err(Error::from_sys(error).unwrap())
         }
@@ -242,14 +241,13 @@ impl Seek for File {
 
 impl Write for File {
     fn write(&mut self, buf: &[u8]) -> Result<usize, Error> {
-        let to_write = buf.len().try_into().map_err(|_| Error::InvalidParameter)?;
         let bytes_written = unsafe {
-            sys::storage_file_write(self.0.as_ptr(), buf.as_ptr() as *mut c_void, to_write)
+            sys::storage_file_write(self.0.as_ptr(), buf.as_ptr() as *mut c_void, buf.len())
         };
         let error = unsafe { sys::storage_file_get_error(self.0.as_ptr()) };
 
         if error == sys::FS_Error_FSE_OK {
-            Ok(bytes_written as usize)
+            Ok(bytes_written)
         } else {
             Err(Error::from_sys(error).unwrap())
         }