refactor: s/regs/registers

Following a brief IRC discussion, update regs to registers https://bot.tockos.org/tockbot/tock/2018-07-09/?msg=111467&page=1 Summary of IRC: > I'm pretty adverse to needless abbreviations, and despite the folder name > tock-register-interface everything internally is tock-regs and examples use > regs. I'm inclined to change this to tock-registers and registers before > publishing. > > +1's from Brad and Amit Then revised in discussion in #1105 to only rename some instances of regs to registers, which I disagree with, but don't care enough to fight about.
tock · Jul 12, 2018 · 646de24 · 646de24
1 parent 9f76bf6
commit 646de24
Show file tree

Hide file tree

Showing 62 changed files with 103 additions and 103 deletions.
diff --git a/arch/cortex-m/src/systick.rs b/arch/cortex-m/src/systick.rs
@@ -1,7 +1,7 @@
 //! ARM Cortex-M SysTick peripheral.
 
 use kernel;
-use kernel::common::regs::{ReadOnly, ReadWrite};
+use kernel::common::registers::{ReadOnly, ReadWrite};
 use kernel::common::StaticRef;
 
 #[repr(C)]

diff --git a/boards/ek-tm4c1294xl/Cargo.lock b/boards/ek-tm4c1294xl/Cargo.lock
diff --git a/boards/hail/Cargo.lock b/boards/hail/Cargo.lock
diff --git a/boards/imix/Cargo.lock b/boards/imix/Cargo.lock
diff --git a/boards/launchxl/Cargo.lock b/boards/launchxl/Cargo.lock
diff --git a/boards/nordic/nrf51dk/Cargo.lock b/boards/nordic/nrf51dk/Cargo.lock
diff --git a/boards/nordic/nrf52840dk/Cargo.lock b/boards/nordic/nrf52840dk/Cargo.lock
diff --git a/boards/nordic/nrf52dk/Cargo.lock b/boards/nordic/nrf52dk/Cargo.lock
diff --git a/chips/cc26xx/src/gpio.rs b/chips/cc26xx/src/gpio.rs
@@ -7,7 +7,7 @@
 use core::cell::Cell;
 use core::ops::{Index, IndexMut};
 use ioc;
-use kernel::common::regs::{ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 

diff --git a/chips/cc26xx/src/ioc.rs b/chips/cc26xx/src/ioc.rs
@@ -5,7 +5,7 @@
 //! Required to setup and configure IO pins to different modes - all depending on
 //! usage (eg. UART, GPIO, etc). It is used internally.
 
-use kernel::common::regs::ReadWrite;
+use kernel::common::registers::ReadWrite;
 use kernel::common::StaticRef;
 use kernel::hil;
 

diff --git a/chips/cc26xx/src/prcm.rs b/chips/cc26xx/src/prcm.rs
@@ -11,7 +11,7 @@
 //! It also manages the clocks attached to almost every peripheral, which needs to
 //! be enabled before usage.
 
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 
 #[repr(C)]

diff --git a/chips/cc26xx/src/rtc.rs b/chips/cc26xx/src/rtc.rs
@@ -1,7 +1,7 @@
 //! RTC driver, sensortag family
 
 use core::cell::Cell;
-use kernel::common::regs::{ReadOnly, ReadWrite};
+use kernel::common::registers::{ReadOnly, ReadWrite};
 use kernel::common::StaticRef;
 use kernel::hil::time::{self, Alarm, Frequency, Time};
 

diff --git a/chips/cc26xx/src/trng.rs b/chips/cc26xx/src/trng.rs
@@ -4,7 +4,7 @@
 //!
 
 use core::cell::Cell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::rng;
 use prcm;

diff --git a/chips/cc26xx/src/uart.rs b/chips/cc26xx/src/uart.rs
@@ -3,7 +3,7 @@ use core::cell::Cell;
 use gpio;
 use ioc;
 use kernel;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::gpio::Pin;
 use kernel::hil::uart;

diff --git a/chips/nrf51/src/i2c.rs b/chips/nrf51/src/i2c.rs
@@ -6,7 +6,7 @@ use core::cell::Cell;
 use core::cmp;
 use kernel::common::cells::OptionalCell;
 use kernel::common::cells::TakeCell;
-use kernel::common::regs::{FieldValue, ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{FieldValue, ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::i2c;
 use {nrf5x, nrf5x::gpio, nrf5x::pinmux::Pinmux};

diff --git a/chips/nrf51/src/uart.rs b/chips/nrf51/src/uart.rs
@@ -1,7 +1,7 @@
 use core::cell::Cell;
 use kernel::common::cells::OptionalCell;
 use kernel::common::cells::TakeCell;
-use kernel::common::regs::{ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::uart;
 use nrf5x::pinmux::Pinmux;

diff --git a/chips/nrf52/src/adc.rs b/chips/nrf52/src/adc.rs
@@ -1,7 +1,7 @@
 //! ADC driver for the nRF52. Uses the SAADC peripheral.
 
 use kernel::common::cells::{OptionalCell, VolatileCell};
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 use kernel::ReturnCode;

diff --git a/chips/nrf52/src/clock.rs b/chips/nrf52/src/clock.rs
@@ -17,7 +17,7 @@
 //!
 
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 
 #[repr(C)]

diff --git a/chips/nrf52/src/ficr.rs b/chips/nrf52/src/ficr.rs
@@ -8,7 +8,7 @@
 //! - Date: November 27, 2017
 
 use core::fmt;
-use kernel::common::regs::ReadOnly;
+use kernel::common::registers::ReadOnly;
 use kernel::common::StaticRef;
 
 const FICR_BASE: StaticRef<FicrRegisters> =

diff --git a/chips/nrf52/src/i2c.rs b/chips/nrf52/src/i2c.rs
@@ -10,7 +10,7 @@
 use kernel::common::cells::OptionalCell;
 use kernel::common::cells::TakeCell;
 use kernel::common::cells::VolatileCell;
-use kernel::common::regs::{ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 use nrf5x::pinmux::Pinmux;

diff --git a/chips/nrf52/src/nvmc.rs b/chips/nrf52/src/nvmc.rs
@@ -8,7 +8,7 @@ use kernel::common::cells::OptionalCell;
 use kernel::common::cells::TakeCell;
 use kernel::common::cells::VolatileCell;
 use kernel::common::deferred_call::DeferredCall;
-use kernel::common::regs::{ReadOnly, ReadWrite};
+use kernel::common::registers::{ReadOnly, ReadWrite};
 use kernel::common::StaticRef;
 use kernel::hil;
 use kernel::ReturnCode;

diff --git a/chips/nrf52/src/ppi.rs b/chips/nrf52/src/ppi.rs
@@ -33,7 +33,7 @@
 //! * Francine Mäkelä
 //! * Date: May 04, 2018
 
-use kernel::common::regs::{FieldValue, ReadWrite};
+use kernel::common::registers::{FieldValue, ReadWrite};
 use kernel::common::StaticRef;
 
 const PPI_BASE: StaticRef<PpiRegisters> =

diff --git a/chips/nrf52/src/radio.rs b/chips/nrf52/src/radio.rs
@@ -37,7 +37,7 @@ use core::cell::Cell;
 use core::convert::TryFrom;
 use kernel;
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::ble_advertising;
 use kernel::hil::ble_advertising::RadioChannel;

diff --git a/chips/nrf52/src/spi.rs b/chips/nrf52/src/spi.rs
@@ -32,7 +32,7 @@
 use core::cell::Cell;
 use core::{cmp, ptr};
 use kernel::common::cells::{OptionalCell, TakeCell, VolatileCell};
-use kernel::common::regs::{ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 use kernel::ReturnCode;

diff --git a/chips/nrf52/src/uart.rs b/chips/nrf52/src/uart.rs
@@ -11,7 +11,7 @@ use core::cell::Cell;
 use core::cmp::min;
 use kernel;
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use nrf5x::pinmux;
 

diff --git a/chips/nrf52/src/uicr.rs b/chips/nrf52/src/uicr.rs
@@ -3,7 +3,7 @@
 //! Minimal implementation to support activation of the reset button on
 //! nRF52-DK.
 
-use kernel::common::regs::ReadWrite;
+use kernel::common::registers::ReadWrite;
 use kernel::common::StaticRef;
 
 const UICR_BASE: StaticRef<UicrRegisters> =

diff --git a/chips/nrf5x/src/aes.rs b/chips/nrf5x/src/aes.rs
@@ -34,7 +34,7 @@ use core::cell::Cell;
 use kernel;
 use kernel::common::cells::OptionalCell;
 use kernel::common::cells::TakeCell;
-use kernel::common::regs::{ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::symmetric_encryption;
 use kernel::ReturnCode;

diff --git a/chips/nrf5x/src/gpio.rs b/chips/nrf5x/src/gpio.rs
@@ -7,7 +7,7 @@
 use core::cell::Cell;
 use core::ops::{Index, IndexMut};
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{FieldValue, ReadWrite};
+use kernel::common::registers::{FieldValue, ReadWrite};
 use kernel::common::StaticRef;
 use kernel::hil;
 

diff --git a/chips/nrf5x/src/rtc.rs b/chips/nrf5x/src/rtc.rs
@@ -1,7 +1,7 @@
 //! RTC driver, nRF5X-family
 
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::time::{self, Alarm, Freq32KHz, Time};
 use kernel::hil::Controller;

diff --git a/chips/nrf5x/src/temperature.rs b/chips/nrf5x/src/temperature.rs
@@ -10,7 +10,7 @@
 
 use kernel;
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 
 const TEMP_BASE: StaticRef<TempRegisters> =

diff --git a/chips/nrf5x/src/timer.rs b/chips/nrf5x/src/timer.rs
@@ -23,7 +23,7 @@
 //! * Date: August 18, 2016
 
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{self, ReadWrite, WriteOnly};
+use kernel::common::registers::{self, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 
@@ -267,8 +267,8 @@ pub struct TimerAlarm {
 // CC1 is used for compare/interrupts
 const ALARM_CAPTURE: usize = 0;
 const ALARM_COMPARE: usize = 1;
-const ALARM_INTERRUPT_BIT: regs::Field<u32, Inte::Register> = Inte::COMPARE1;
-const ALARM_INTERRUPT_BIT_SET: regs::FieldValue<u32, Inte::Register> = Inte::COMPARE1::SET;
+const ALARM_INTERRUPT_BIT: registers::Field<u32, Inte::Register> = Inte::COMPARE1;
+const ALARM_INTERRUPT_BIT_SET: registers::FieldValue<u32, Inte::Register> = Inte::COMPARE1::SET;
 
 impl TimerAlarm {
     const fn new(instance: usize) -> TimerAlarm {

diff --git a/chips/nrf5x/src/trng.rs b/chips/nrf5x/src/trng.rs
@@ -22,7 +22,7 @@
 
 use core::cell::Cell;
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::rng::{self, Continue};
 

diff --git a/chips/sam4l/src/adc.rs b/chips/sam4l/src/adc.rs
@@ -21,7 +21,7 @@ use core::{cmp, mem, slice};
 use dma;
 use kernel::common::cells::{OptionalCell, TakeCell};
 use kernel::common::math;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 use kernel::ReturnCode;

diff --git a/chips/sam4l/src/aes.rs b/chips/sam4l/src/aes.rs
@@ -10,7 +10,7 @@
 
 use core::cell::Cell;
 use kernel::common::cells::{OptionalCell, TakeCell};
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil;
 use kernel::hil::symmetric_encryption::{AES128_BLOCK_SIZE, AES128_KEY_SIZE};

diff --git a/chips/sam4l/src/ast.rs b/chips/sam4l/src/ast.rs
@@ -5,7 +5,7 @@
 //! - Date: July 16, 2015
 
 use kernel::common::cells::OptionalCell;
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 use kernel::hil::time::{self, Alarm, Freq16KHz, Time};
 use kernel::hil::Controller;

diff --git a/chips/sam4l/src/bpm.rs b/chips/sam4l/src/bpm.rs
@@ -1,6 +1,6 @@
 //! Implementation of the BPM peripheral.
 
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 
 #[repr(C)]

diff --git a/chips/sam4l/src/bscif.rs b/chips/sam4l/src/bscif.rs
@@ -1,6 +1,6 @@
 //! Implementation of the Backup System Control Interface (BSCIF) peripheral.
 
-use kernel::common::regs::{ReadOnly, ReadWrite, WriteOnly};
+use kernel::common::registers::{ReadOnly, ReadWrite, WriteOnly};
 use kernel::common::StaticRef;
 
 #[repr(C)]