capsules: update to new write_continue format

YoeDistro · Jan 16, 2024 · 43f0e35 · 43f0e35
1 parent 2522da1
commit 43f0e35
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 20 deletions.
diff --git a/capsules/extra/src/lpm013m126.rs b/capsules/extra/src/lpm013m126.rs
@@ -424,7 +424,11 @@ where
         ret
     }
 
-    fn write(&self, data: SubSliceMut<'static, u8>) -> Result<(), ErrorCode> {
+    fn write(
+        &self,
+        data: SubSliceMut<'static, u8>,
+        _continue_write: bool,
+    ) -> Result<(), ErrorCode> {
         let len = data.len();
         let buffer = data.take();
 

diff --git a/capsules/extra/src/screen.rs b/capsules/extra/src/screen.rs
@@ -231,7 +231,7 @@ impl<'a> Screen<'a> {
                         if len > 0 {
                             let mut data = SubSliceMut::new(buffer);
                             data.slice(..len);
-                            self.screen.write(data)
+                            self.screen.write(data, false)
                         } else {
                             self.buffer.replace(buffer);
                             self.run_next_command(kernel::errorcode::into_statuscode(Ok(())), 0, 0);
@@ -267,7 +267,7 @@ impl<'a> Screen<'a> {
                         if len > 0 {
                             let mut data = SubSliceMut::new(buffer);
                             data.slice(..len);
-                            self.screen.write(data)
+                            self.screen.write(data, false)
                         } else {
                             self.buffer.replace(buffer);
                             self.run_next_command(kernel::errorcode::into_statuscode(Ok(())), 0, 0);
@@ -434,7 +434,7 @@ impl<'a> hil::screen::ScreenClient for Screen<'a> {
         if r == Ok(()) && len > 0 {
             let mut data = SubSliceMut::new(buffer);
             data.slice(..len);
-            let _ = self.screen.write(data);
+            let _ = self.screen.write(data, true);
         } else {
             self.buffer.replace(buffer);
             self.run_next_command(kernel::errorcode::into_statuscode(r), 0, 0);

diff --git a/capsules/extra/src/st77xx.rs b/capsules/extra/src/st77xx.rs
@@ -790,28 +790,38 @@ impl<'a, A: Alarm<'a>, B: Bus<'a>, P: Pin> screen::Screen<'a> for ST77XX<'a, A,
         }
     }
 
-    fn write(&self, data: SubSliceMut<'static, u8>) -> Result<(), ErrorCode> {
+    fn write(&self, data: SubSliceMut<'static, u8>, continue_write: bool) -> Result<(), ErrorCode> {
         if self.status.get() == Status::Idle {
             self.setup_command.set(false);
             let len = data.len();
             self.write_buffer.replace(data.take());
-            let buffer_len = self.buffer.map_or_else(
-                || panic!("st77xx: buffer is not available"),
-                |buffer| buffer.len(),
-            );
-            if buffer_len > 0 {
-                // set buffer
-                self.sequence_buffer.map_or_else(
-                    || panic!("st77xx: write no sequence buffer"),
-                    |sequence| {
-                        sequence[0] = SendCommand::Slice(&WRITE_RAM, len);
-                        self.sequence_len.set(1);
-                    },
+
+            if continue_write == false {
+                // Writing new data for the first time, make sure to reset
+                // the screen buffer location to the beginning.
+
+                let buffer_len = self.buffer.map_or_else(
+                    || panic!("st77xx: buffer is not available"),
+                    |buffer| buffer.len(),
                 );
-                let _ = self.send_sequence_buffer();
-                Ok(())
+                if buffer_len > 0 {
+                    // set buffer
+                    self.sequence_buffer.map_or_else(
+                        || panic!("st77xx: write no sequence buffer"),
+                        |sequence| {
+                            sequence[0] = SendCommand::Slice(&WRITE_RAM, len);
+                            self.sequence_len.set(1);
+                        },
+                    );
+                    let _ = self.send_sequence_buffer();
+                    Ok(())
+                } else {
+                    Err(ErrorCode::NOMEM)
+                }
             } else {
-                Err(ErrorCode::NOMEM)
+                // Continuing the previous write.
+                self.send_parameters_slice(len);
+                Ok(())
             }
         } else {
             Err(ErrorCode::BUSY)