core_generator/src/gen.rs

@@ -1,17 +1,13 @@
 use avr_mcu::*;
-use std::{
+use std::io;
-    collections::HashMap,
+use std::io::prelude::*;
-    io::{self, prelude::*},
-};
 
 pub fn write_registers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
     for register in mcu.registers() {
         let ty = if register.size == 1 { "u8" } else { "u16" };
 
         // HACK: Skip, atmeg328p pack defines two of these.
-        if register.name == "GTCCR" {
+        if register.name == "GTCCR" { continue; }
-            continue;
-        }
 
         writeln!(w, "#[allow(non_camel_case_types)]")?;
         writeln!(w, "pub struct {};", register.name)?;
@@ -20,11 +16,7 @@ pub fn write_registers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
         writeln!(w, "impl {} {{", register.name)?;
         for bitfield in register.bitfields.iter() {
             // Create a mask for the whole bitset.
-            writeln!(
+            writeln!(w, "    pub const {}: RegisterBits<Self> = RegisterBits::new(0x{:x});", bitfield.name, bitfield.mask)?;
-                w,
-                "    pub const {}: RegisterBits<Self> = RegisterBits::new(0x{:x});",
-                bitfield.name, bitfield.mask
-            )?;
 
             // We create masks for the individual bits in the field if there
             // is more than one bit in the field.
@@ -32,11 +24,8 @@ pub fn write_registers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
             let mut current_mask_bit_num = 0;
             for current_register_bit_num in 0..15 {
                 if (current_mask & 0b1) == 0b1 {
-                    writeln!(
+                    writeln!(w, "    pub const {}{}: RegisterBits<Self> = RegisterBits::new(1<<{});",
-                        w,
+                             bitfield.name, current_mask_bit_num, current_register_bit_num)?;
-                        "    pub const {}{}: RegisterBits<Self> = RegisterBits::new(1<<{});",
-                        bitfield.name, current_mask_bit_num, current_register_bit_num
-                    )?;
                     current_mask_bit_num += 1;
                 }
 
@@ -49,11 +38,7 @@ pub fn write_registers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
 
         writeln!(w, "impl Register for {} {{", register.name)?;
         writeln!(w, "    type T = {};", ty)?;
-        writeln!(
+        writeln!(w, "    const ADDRESS: *mut {} = 0x{:x} as *mut {};", ty, register.offset, ty)?;
-            w,
-            "    const ADDRESS: *mut {} = 0x{:x} as *mut {};",
-            ty, register.offset, ty
-        )?;
         writeln!(w, "}}")?;
     }
 
@@ -76,14 +61,9 @@ pub fn write_pins(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
                 let idx = signal.index.expect("signal with no index");
                 let struct_name = format!("{}{}", port_letter, idx);
 
-                let io_module = mcu
+                let io_module = mcu.modules.iter().find(|m| m.name == "PORT")
-                    .modules
-                    .iter()
-                    .find(|m| m.name == "PORT")
                     .expect("no port io module defined for this port");
-                let register_group = io_module
+                let register_group = io_module.register_groups.iter()
-                    .register_groups
-                    .iter()
                     .find(|rg| rg.name == instance.name)
                     .expect("no register group defined for this port");
 
@@ -110,52 +90,30 @@ pub fn write_pins(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
     Ok(())
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-enum SpiPinType {
-    SerialDataIn,
-    SerialDataOut,
-    Clock,
-    ChipSelect,
-}
-
 pub fn write_spi_modules(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
     if let Some(module) = mcu.module("SPI") {
-        let peripheral = mcu
+        let peripheral = mcu.peripheral("SPI").expect("found SPI module but no peripheral");
-            .peripheral("SPI")
-            .expect("found SPI module but no peripheral");
         let port_peripheral = mcu.port_peripheral();
 
         writeln!(w, "pub struct Spi;")?;
         writeln!(w)?;
         writeln!(w, "impl modules::HardwareSpi for Spi {{")?;
 
-        let mut pins: HashMap<SpiPinType, String> = HashMap::new();
         for spi_signal in peripheral.signals() {
-            let spi_signal_name = spi_signal
+            let spi_signal_name = spi_signal.group.clone().expect("spi signal does not have group name");
-                .group
+            let (port_instance, port_signal) = port_peripheral.instance_signal_with_pad(&spi_signal.pad)
-                .clone()
-                .expect("spi signal does not have group name");
-            let (port_instance, port_signal) = port_peripheral
-                .instance_signal_with_pad(&spi_signal.pad)
                 .expect("no port signal associated with the spi signal pad");
             let pin_name = self::pin_name(port_instance, port_signal);
 
             let const_name = match &spi_signal_name[..] {
-                "MISO" => SpiPinType::SerialDataIn,
+                "MISO" => "MasterInSlaveOut",
-                "MOSI" => SpiPinType::SerialDataOut,
+                "MOSI" => "MasterOutSlaveIn",
-                "SCK" => SpiPinType::Clock,
+                "SCK" => "Clock",
-                "SS" => SpiPinType::ChipSelect,
+                "SS" => "SlaveSelect",
-                "CS" => SpiPinType::ChipSelect,
-                "PDI" => SpiPinType::SerialDataOut,
-                "PDO" => SpiPinType::SerialDataIn,
                 _ => panic!("unknown spi signal name: '{}'", spi_signal_name),
             };
 
-            pins.insert(const_name, pin_name);
+            writeln!(w, "    type {} = {};", const_name, pin_name)?;
-        }
-
-        for (pin_type, pin_name) in pins.into_iter() {
-            writeln!(w, "    type {:?} = {};", pin_type, pin_name)?;
         }
 
         for reg in module.registers() {
@@ -182,15 +140,12 @@ pub fn write_usarts(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
             writeln!(w)?;
             writeln!(w, "impl modules::HardwareUsart for {} {{", usart.name)?;
             for register in usart.registers.iter() {
-                let reg_ty = if register.name.starts_with("UDR") {
+                let reg_ty = if register.name.starts_with("UDR") { // the data register.
-                    // the data register.
                     "DataRegister".to_owned()
-                } else if register.name.starts_with("UCSR") {
+                } else if register.name.starts_with("UCSR") { // one of the three control/status registers.
-                    // one of the three control/status registers.
                     let suffix = register.name.chars().rev().next().unwrap();
                     format!("ControlRegister{}", suffix)
-                } else if register.name.starts_with("UBRR") {
+                } else if register.name.starts_with("UBRR") { // the baud rate register.
-                    // the baud rate register.
                     "BaudRateRegister".to_owned()
                 } else {
                     panic!("unknown usart register '{}'", register.name);
@@ -205,30 +160,22 @@ pub fn write_usarts(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
 }
 
 pub fn write_timers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
-    if let Some(tc) = mcu.module("TC8") {
+    if let Some(tc) = mcu.module("TC8") { // Timer/Counter, 8-bit.
-        // Timer/Counter, 8-bit.
         const TYPE_NAME: &'static str = "Timer8";
 
         let find_reg = |name: &'static str| {
-            tc.registers()
+            tc.registers().find(|r| r.name.starts_with(name))
-                .find(|r| r.name.starts_with(name))
                 .expect(&format!("could not find '{}' register", name))
         };
         let find_reg_suffix_optional = |name: &'static str, suffix: &'static str| {
-            tc.registers()
+            tc.registers().find(|r| r.name.starts_with(name) && r.name.ends_with(suffix))
-                .find(|r| r.name.starts_with(name) && r.name.ends_with(suffix))
         };
         let find_reg_suffix = |name: &'static str, suffix: &'static str| {
             find_reg_suffix_optional(name, suffix)
                 .expect(&format!("could not find '{}' register", name))
         };
-        let timer_number = find_reg("TIMSK")
+        let timer_number = find_reg("TIMSK").name.chars().last().unwrap()
-            .name
+            .to_digit(10).unwrap();
-            .chars()
-            .last()
-            .unwrap()
-            .to_digit(10)
-            .unwrap();
 
         // TODO: At the moment, we do not support 8 bit timers that don't have two compare
         // registers.
@@ -239,145 +186,58 @@ pub fn write_timers(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
             writeln!(w, "pub struct {};", TYPE_NAME)?;
             writeln!(w)?;
             writeln!(w, "impl modules::Timer8 for {} {{", TYPE_NAME)?;
-            writeln!(
+            writeln!(w, "    type CompareA = {};", find_reg_suffix("OCR", "A").name)?;
-                w,
+            writeln!(w, "    type CompareB = {};", find_reg_suffix("OCR", "B").name)?;
-                "    type CompareA = {};",
-                find_reg_suffix("OCR", "A").name
-            )?;
-            writeln!(
-                w,
-                "    type CompareB = {};",
-                find_reg_suffix("OCR", "B").name
-            )?;
             writeln!(w, "    type Counter = {};", find_reg("TCNT").name)?;
-            writeln!(
+            writeln!(w, "    type ControlA = {};", find_reg_suffix("TCCR", "A").name)?;
-                w,
+            writeln!(w, "    type ControlB = {};", find_reg_suffix("TCCR", "B").name)?;
-                "    type ControlA = {};",
-                find_reg_suffix("TCCR", "A").name
-            )?;
-            writeln!(
-                w,
-                "    type ControlB = {};",
-                find_reg_suffix("TCCR", "B").name
-            )?;
             writeln!(w, "    type InterruptMask = {};", find_reg("TIMSK").name)?;
             writeln!(w, "    type InterruptFlag = {};", find_reg("TIFR").name)?;
-            writeln!(
+            writeln!(w, "    const CS0: RegisterBits<Self::ControlB> = Self::ControlB::CS00;")?;
-                w,
+            writeln!(w, "    const CS1: RegisterBits<Self::ControlB> = Self::ControlB::CS01;")?;
-                "    const CS0: RegisterBits<Self::ControlB> = Self::ControlB::CS00;"
+            writeln!(w, "    const CS2: RegisterBits<Self::ControlB> = Self::ControlB::CS02;")?;
-            )?;
+            writeln!(w, "    const WGM0: RegisterBits<Self::ControlA> = Self::ControlA::WGM00;")?;
-            writeln!(
+            writeln!(w, "    const WGM1: RegisterBits<Self::ControlA> = Self::ControlA::WGM01;")?;
-                w,
+            writeln!(w, "    const WGM2: RegisterBits<Self::ControlB> = Self::ControlB::WGM020;")?;
-                "    const CS1: RegisterBits<Self::ControlB> = Self::ControlB::CS01;"
-            )?;
-            writeln!(
-                w,
-                "    const CS2: RegisterBits<Self::ControlB> = Self::ControlB::CS02;"
-            )?;
-            writeln!(
-                w,
-                "    const WGM0: RegisterBits<Self::ControlA> = Self::ControlA::WGM00;"
-            )?;
-            writeln!(
-                w,
-                "    const WGM1: RegisterBits<Self::ControlA> = Self::ControlA::WGM01;"
-            )?;
-            writeln!(
-                w,
-                "    const WGM2: RegisterBits<Self::ControlB> = Self::ControlB::WGM020;"
-            )?;
             writeln!(w, "    const OCIEA: RegisterBits<Self::InterruptMask> = Self::InterruptMask::OCIE{}A;", timer_number)?;
             writeln!(w, "}}")?;
         }
     }
 
-    if let Some(tc) = mcu.module("TC16") {
+    if let Some(tc) = mcu.module("TC16") { // Timer/Counter, 16-bit.
-        // Timer/Counter, 16-bit.
         const TYPE_NAME: &'static str = "Timer16";
 
         let find_reg = |name: &'static str| {
-            tc.registers()
+            tc.registers().find(|r| r.name.starts_with(name))
-                .find(|r| r.name.starts_with(name))
                 .expect(&format!("could not find '{}' register", name))
         };
         let find_reg_suffix = |name: &'static str, suffix: &'static str| {
-            tc.registers()
+            tc.registers().find(|r| r.name.starts_with(name) && r.name.ends_with(suffix))
-                .find(|r| r.name.starts_with(name) && r.name.ends_with(suffix))
                 .expect(&format!("could not find '{}' register", name))
         };
-        let timer_number = find_reg("TIMSK")
+        let timer_number = find_reg("TIMSK").name.chars().last().unwrap()
-            .name
+            .to_digit(10).unwrap();
-            .chars()
-            .last()
-            .unwrap()
-            .to_digit(10)
-            .unwrap();
 
         writeln!(w, "/// 16-bit timer.")?;
         writeln!(w, "pub struct {};", TYPE_NAME)?;
         writeln!(w)?;
         writeln!(w, "impl modules::Timer16 for {} {{", TYPE_NAME)?;
-        writeln!(
+        writeln!(w, "    type CompareA = {};", find_reg_suffix("OCR", "A").name)?;
-            w,
+        writeln!(w, "    type CompareB = {};", find_reg_suffix("OCR", "B").name)?;
-            "    type CompareA = {};",
-            find_reg_suffix("OCR", "A").name
-        )?;
-        writeln!(
-            w,
-            "    type CompareB = {};",
-            find_reg_suffix("OCR", "B").name
-        )?;
         writeln!(w, "    type Counter = {};", find_reg("TCNT").name)?;
-        writeln!(
+        writeln!(w, "    type ControlA = {};", find_reg_suffix("TCCR", "A").name)?;
-            w,
+        writeln!(w, "    type ControlB = {};", find_reg_suffix("TCCR", "B").name)?;
-            "    type ControlA = {};",
+        writeln!(w, "    type ControlC = {};", find_reg_suffix("TCCR", "C").name)?;
-            find_reg_suffix("TCCR", "A").name
-        )?;
-        writeln!(
-            w,
-            "    type ControlB = {};",
-            find_reg_suffix("TCCR", "B").name
-        )?;
-        writeln!(
-            w,
-            "    type ControlC = {};",
-            find_reg_suffix("TCCR", "C").name
-        )?;
         writeln!(w, "    type InterruptMask = {};", find_reg("TIMSK").name)?;
         writeln!(w, "    type InterruptFlag = {};", find_reg("TIFR").name)?;
-        writeln!(
+        writeln!(w, "    const CS0: RegisterBits<Self::ControlB> = Self::ControlB::CS10;")?;
-            w,
+        writeln!(w, "    const CS1: RegisterBits<Self::ControlB> = Self::ControlB::CS11;")?;
-            "    const CS0: RegisterBits<Self::ControlB> = Self::ControlB::CS10;"
+        writeln!(w, "    const CS2: RegisterBits<Self::ControlB> = Self::ControlB::CS12;")?;
-        )?;
+        writeln!(w, "    const WGM0: RegisterBits<Self::ControlA> = Self::ControlA::WGM10;")?;
-        writeln!(
+        writeln!(w, "    const WGM1: RegisterBits<Self::ControlA> = Self::ControlA::WGM11;")?;
-            w,
+        writeln!(w, "    const WGM2: RegisterBits<Self::ControlB> = Self::ControlB::WGM10;")?;
-            "    const CS1: RegisterBits<Self::ControlB> = Self::ControlB::CS11;"
+        writeln!(w, "    const WGM3: RegisterBits<Self::ControlB> = Self::ControlB::WGM11;")?;
-        )?;
+        writeln!(w, "    const OCIEA: RegisterBits<Self::InterruptMask> = Self::InterruptMask::OCIE{}A;", timer_number)?;
-        writeln!(
-            w,
-            "    const CS2: RegisterBits<Self::ControlB> = Self::ControlB::CS12;"
-        )?;
-        writeln!(
-            w,
-            "    const WGM0: RegisterBits<Self::ControlA> = Self::ControlA::WGM10;"
-        )?;
-        writeln!(
-            w,
-            "    const WGM1: RegisterBits<Self::ControlA> = Self::ControlA::WGM11;"
-        )?;
-        writeln!(
-            w,
-            "    const WGM2: RegisterBits<Self::ControlB> = Self::ControlB::WGM10;"
-        )?;
-        writeln!(
-            w,
-            "    const WGM3: RegisterBits<Self::ControlB> = Self::ControlB::WGM11;"
-        )?;
-        writeln!(
-            w,
-            "    const OCIEA: RegisterBits<Self::InterruptMask> = Self::InterruptMask::OCIE{}A;",
-            timer_number
-        )?;
         writeln!(w, "}}")?;
     }
 

core_generator/src/main.rs

@@ -116,9 +116,7 @@ const DISABLE_FOR_DEVICES: &'static [&'static str] = &[
 fn base_output_path() -> PathBuf {
     match std::env::args().skip(1).next() {
         Some(path) => Path::new(&path).to_owned(),
-        None => {
+        None => panic!("please pass a destination path for the generated cores on the command line"),
-            panic!("please pass a destination path for the generated cores on the command line")
-        }
     }
 }
 
@@ -139,27 +137,17 @@ fn main() {
         fs::create_dir_all(&cores_path()).expect("could not create cores directory");
     }
 
-    // let microcontrollers = vec![avr_mcu::microcontroller("atmega32u4")];
     let microcontrollers = avr_mcu::microcontrollers();
-    let (count_total, mut cores_successful, mut cores_failed) =
+    let (count_total, mut cores_successful, mut cores_failed) = (microcontrollers.len(), Vec::new(), Vec::new());
-        (microcontrollers.len(), Vec::new(), Vec::new());
 
     for (i, mcu) in microcontrollers.iter().enumerate() {
-        if DISABLE_FOR_DEVICES
+        if DISABLE_FOR_DEVICES.iter().any(|d| mcu.device.name == *d || core_module_name(mcu) == *d) {
-            .iter()
-            .any(|d| mcu.device.name == *d || core_module_name(mcu) == *d)
-        {
             println!("skipping generation of core for '{}'", mcu.device.name);
             continue;
         }
 
         let result = std::panic::catch_unwind(|| {
-            println!(
+            println!("generating core for '{}' ({} of {})", mcu.device.name, i + 1, count_total);
-                "generating core for '{}' ({} of {})",
-                mcu.device.name,
-                i + 1,
-                count_total
-            );
             generate_cores(&[mcu.clone()]).unwrap();
         });
 
@@ -167,7 +155,7 @@ fn main() {
             Ok(..) => {
                 println!("successfully generated core for '{}'", mcu.device.name);
                 cores_successful.push(mcu);
-            }
+            },
             Err(e) => {
                 delete_core_module(mcu).unwrap(); // Don't leave around broken core files.
 
@@ -177,18 +165,12 @@ fn main() {
                     String::new()
                 };
 
-                eprintln!(
+                eprintln!("failed to generate core for '{}', skipping: {}\n", mcu.device.name, error_message);
-                    "failed to generate core for '{}', skipping: {}\n",
-                    mcu.device.name, error_message
-                );
                 cores_failed.push(mcu);
+            },
         }
     }
-    }
+    println!("generating 'src/cores/mod.rs' for the {} successfully generated cores", cores_successful.len());
-    println!(
-        "generating 'src/cores/mod.rs' for the {} successfully generated cores",
-        cores_successful.len()
-    );
     generate_cores_mod_rs(&cores_successful[..]).expect("failed to generates src/cores/mod.rs");
 
     println!("statistics:");
@@ -219,10 +201,7 @@ fn generate_cores_mod_rs(mcus: &[&Mcu]) -> Result<(), io::Error> {
     let path = cores_path().join("mod.rs");
     let mut w = File::create(&path)?;
 
-    writeln!(
+    writeln!(w, "//! The primary module containing microcontroller-specific core definitions")?;
-        w,
-        "//! The primary module containing microcontroller-specific core definitions"
-    )?;
     writeln!(w)?;
 
     for mcu in mcus {
@@ -245,17 +224,9 @@ fn generate_cores_mod_rs(mcus: &[&Mcu]) -> Result<(), io::Error> {
             writeln!(w, "///\n/// This device is chosen as the default when the crate is targeting non-AVR devices.")?;
         }
 
-        writeln!(
+        writeln!(w, "#[cfg(any(avr_mcu_{}, feature = \"all-mcus\"{}))] pub mod {};", module_name, cfg_check_default_fallback, module_name)?;
-            w,
-            "#[cfg(any(avr_mcu_{}, feature = \"all-mcus\"{}))] pub mod {};",
-            module_name, cfg_check_default_fallback, module_name
-        )?;
 
-        writeln!(
+        writeln!(w, "#[cfg({})] pub use self::{} as current;", current_module_check, module_name)?;
-            w,
-            "#[cfg({})] pub use self::{} as current;",
-            current_module_check, module_name
-        )?;
         writeln!(w)?;
     }
     writeln!(w)
@@ -275,3 +246,4 @@ fn write_core_module(mcu: &Mcu, w: &mut dyn Write) -> Result<(), io::Error> {
 
     writeln!(w)
 }
+

src/cores/atmega168.rs

@@ -1791,10 +1791,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataOut = port::B3;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega168a.rs

@@ -1794,10 +1794,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type ChipSelect = port::B2;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataIn = port::B4;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega168p.rs

@@ -1800,9 +1800,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
-    type SerialDataOut = port::B3;
+    type MasterOutSlaveIn = port::B3;
-    type SerialDataIn = port::B4;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/atmega168pa.rs

@@ -1800,9 +1800,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type ChipSelect = port::B2;
+    type MasterOutSlaveIn = port::B3;
-    type SerialDataIn = port::B4;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/atmega328.rs

@@ -2040,10 +2040,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
+    type SlaveSelect = port::B2;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataOut = port::B3;
-    type ChipSelect = port::B2;
-    type SerialDataIn = port::B4;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega328p.rs

@@ -1800,10 +1800,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
-    type SerialDataOut = port::B3;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataIn = port::B4;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega48.rs

@@ -1773,10 +1773,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataIn = port::B4;
+    type SlaveSelect = port::B2;
-    type ChipSelect = port::B2;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataOut = port::B3;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega48a.rs

@@ -1798,9 +1798,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
-    type ChipSelect = port::B2;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/atmega48p.rs

@@ -1779,10 +1779,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataOut = port::B3;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega48pa.rs

@@ -1804,10 +1804,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type ChipSelect = port::B2;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega88.rs

@@ -1791,9 +1791,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
-    type SerialDataOut = port::B3;
+    type MasterOutSlaveIn = port::B3;
-    type SerialDataIn = port::B4;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/atmega88a.rs

@@ -1794,9 +1794,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
-    type ChipSelect = port::B2;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/atmega88p.rs

@@ -1797,10 +1797,10 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type ChipSelect = port::B2;
+    type SlaveSelect = port::B2;
+    type MasterOutSlaveIn = port::B3;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
-    type SerialDataOut = port::B3;
-    type SerialDataIn = port::B4;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;
     type ControlRegister = SPCR;

src/cores/atmega88pa.rs

@@ -1800,9 +1800,9 @@ pub mod port {
 pub struct Spi;
 
 impl modules::HardwareSpi for Spi {
-    type SerialDataOut = port::B3;
+    type SlaveSelect = port::B2;
-    type SerialDataIn = port::B4;
+    type MasterOutSlaveIn = port::B3;
-    type ChipSelect = port::B2;
+    type MasterInSlaveOut = port::B4;
     type Clock = port::B5;
     type DataRegister = SPDR;
     type StatusRegister = SPSR;

src/cores/mod.rs

@@ -1,50 +1,40 @@
 //! The primary module containing microcontroller-specific core definitions
 
-/// The ATmega48PA.
-#[cfg(any(avr_mcu_atmega48pa, feature = "all-mcus"))] pub mod atmega48pa;
-#[cfg(avr_mcu_atmega48pa)] pub use self::atmega48pa as current;
-
-/// The ATmega328P.
-#[cfg(any(avr_mcu_atmega328p, feature = "all-mcus"))] pub mod atmega328p;
-#[cfg(avr_mcu_atmega328p)] pub use self::atmega328p as current;
-
-/// The ATmega16U4.
-#[cfg(any(avr_mcu_atmega16u4, feature = "all-mcus"))] pub mod atmega16u4;
-#[cfg(avr_mcu_atmega16u4)] pub use self::atmega16u4 as current;
-
 /// The ATmega88.
 #[cfg(any(avr_mcu_atmega88, feature = "all-mcus"))] pub mod atmega88;
 #[cfg(avr_mcu_atmega88)] pub use self::atmega88 as current;
 
-/// The ATmega168A.
-#[cfg(any(avr_mcu_atmega168a, feature = "all-mcus"))] pub mod atmega168a;
-#[cfg(avr_mcu_atmega168a)] pub use self::atmega168a as current;
-
-/// The ATmega48.
-#[cfg(any(avr_mcu_atmega48, feature = "all-mcus"))] pub mod atmega48;
-#[cfg(avr_mcu_atmega48)] pub use self::atmega48 as current;
-
 /// The ATmega48A.
 #[cfg(any(avr_mcu_atmega48a, feature = "all-mcus"))] pub mod atmega48a;
 #[cfg(avr_mcu_atmega48a)] pub use self::atmega48a as current;
 
-/// The ATmega88PA.
+/// The ATmega168A.
-#[cfg(any(avr_mcu_atmega88pa, feature = "all-mcus"))] pub mod atmega88pa;
+#[cfg(any(avr_mcu_atmega168a, feature = "all-mcus"))] pub mod atmega168a;
-#[cfg(avr_mcu_atmega88pa)] pub use self::atmega88pa as current;
+#[cfg(avr_mcu_atmega168a)] pub use self::atmega168a as current;
 
-/// The ATmega328.
+/// The ATmega88P.
-///
+#[cfg(any(avr_mcu_atmega88p, feature = "all-mcus"))] pub mod atmega88p;
-/// This device is chosen as the default when the crate is targeting non-AVR devices.
+#[cfg(avr_mcu_atmega88p)] pub use self::atmega88p as current;
-#[cfg(any(avr_mcu_atmega328, feature = "all-mcus", not(target_arch = "avr")))] pub mod atmega328;
-#[cfg(any(avr_mcu_atmega328, not(target_arch = "avr")))] pub use self::atmega328 as current;
 
 /// The ATmega168P.
 #[cfg(any(avr_mcu_atmega168p, feature = "all-mcus"))] pub mod atmega168p;
 #[cfg(avr_mcu_atmega168p)] pub use self::atmega168p as current;
 
-/// The ATmega88P.
+/// The ATmega88PA.
-#[cfg(any(avr_mcu_atmega88p, feature = "all-mcus"))] pub mod atmega88p;
+#[cfg(any(avr_mcu_atmega88pa, feature = "all-mcus"))] pub mod atmega88pa;
-#[cfg(avr_mcu_atmega88p)] pub use self::atmega88p as current;
+#[cfg(avr_mcu_atmega88pa)] pub use self::atmega88pa as current;
+
+/// The ATmega168.
+#[cfg(any(avr_mcu_atmega168, feature = "all-mcus"))] pub mod atmega168;
+#[cfg(avr_mcu_atmega168)] pub use self::atmega168 as current;
+
+/// The ATmega328P.
+#[cfg(any(avr_mcu_atmega328p, feature = "all-mcus"))] pub mod atmega328p;
+#[cfg(avr_mcu_atmega328p)] pub use self::atmega328p as current;
+
+/// The ATmega48PA.
+#[cfg(any(avr_mcu_atmega48pa, feature = "all-mcus"))] pub mod atmega48pa;
+#[cfg(avr_mcu_atmega48pa)] pub use self::atmega48pa as current;
 
 /// The ATmega168PA.
 #[cfg(any(avr_mcu_atmega168pa, feature = "all-mcus"))] pub mod atmega168pa;
@@ -54,16 +44,18 @@
 #[cfg(any(avr_mcu_atmega48p, feature = "all-mcus"))] pub mod atmega48p;
 #[cfg(avr_mcu_atmega48p)] pub use self::atmega48p as current;
 
+/// The ATmega328.
+///
+/// This device is chosen as the default when the crate is targeting non-AVR devices.
+#[cfg(any(avr_mcu_atmega328, feature = "all-mcus", not(target_arch = "avr")))] pub mod atmega328;
+#[cfg(any(avr_mcu_atmega328, not(target_arch = "avr")))] pub use self::atmega328 as current;
+
 /// The ATmega88A.
 #[cfg(any(avr_mcu_atmega88a, feature = "all-mcus"))] pub mod atmega88a;
 #[cfg(avr_mcu_atmega88a)] pub use self::atmega88a as current;
 
-/// The ATmega32U4.
+/// The ATmega48.
-#[cfg(any(avr_mcu_atmega32u4, feature = "all-mcus"))] pub mod atmega32u4;
+#[cfg(any(avr_mcu_atmega48, feature = "all-mcus"))] pub mod atmega48;
-#[cfg(avr_mcu_atmega32u4)] pub use self::atmega32u4 as current;
+#[cfg(avr_mcu_atmega48)] pub use self::atmega48 as current;
-
-/// The ATmega168.
-#[cfg(any(avr_mcu_atmega168, feature = "all-mcus"))] pub mod atmega168;
-#[cfg(avr_mcu_atmega168)] pub use self::atmega168 as current;
 
 

src/modules/spi/mod.rs

@@ -1,38 +1,34 @@
 mod clock;
 
-// FIXME: Start using this module or delete!!!
-#[allow(dead_code)]
-mod settings;
 
-use crate::{Pin, Register};
+// FIXME: Start using this module or delete!!!
+#[allow(dead_code)] mod settings;
+
+use crate::{Register, Pin};
 
 /// An SPI module.
 ///
 /// Information at [maxembedded.com](http://maxembedded.com/2013/11/the-spi-of-the-avr/).
 pub trait HardwareSpi {
-    type SerialDataIn: Pin;
+    type MasterInSlaveOut: Pin;
-<<<<<<< Updated upstream
+    type MasterOutSlaveIn: Pin;
-    type SerialDataOu: Pin;
-=======
-    type SerialDataOut: Pin;
->>>>>>> Stashed changes
     type Clock: Pin;
-    type ChipSelect: Pin;
+    type SlaveSelect: Pin;
 
     /// The SPI control register.
-    type ControlRegister: Register<T = u8>;
+    type ControlRegister: Register<T=u8>;
     /// The SPI status register.
-    type StatusRegister: Register<T = u8>;
+    type StatusRegister: Register<T=u8>;
     /// The SPI data register.
-    type DataRegister: Register<T = u8>;
+    type DataRegister: Register<T=u8>;
 
     /// Sets up the SPI as a master.
     fn setup_master(clock: u32) {
         // Setup DDR registers.
-        Self::SerialDataIn::set_input();
+        Self::MasterInSlaveOut::set_input();
-        Self::SerialDataOut::set_output();
+        Self::MasterOutSlaveIn::set_output();
         Self::Clock::set_output();
-        Self::ChipSelect::set_input();
+        Self::SlaveSelect::set_input();
 
         Self::set_master();
         Self::enable_interrupt();
@@ -42,10 +38,10 @@ pub trait HardwareSpi {
     /// Sets up the SPI as a slave.
     fn setup_slave(clock: u32) {
         // Setup DDR registers.
-        Self::SerialDataIn::set_output();
+        Self::MasterInSlaveOut::set_output();
-        Self::SerialDataOut::set_input();
+        Self::MasterOutSlaveIn::set_input();
         Self::Clock::set_input();
-        Self::ChipSelect::set_input();
+        Self::SlaveSelect::set_input();
 
         Self::set_slave();
         Self::setup_common(clock)
@@ -151,3 +147,4 @@ pub trait HardwareSpi {
         Self::DataRegister::read()
     }
 }
+