Skip to content

Commit c9a0c7e

Browse files
committed
rtc: Remove unsafes not needed after PAC update
1 parent 4d8ea24 commit c9a0c7e

File tree

1 file changed

+11
-28
lines changed

1 file changed

+11
-28
lines changed

src/rtc.rs

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl Rtc {
4242
enable(bdcr);
4343
result.set_24h_fmt();
4444

45-
result.regs.prer.modify(|_, w| unsafe {
45+
result.regs.prer.modify(|_, w| {
4646
w.prediv_s().bits(prediv_s);
4747
w.prediv_a().bits(prediv_a)
4848
});
@@ -99,7 +99,7 @@ impl Rtcc for Rtc {
9999
let (ht, hu) = bcd2_encode(time.hour())?;
100100
let (mnt, mnu) = bcd2_encode(time.minute())?;
101101
let (st, su) = bcd2_encode(time.second())?;
102-
self.regs.tr.write(|w| unsafe {
102+
self.regs.tr.write(|w| {
103103
w.ht().bits(ht);
104104
w.hu().bits(hu);
105105
w.mnt().bits(mnt);
@@ -117,10 +117,7 @@ impl Rtcc for Rtc {
117117
return Err(Error::InvalidInputData);
118118
}
119119
let (st, su) = bcd2_encode(seconds as u32)?;
120-
self.modify(|regs| {
121-
regs.tr
122-
.modify(|_, w| unsafe { w.st().bits(st).su().bits(su) })
123-
});
120+
self.modify(|regs| regs.tr.modify(|_, w| w.st().bits(st).su().bits(su)));
124121

125122
Ok(())
126123
}
@@ -130,10 +127,7 @@ impl Rtcc for Rtc {
130127
return Err(Error::InvalidInputData);
131128
}
132129
let (mnt, mnu) = bcd2_encode(minutes as u32)?;
133-
self.modify(|regs| {
134-
regs.tr
135-
.modify(|_, w| unsafe { w.mnt().bits(mnt).mnu().bits(mnu) })
136-
});
130+
self.modify(|regs| regs.tr.modify(|_, w| w.mnt().bits(mnt).mnu().bits(mnu)));
137131

138132
Ok(())
139133
}
@@ -145,9 +139,7 @@ impl Rtcc for Rtc {
145139
Hours::AM(_h) | Hours::PM(_h) => self.set_12h_fmt(),
146140
}
147141

148-
self.regs
149-
.tr
150-
.modify(|_, w| unsafe { w.ht().bits(ht).hu().bits(hu) });
142+
self.regs.tr.modify(|_, w| w.ht().bits(ht).hu().bits(hu));
151143

152144
Ok(())
153145
}
@@ -166,10 +158,7 @@ impl Rtcc for Rtc {
166158
return Err(Error::InvalidInputData);
167159
}
168160
let (dt, du) = bcd2_encode(day as u32)?;
169-
self.modify(|regs| {
170-
regs.dr
171-
.modify(|_, w| unsafe { w.dt().bits(dt).du().bits(du) })
172-
});
161+
self.modify(|regs| regs.dr.modify(|_, w| w.dt().bits(dt).du().bits(du)));
173162

174163
Ok(())
175164
}
@@ -179,10 +168,7 @@ impl Rtcc for Rtc {
179168
return Err(Error::InvalidInputData);
180169
}
181170
let (mt, mu) = bcd2_encode(month as u32)?;
182-
self.modify(|regs| {
183-
regs.dr
184-
.modify(|_, w| unsafe { w.mt().bit(mt > 0).mu().bits(mu) })
185-
});
171+
self.modify(|regs| regs.dr.modify(|_, w| w.mt().bit(mt > 0).mu().bits(mu)));
186172

187173
Ok(())
188174
}
@@ -192,10 +178,7 @@ impl Rtcc for Rtc {
192178
return Err(Error::InvalidInputData);
193179
}
194180
let (yt, yu) = bcd2_encode(year as u32)?;
195-
self.modify(|regs| {
196-
regs.dr
197-
.modify(|_, w| unsafe { w.yt().bits(yt).yu().bits(yu) })
198-
});
181+
self.modify(|regs| regs.dr.modify(|_, w| w.yt().bits(yt).yu().bits(yu)));
199182

200183
Ok(())
201184
}
@@ -211,7 +194,7 @@ impl Rtcc for Rtc {
211194
let (mt, mu) = bcd2_encode(date.month())?;
212195
let (dt, du) = bcd2_encode(date.day())?;
213196

214-
self.regs.dr.write(|w| unsafe {
197+
self.regs.dr.write(|w| {
215198
w.dt().bits(dt);
216199
w.du().bits(du);
217200
w.mt().bit(mt > 0);
@@ -237,7 +220,7 @@ impl Rtcc for Rtc {
237220
let (mnt, mnu) = bcd2_encode(date.minute())?;
238221
let (st, su) = bcd2_encode(date.second())?;
239222

240-
self.regs.dr.write(|w| unsafe {
223+
self.regs.dr.write(|w| {
241224
w.dt().bits(dt);
242225
w.du().bits(du);
243226
w.mt().bit(mt > 0);
@@ -246,7 +229,7 @@ impl Rtcc for Rtc {
246229
w.yu().bits(yu)
247230
});
248231

249-
self.regs.tr.write(|w| unsafe {
232+
self.regs.tr.write(|w| {
250233
w.ht().bits(ht);
251234
w.hu().bits(hu);
252235
w.mnt().bits(mnt);

0 commit comments

Comments
 (0)