eliminate warnings.

OSH-2022 · Jul 3, 2022 · 1242d41 · 1242d41
1 parent 899a271
commit 1242d41
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/example/sudoku/src/input.rs b/example/sudoku/src/input.rs
@@ -30,7 +30,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 #![no_std]
-
+#![allow(unused)]
+#![allow(non_upper_case_globals)]
 
 pub use key::*;
 use rkgpu::*;
@@ -63,8 +64,8 @@ pub fn input_handler(input_event: InputEvent) {
     unsafe {
         let (width, height) = __GPU_DEIVCE.as_mut().unwrap().resolution();
         //println!("{},{},{}", input_event.event_type, input_event.code, input_event.value);
-        let SELECT_OLD_X = SELECT_X;
-        let SELECT_OLD_Y = SELECT_Y;
+        let select_old_x = SELECT_X;
+        let select_old_y = SELECT_Y;
         if input_event.event_type == EV_KEY && input_event.value == 1 {
             match input_event.code {
                 KEY_UP => {
@@ -118,31 +119,31 @@ pub fn input_handler(input_event: InputEvent) {
                 KEY_W => {
                     if SELECT_Y >= 75 {
                         SELECT_Y -= 75;
-                        draw_select(SELECT_OLD_X, SELECT_OLD_Y, LIGHT_CYAN);
+                        draw_select(select_old_x, select_old_y, LIGHT_CYAN);
                         draw_select(SELECT_X, SELECT_Y, RED);
                     }
                     INPUT_NUMBER = 100;
                 }
                 KEY_S => {
                     if SELECT_Y < 600 {
                         SELECT_Y += 75;
-                        draw_select(SELECT_OLD_X, SELECT_OLD_Y, LIGHT_CYAN);
+                        draw_select(select_old_x, select_old_y, LIGHT_CYAN);
                         draw_select(SELECT_X, SELECT_Y, RED);
                     }
                     INPUT_NUMBER = 100;
                 }
                 KEY_A => {
                     if SELECT_X >= 75 {
                         SELECT_X -= 75;
-                        draw_select(SELECT_OLD_X, SELECT_OLD_Y, LIGHT_CYAN);
+                        draw_select(select_old_x, select_old_y, LIGHT_CYAN);
                         draw_select(SELECT_X, SELECT_Y, RED);
                     }
                     INPUT_NUMBER = 100;
                 }
                 KEY_D => {
                     if SELECT_X < 600 {
                         SELECT_X += 75;
-                        draw_select(SELECT_OLD_X, SELECT_OLD_Y, LIGHT_CYAN);
+                        draw_select(select_old_x, select_old_y, LIGHT_CYAN);
                         draw_select(SELECT_X, SELECT_Y, RED);
                     }
                     INPUT_NUMBER = 100;

diff --git a/example/sudoku/src/main.rs b/example/sudoku/src/main.rs
@@ -31,6 +31,8 @@
 
 #![no_std]
 #![no_main]
+#![allow(unused)]
+#![allow(non_upper_case_globals)]
 extern crate rkboot;
 extern crate alloc;
 
@@ -372,7 +374,7 @@ fn init(sudoku: &mut Sudoku) {
         rkgpu::init();
         printg("Hello, world!\nHello, OSH-2022!\nHello, Runikraft!\n", 700, 10, RED, 255, 4);
         printg("Use W, A, S, and D to move selecting rectangle.\nUse up, left, down, and right to move cursor.\nUse H for hint, use O for solution.", 0, 700, BLACK, 255, 2);
-        update_cursor(900, 500, true);
+        update_cursor(900, 400, true);
         draw_select(0, 0, RED);
         draw_sudoku_lattices(PURPLE, BLACK);
         screen_flush();

diff --git a/lib/rkgpu/src/lib.rs b/lib/rkgpu/src/lib.rs
@@ -36,8 +36,8 @@ pub mod output;
 pub use color::*;
 pub use output::*;
 
-use core::cmp::{max, min};
-use core::time::Duration;
+//use core::cmp::{max, min};
+//use core::time::Duration;
 use rkplat::drivers::virtio::__GPU_DEIVCE;
 use crate::DIRECTION::{Horizontal, Vertical};
 

diff --git a/lib/rkgpu/src/output.rs b/lib/rkgpu/src/output.rs
@@ -27,9 +27,10 @@
 // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
+#![allow(unused)]
 use rkplat::drivers::virtio::__GPU_DEIVCE;
 use crate::*;
-
+use core::cmp::{min,max};
 
 pub enum DIRECTION {
     Horizontal,

diff --git a/test/gpu0/src/main.rs b/test/gpu0/src/main.rs
@@ -42,11 +42,11 @@ unsafe fn draw_sudoku_lattices() -> u8 {
     } else { 0 }
 }
 
-unsafe fn show_sudoku_number(pos_x: u8, pos_y: u8, number: u8) -> u8 {
-    if pos_x <= 8 && pos_y <= 8 {
-        let start_x: u32 = 75 * pos_x as u32 + 20;
-        let start_y: u32 = 75 * pos_y as u32 + 8;
-        draw_font(start_x, start_y, BLACK, 255, (number + 48).into(), 4);
-        0
-    } else { 1 }
-}
+// unsafe fn show_sudoku_number(pos_x: u8, pos_y: u8, number: u8) -> u8 {
+//     if pos_x <= 8 && pos_y <= 8 {
+//         let start_x: u32 = 75 * pos_x as u32 + 20;
+//         let start_y: u32 = 75 * pos_y as u32 + 8;
+//         draw_font(start_x, start_y, BLACK, 255, (number + 48).into(), 4);
+//         0
+//     } else { 1 }
+// }