andrey/k210-sdk-stuff
1
0
Fork 0
mirror of https://github.com/laanwj/k210-sdk-stuff.git synced 2024-11-25 19:03:30 +04:00
Code Issues Projects Releases Wiki Activity

rust/i2c: Use variants in init

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2019-05-18 19:29:55 +00:00
parent b14679e35a
commit 5e1213870c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rust/k210-shared/src/soc/i2c.rs
View File

@ -57,8 +57,6 @@ impl<IF: I2C012> I2CImpl<IF> {
impl<IF: I2C012> I2C for I2CImpl<IF> { impl<IF: I2C012> I2C for I2CImpl<IF> {
fn init(&self, slave_address: u16, address_width: u32, i2c_clk: u32) { fn init(&self, slave_address: u16, address_width: u32, i2c_clk: u32) {
assert!(address_width == 7 || address_width == 10);
sysctl::clock_enable(IF::CLK); sysctl::clock_enable(IF::CLK);
sysctl::clock_set_threshold(IF::DIV, 3); sysctl::clock_set_threshold(IF::DIV, 3);
@ -67,13 +65,19 @@ impl<IF: I2C012> I2C for I2CImpl<IF> {
let v_period_clk_cnt: u16 = v_period_clk_cnt.try_into().unwrap(); let v_period_clk_cnt: u16 = v_period_clk_cnt.try_into().unwrap();
let v_period_clk_cnt = cmp::max(v_period_clk_cnt, 1); let v_period_clk_cnt = cmp::max(v_period_clk_cnt, 1);
use i2c0::con::{ADDR_SLAVE_WIDTHW,SPEEDW};
let v_width = match address_width {
7 => ADDR_SLAVE_WIDTHW::B7,
10 => ADDR_SLAVE_WIDTHW::B10,
_ => panic!("unsupported address width"),
};
unsafe { unsafe {
self.i2c.enable.write(|w| w.bits(0)); self.i2c.enable.write(|w| w.bits(0));
self.i2c.con.write(|w| w.master_mode().bit(true) self.i2c.con.write(|w| w.master_mode().bit(true)
.slave_disable().bit(true) .slave_disable().bit(true)
.restart_en().bit(true) .restart_en().bit(true)
.addr_slave_width().bit(address_width == 10) // TODO variant .addr_slave_width().variant(v_width)
.speed().bits(1)); // TODO variant .speed().variant(SPEEDW::FAST));
self.i2c.ss_scl_hcnt.write(|w| w.count().bits(v_period_clk_cnt)); self.i2c.ss_scl_hcnt.write(|w| w.count().bits(v_period_clk_cnt));
self.i2c.ss_scl_lcnt.write(|w| w.count().bits(v_period_clk_cnt)); self.i2c.ss_scl_lcnt.write(|w| w.count().bits(v_period_clk_cnt));
self.i2c.tar.write(|w| w.address().bits(slave_address)); self.i2c.tar.write(|w| w.address().bits(slave_address));