Add structure for nRF9160. hal-common changes TBC.

Author: Jonathan Pallant (42 Technology)

Cargo.toml

@@ -4,9 +4,11 @@ members = [
   "boards/adafruit-nrf52-bluefruit-le",
   "boards/nRF52-DK",
   "boards/nRF52840-DK",
+  "boards/nRF9160-DK",
   "nrf52810-hal",
   "nrf52832-hal",
   "nrf52840-hal",
+  "nrf9160-hal",
   "examples/rtfm-demo",
   "examples/spi-demo",
   "examples/twi-ssd1306",

boards/nRF9160-DK/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "nRF9160-DK"
+version = "0.1.0"
+authors = ["Jonathan Pallant (42 Technology) <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

boards/nRF9160-DK/src/lib.rs

@@ -0,0 +1,7 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}

examples/twi-ssd1306/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "twi-ssd1306"
 version = "0.1.0"
-authors = ["James Waples <[email protected]>", "Ruben Paz <[email protected]>"]
+authors = [
+   "James Waples <[email protected]>",
+   "Ruben Paz <[email protected]>",
+   "Jonathan Pallant <[email protected]>"
+]
 edition = "2018"
 
 [dependencies]
@@ -24,7 +28,13 @@ version = "0.8.0"
 path = "../../nrf52840-hal"
 optional = true
 
+[dependencies.nrf9160-hal]
+version = "0.1.0"
+path = "../../nrf9160-hal"
+optional = true
+
 [features]
 52832 = ["nrf52832-hal"]
 52840 = ["nrf52840-hal"]
+9160 = ["nrf9160-hal"]
 default = ["52832"]

nrf52-hal-common/Cargo.toml

@@ -42,6 +42,11 @@ version = "0.8.0"
 optional = true
 version = "0.8.0"
 
+[dependencies.nrf9160-pac]
+optional = true
+version = "0.1.1"
+package = "nrf91"
+
 [dependencies.embedded-hal]
 features = ["unproven"]
 version = "0.2.1"
@@ -52,3 +57,4 @@ default = ["52832"]
 52810 = ["nrf52810-pac"]
 52832 = ["nrf52832-pac"]
 52840 = ["nrf52840-pac"]
+9160 = ["nrf9160-pac"]

nrf52-hal-common/src/lib.rs

@@ -11,6 +11,9 @@ pub use nrf52832_pac as target;
 #[cfg(feature = "52840")]
 pub use nrf52840_pac as target;
 
+#[cfg(feature = "9160")]
+pub use nrf9160_pac as target;
+
 pub mod clocks;
 pub mod delay;
 pub mod gpio;
@@ -40,9 +43,9 @@ pub mod target_constants {
     pub const SRAM_UPPER: usize = 0x3000_0000;
     pub const FORCE_COPY_BUFFER_SIZE: usize = 255;
 }
-#[cfg(feature = "52840")]
+#[cfg(any(feature = "52840", feature="9160"))]
 pub mod target_constants {
-    // NRF52840 16 bits 1..0xFFFF
+    // NRF52840 and NRF9160 16 bits 1..0xFFFF
     pub const EASY_DMA_SIZE: usize = 65535;
     // Limits for Easy DMA - it can only read from data ram
     pub const SRAM_LOWER: usize = 0x2000_0000;

nrf9160-hal/Cargo.toml

@@ -0,0 +1,46 @@
+[package]
+name = "nrf9160-hal"
+version = "0.1.0"
+description = "HAL for nRF9160 system-in-package"
+
+repository = "https://github.com/nrf-rs/nrf52-hal"
+authors = [
+    "Jonathan Pallant (42 Technology) <[email protected]>",
+    "James Munns <[email protected]>",
+    "Hanno Braun <[email protected]>",
+    "John Scarrott <[email protected]>",
+    "Wez Furlong <[email protected]>",
+]
+
+categories = ["embedded", "hardware-support", "no-std"]
+keywords = ["arm", "cortex-m", "nrf91", "hal", "nrf9160"]
+license = "MIT OR Apache-2.0"
+edition = "2018"
+
+[dependencies]
+cortex-m = "0.6"
+nb = "0.1.1"
+nrf9160-pac = { package = "nrf91", version="0.1.1" }
+
+[dependencies.void]
+default-features = false
+version = "1.0.2"
+
+[dependencies.cast]
+default-features = false
+version = "0.2.2"
+
+[dependencies.nrf52-hal-common]
+path = "../nrf52-hal-common"
+default-features = false
+features = ["9160"]
+version = "0.8.0"
+
+[dependencies.embedded-hal]
+features = ["unproven"]
+version = "0.2.1"
+
+[features]
+doc = []
+rt = ["nrf9160-pac/rt"]
+default = ["rt"]

nrf9160-hal/build.rs

@@ -0,0 +1,17 @@
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+
+fn main() {
+    // Put the linker script somewhere the linker can find it
+    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
+    File::create(out.join("memory.x"))
+        .unwrap()
+        .write_all(include_bytes!("memory.x"))
+        .unwrap();
+    println!("cargo:rustc-link-search={}", out.display());
+
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=memory.x");
+}

nrf9160-hal/memory.x

@@ -0,0 +1,28 @@
+/* Linker script for the nRF9160 in Non-secure mode */
+MEMORY
+{
+  /* SECURE_FLASH    : ORIGIN = 0x00000000, LENGTH = 256K */
+  /* NONSECURE_FLASH : ORIGIN = 0x00040000, LENGTH = 768K */
+  /* SECURE_RAM      : ORIGIN = 0x20000000, LENGTH = 64K */
+  /* LIBBSD_RAM      : ORIGIN = 0x20010000, LENGTH = 64K */
+  /* NONSECURE_RAM   : ORIGIN = 0x20020000, LENGTH = 128K */
+
+  FLASH : ORIGIN = 0x00040000, LENGTH = 768K
+  RAM : ORIGIN = 0x20020000, LENGTH = 128K
+}
+
+/* This is where the call stack will be allocated. */
+/* The stack is of the full descending type. */
+/* You may want to use this variable to locate the call stack and static
+   variables in different memory regions. Below is shown the default value */
+/* _stack_start = ORIGIN(RAM) + LENGTH(RAM); */
+
+/* You can use this symbol to customize the location of the .text section */
+/* If omitted the .text section will be placed right after the .vector_table
+   section */
+/* This is required only on microcontrollers that store some configuration right
+   after the vector table */
+/* _stext = ORIGIN(FLASH) + 0x400; */
+
+/* Size of the heap (in bytes) */
+/* _heap_size = 1024; */

nrf9160-hal/src/lib.rs

@@ -0,0 +1,20 @@
+#![no_std]
+
+use embedded_hal as hal;
+pub use nrf9160_pac;
+pub use nrf52_hal_common::*;
+
+pub mod prelude {
+    pub use crate::hal::prelude::*;
+    pub use nrf52_hal_common::prelude::*;
+
+    pub use crate::time::U32Ext;
+}
+
+pub use crate::clocks::Clocks;
+pub use crate::delay::Delay;
+pub use crate::saadc::Saadc;
+pub use crate::spim::Spim;
+pub use crate::timer::Timer;
+pub use crate::uarte::Uarte;
+pub use crate::temp::Temp;