Merge pull request #15 from tock/1.3

Tie to release-1.3 kernel + small nits

Author: bradjc

boards/hail-bootloader/Cargo.lock

@@ -15,10 +15,10 @@ panic = "abort"
 lto = true
 
 [dependencies]
-cortexm4 = { git = "https://github.com/tock/tock" }
-capsules = { git = "https://github.com/tock/tock" }
-kernel = { git = "https://github.com/tock/tock" }
-sam4l = { git = "https://github.com/tock/tock" }
+cortexm4 = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
+capsules = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
+kernel = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
+sam4l = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
 bootloader = { path = "../../bootloader" }
 
 [build-dependencies]

boards/hail-bootloader/Cargo.toml

@@ -38,14 +38,12 @@ struct HailBootloader {
 }
 
 impl Platform for HailBootloader {
-    fn with_driver<F, R>(&self, driver_num: usize, f: F) -> R
+    fn with_driver<F, R>(&self, _driver_num: usize, f: F) -> R
     where
         F: FnOnce(Option<&kernel::Driver>) -> R,
     {
         // Bootloader does not support apps.
-        match driver_num {
-            _ => f(None),
-        }
+        f(None)
     }
 }
 

boards/hail-bootloader/src/main.rs

@@ -15,10 +15,10 @@ panic = "abort"
 lto = true
 
 [dependencies]
-cortexm4 = { git = "https://github.com/tock/tock" }
-capsules = { git = "https://github.com/tock/tock" }
-kernel = { git = "https://github.com/tock/tock" }
-sam4l = { git = "https://github.com/tock/tock" }
+cortexm4 = { git = "https://github.com/tock/tock", tag = "release-1.3" }
+capsules = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
+kernel = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
+sam4l = { git = "https://github.com/tock/tock", tag = "release-1.3"  }
 bootloader = { path = "../../bootloader" }
 
 [build-dependencies]

boards/imix-bootloader/Cargo.lock

@@ -38,14 +38,12 @@ struct ImixBootloader {
 }
 
 impl Platform for ImixBootloader {
-    fn with_driver<F, R>(&self, driver_num: usize, f: F) -> R
+    fn with_driver<F, R>(&self, _driver_num: usize, f: F) -> R
     where
         F: FnOnce(Option<&kernel::Driver>) -> R,
     {
         // Bootloader does not support apps.
-        match driver_num {
-            _ => f(None),
-        }
+        f(None)
     }
 }