summaryrefslogtreecommitdiff
path: root/src/i2c.rs
diff options
context:
space:
mode:
authorDeterminant <ted.sybil@gmail.com>2017-09-25 21:17:18 -0400
committerDeterminant <ted.sybil@gmail.com>2017-09-25 21:17:18 -0400
commite3a0899abde145a2212082041ffeaf0ca6529300 (patch)
tree13f7a49a9139c86b35f3a413a4e03b10d88b37df /src/i2c.rs
parent33063316e02911b1d2e0d02b53043b89ce87dea1 (diff)
...
Diffstat (limited to 'src/i2c.rs')
-rw-r--r--src/i2c.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/i2c.rs b/src/i2c.rs
index 73a8f3b..473442c 100644
--- a/src/i2c.rs
+++ b/src/i2c.rs
@@ -14,9 +14,9 @@ const FLAGS_MASK: u32 = 0x00ffffff;
const HSI_VALUE: u32 = 8000000;
const HSE_VALUE: u32 = 8000000;
-pub struct I2C<'a> {
+pub struct I2C<'a, 'b> {
i2c: &'a stm32f103xx::i2c1::RegisterBlock,
- rcc: &'a stm32f103xx::rcc::RegisterBlock,
+ rcc: &'b stm32f103xx::rcc::RegisterBlock,
}
pub enum TransDir {
@@ -29,10 +29,10 @@ pub enum DutyType {
DUTY1
}
-impl<'a> I2C<'a> {
- pub fn new(i2c_reg: &'a stm32f103xx::i2c1::RegisterBlock,
- rcc_reg: &'a stm32f103xx::rcc::RegisterBlock) -> I2C<'a> {
- I2C{i2c: i2c_reg, rcc: rcc_reg}
+impl<'a, 'b> I2C<'a, 'b> {
+ pub fn new(i2c: &'a stm32f103xx::i2c1::RegisterBlock,
+ rcc: &'b stm32f103xx::rcc::RegisterBlock) -> I2C<'a, 'b> {
+ I2C{i2c, rcc}
}
fn get_pclk1(&self) -> u32 {