diff options
| author | James Munns <[email protected]> | 2025-11-24 17:50:46 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-11-24 17:50:46 +0100 |
| commit | 6e1bc1139b7dcc8407fd1213bf0cb0788d26288e (patch) | |
| tree | 435b7782b1dc89f6fc4cd680b3fb54d19a92fe21 | |
| parent | c552cf2434b847b7a8af06e15982eb29d07ad2fa (diff) | |
Update to patched PAC with corrected Div4 (#41)
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | examples/Cargo.lock | 2 | ||||
| -rw-r--r-- | src/clocks/periph_helpers.rs | 28 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index d9f4f08af..eb6c142ef 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
| @@ -324,7 +324,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" | |||
| 324 | [[package]] | 324 | [[package]] |
| 325 | name = "mcxa-pac" | 325 | name = "mcxa-pac" |
| 326 | version = "0.1.0" | 326 | version = "0.1.0" |
| 327 | source = "git+https://github.com/OpenDevicePartnership/mcxa-pac#3b36508ab1ac397861bae3431cc95c204f3ca6e9" | 327 | source = "git+https://github.com/OpenDevicePartnership/mcxa-pac#9a857ec9780527679978b42cc60288aeef03baa2" |
| 328 | dependencies = [ | 328 | dependencies = [ |
| 329 | "cortex-m", | 329 | "cortex-m", |
| 330 | "cortex-m-rt", | 330 | "cortex-m-rt", |
diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 473ce2b3f..56ae41d48 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock | |||
| @@ -442,7 +442,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" | |||
| 442 | [[package]] | 442 | [[package]] |
| 443 | name = "mcxa-pac" | 443 | name = "mcxa-pac" |
| 444 | version = "0.1.0" | 444 | version = "0.1.0" |
| 445 | source = "git+https://github.com/OpenDevicePartnership/mcxa-pac#3b36508ab1ac397861bae3431cc95c204f3ca6e9" | 445 | source = "git+https://github.com/OpenDevicePartnership/mcxa-pac#9a857ec9780527679978b42cc60288aeef03baa2" |
| 446 | dependencies = [ | 446 | dependencies = [ |
| 447 | "cortex-m", | 447 | "cortex-m", |
| 448 | "cortex-m-rt", | 448 | "cortex-m-rt", |
diff --git a/src/clocks/periph_helpers.rs b/src/clocks/periph_helpers.rs index 8914f6833..eac3ef8dd 100644 --- a/src/clocks/periph_helpers.rs +++ b/src/clocks/periph_helpers.rs | |||
| @@ -225,8 +225,8 @@ impl SPConfHelper for LpuartConfig { | |||
| 225 | // no ClkrootFunc7, just write manually for now | 225 | // no ClkrootFunc7, just write manually for now |
| 226 | clksel.write(|w| w.bits(0b111)); | 226 | clksel.write(|w| w.bits(0b111)); |
| 227 | clkdiv.modify(|_r, w| { | 227 | clkdiv.modify(|_r, w| { |
| 228 | w.reset().on(); | 228 | w.reset().asserted(); |
| 229 | w.halt().on(); | 229 | w.halt().asserted(); |
| 230 | w | 230 | w |
| 231 | }); | 231 | }); |
| 232 | return Ok(0); | 232 | return Ok(0); |
| @@ -238,18 +238,18 @@ impl SPConfHelper for LpuartConfig { | |||
| 238 | 238 | ||
| 239 | // Set up clkdiv | 239 | // Set up clkdiv |
| 240 | clkdiv.modify(|_r, w| { | 240 | clkdiv.modify(|_r, w| { |
| 241 | w.halt().on(); | 241 | w.halt().asserted(); |
| 242 | w.reset().on(); | 242 | w.reset().asserted(); |
| 243 | unsafe { w.div().bits(self.div.into_bits()) }; | 243 | unsafe { w.div().bits(self.div.into_bits()) }; |
| 244 | w | 244 | w |
| 245 | }); | 245 | }); |
| 246 | clkdiv.modify(|_r, w| { | 246 | clkdiv.modify(|_r, w| { |
| 247 | w.halt().off(); | 247 | w.halt().deasserted(); |
| 248 | w.reset().off(); | 248 | w.reset().deasserted(); |
| 249 | w | 249 | w |
| 250 | }); | 250 | }); |
| 251 | 251 | ||
| 252 | while clkdiv.read().unstab().is_on() {} | 252 | while clkdiv.read().unstab().is_unstable() {} |
| 253 | 253 | ||
| 254 | Ok(freq / self.div.into_divisor()) | 254 | Ok(freq / self.div.into_divisor()) |
| 255 | } | 255 | } |
| @@ -362,8 +362,8 @@ impl SPConfHelper for AdcConfig { | |||
| 362 | w.mux().bits(0b111) | 362 | w.mux().bits(0b111) |
| 363 | }); | 363 | }); |
| 364 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { | 364 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { |
| 365 | w.reset().on(); | 365 | w.reset().asserted(); |
| 366 | w.halt().on(); | 366 | w.halt().asserted(); |
| 367 | w | 367 | w |
| 368 | }); | 368 | }); |
| 369 | return Ok(0); | 369 | return Ok(0); |
| @@ -375,18 +375,18 @@ impl SPConfHelper for AdcConfig { | |||
| 375 | 375 | ||
| 376 | // Set up clkdiv | 376 | // Set up clkdiv |
| 377 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { | 377 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { |
| 378 | w.halt().on(); | 378 | w.halt().asserted(); |
| 379 | w.reset().on(); | 379 | w.reset().asserted(); |
| 380 | unsafe { w.div().bits(self.div.into_bits()) }; | 380 | unsafe { w.div().bits(self.div.into_bits()) }; |
| 381 | w | 381 | w |
| 382 | }); | 382 | }); |
| 383 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { | 383 | mrcc0.mrcc_adc_clkdiv().modify(|_r, w| { |
| 384 | w.halt().off(); | 384 | w.halt().deasserted(); |
| 385 | w.reset().off(); | 385 | w.reset().deasserted(); |
| 386 | w | 386 | w |
| 387 | }); | 387 | }); |
| 388 | 388 | ||
| 389 | while mrcc0.mrcc_adc_clkdiv().read().unstab().is_on() {} | 389 | while mrcc0.mrcc_adc_clkdiv().read().unstab().is_unstable() {} |
| 390 | 390 | ||
| 391 | Ok(freq / self.div.into_divisor()) | 391 | Ok(freq / self.div.into_divisor()) |
| 392 | } | 392 | } |
