commit bb4897685ca2bdb6ae62c7080e8d9d3a616163b4
author Amit Aryeh Levy <amit@amitlevy.com> Mon Jul 31 14:48:53 2017 -0400
committer Amit Aryeh Levy <amit@amitlevy.com> Mon Jul 31 14:48:53 2017 -0400
tree abf3be692cc49229680a459a87c461764553018e
parent b052ef37f17279544e714484b5b72745d6247ea5

fix warnings

src/console.rs

diff --git a/src/console.rs b/src/console.rs
index 96711e1..f699cea 100644
--- a/src/console.rs
+++ b/src/console.rs
@@ -1,10 +1,11 @@
 use core::{fmt,mem};
-use core::cell::Cell;
 use core::result::Result;
-use syscalls::{self, allow, yieldk_for};
+use syscalls::{self, allow};
 
 use alloc::{String, VecDeque};
 
+const DRIVER_NUM: u32 = 0;
+
 pub struct Console {
     queue: VecDeque<String>,
     outstanding: bool
@@ -51,11 +52,11 @@
 }
 
 unsafe fn putstr_async(string: String, cb: extern fn (usize, usize, usize, usize), ud: usize) -> isize {
-  let ret = allow(0, 1, string.as_bytes());
+  let ret = allow(DRIVER_NUM, 1, string.as_bytes());
   if ret < 0 {
       return ret;
   }
 
-  return syscalls::subscribe(0, 1, cb, ud);
+  return syscalls::subscribe(DRIVER_NUM, 1, cb, ud);
 }
 

src/syscalls.rs

diff --git a/src/syscalls.rs b/src/syscalls.rs
index 65d57cc..c2ffc11 100644
--- a/src/syscalls.rs
+++ b/src/syscalls.rs
@@ -13,45 +13,37 @@
 
 pub unsafe fn allow(major: u32, minor: u32, slice: &[u8]) -> isize {
     let res;
-    unsafe {
-        asm!("svc 3" : "={r0}"(res)
-                     : "{r0}"(major) "{r1}"(minor) "{r2}"(slice.as_ptr()) "{r3}"(slice.len())
-                     : "memory"
-                     : "volatile");
-    }
+    asm!("svc 3" : "={r0}"(res)
+                 : "{r0}"(major) "{r1}"(minor) "{r2}"(slice.as_ptr()) "{r3}"(slice.len())
+                 : "memory"
+                 : "volatile");
     res
 }
 
 pub unsafe fn subscribe(major: u32, minor: u32, cb: extern fn(usize, usize, usize, usize), ud: usize) -> isize {
     let res;
-    unsafe {
-        asm!("svc 1" : "={r0}"(res)
-                     : "{r0}"(major) "{r1}"(minor) "{r2}"(cb) "{r3}"(ud)
-                     : "memory"
-                     : "volatile");
-    }
+    asm!("svc 1" : "={r0}"(res)
+                 : "{r0}"(major) "{r1}"(minor) "{r2}"(cb) "{r3}"(ud)
+                 : "memory"
+                 : "volatile");
     res
 }
 
 pub unsafe fn command(major: u32, minor: u32, arg1: isize) -> isize {
     let res;
-    unsafe {
-        asm!("svc 2" : "={r0}"(res)
-                     : "{r0}"(major) "{r1}"(minor) "{r2}"(arg1)
-                     : "memory"
-                     : "volatile");
-    }
+    asm!("svc 2" : "={r0}"(res)
+                 : "{r0}"(major) "{r1}"(minor) "{r2}"(arg1)
+                 : "memory"
+                 : "volatile");
     res
 }
 
 pub unsafe fn memop(major: u32, arg1: usize) -> isize {
     let res;
-    unsafe {
-        asm!("svc 4" : "={r0}"(res)
-                     : "{r0}"(major) "{r1}"(arg1)
-                     : "memory"
-                     : "volatile");
-    }
+    asm!("svc 4" : "={r0}"(res)
+                 : "{r0}"(major) "{r1}"(arg1)
+                 : "memory"
+                 : "volatile");
     res
 }