Merge pull request #15 from tock/1.3

Tie to release-1.3 kernel + small nits
tock · Jun 12, 2019 · 98f6d1e · 98f6d1e
2 parents 8228baf + 060ded5
commit 98f6d1e
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 122 deletions.
diff --git a/boards/hail-bootloader/Cargo.lock b/boards/hail-bootloader/Cargo.lock
diff --git a/boards/hail-bootloader/Cargo.toml b/boards/hail-bootloader/Cargo.toml
@@ -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]

diff --git a/boards/hail-bootloader/src/main.rs b/boards/hail-bootloader/src/main.rs
@@ -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)
  }
 }
 

diff --git a/boards/imix-bootloader/Cargo.lock b/boards/imix-bootloader/Cargo.lock
diff --git a/boards/imix-bootloader/Cargo.toml b/boards/imix-bootloader/Cargo.toml
@@ -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]

diff --git a/boards/imix-bootloader/src/main.rs b/boards/imix-bootloader/src/main.rs
@@ -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)
  }
 }