diff options
| author | Dion Dokter <[email protected]> | 2021-10-11 15:12:40 +0200 |
|---|---|---|
| committer | Dion Dokter <[email protected]> | 2021-10-11 15:12:40 +0200 |
| commit | 4643727fea491e91f5afe9532775d0e422f744f6 (patch) | |
| tree | 65837fbcfaf35cdc9838c8db89f2e9bc0337ebe6 | |
| parent | a8407c8abad163d2b795d7ab068f8b9861c6df2a (diff) | |
Made all PPI channels not configurable (even though they are) so they can't use unimplemented features
| -rw-r--r-- | embassy-nrf/src/chips/nrf9160.rs | 32 | ||||
| -rw-r--r-- | embassy-nrf/src/twim.rs | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/embassy-nrf/src/chips/nrf9160.rs b/embassy-nrf/src/chips/nrf9160.rs index 75b9e71d2..1086c73c1 100644 --- a/embassy-nrf/src/chips/nrf9160.rs +++ b/embassy-nrf/src/chips/nrf9160.rs | |||
| @@ -171,22 +171,22 @@ impl_pin!(P0_29, 0, 29); | |||
| 171 | impl_pin!(P0_30, 0, 30); | 171 | impl_pin!(P0_30, 0, 30); |
| 172 | impl_pin!(P0_31, 0, 31); | 172 | impl_pin!(P0_31, 0, 31); |
| 173 | 173 | ||
| 174 | impl_ppi_channel!(PPI_CH0, 0, configurable); | 174 | impl_ppi_channel!(PPI_CH0, 0); |
| 175 | impl_ppi_channel!(PPI_CH1, 1, configurable); | 175 | impl_ppi_channel!(PPI_CH1, 1); |
| 176 | impl_ppi_channel!(PPI_CH2, 2, configurable); | 176 | impl_ppi_channel!(PPI_CH2, 2); |
| 177 | impl_ppi_channel!(PPI_CH3, 3, configurable); | 177 | impl_ppi_channel!(PPI_CH3, 3); |
| 178 | impl_ppi_channel!(PPI_CH4, 4, configurable); | 178 | impl_ppi_channel!(PPI_CH4, 4); |
| 179 | impl_ppi_channel!(PPI_CH5, 5, configurable); | 179 | impl_ppi_channel!(PPI_CH5, 5); |
| 180 | impl_ppi_channel!(PPI_CH6, 6, configurable); | 180 | impl_ppi_channel!(PPI_CH6, 6); |
| 181 | impl_ppi_channel!(PPI_CH7, 7, configurable); | 181 | impl_ppi_channel!(PPI_CH7, 7); |
| 182 | impl_ppi_channel!(PPI_CH8, 8, configurable); | 182 | impl_ppi_channel!(PPI_CH8, 8); |
| 183 | impl_ppi_channel!(PPI_CH9, 9, configurable); | 183 | impl_ppi_channel!(PPI_CH9, 9); |
| 184 | impl_ppi_channel!(PPI_CH10, 10, configurable); | 184 | impl_ppi_channel!(PPI_CH10, 10); |
| 185 | impl_ppi_channel!(PPI_CH11, 11, configurable); | 185 | impl_ppi_channel!(PPI_CH11, 11); |
| 186 | impl_ppi_channel!(PPI_CH12, 12, configurable); | 186 | impl_ppi_channel!(PPI_CH12, 12); |
| 187 | impl_ppi_channel!(PPI_CH13, 13, configurable); | 187 | impl_ppi_channel!(PPI_CH13, 13); |
| 188 | impl_ppi_channel!(PPI_CH14, 14, configurable); | 188 | impl_ppi_channel!(PPI_CH14, 14); |
| 189 | impl_ppi_channel!(PPI_CH15, 15, configurable); | 189 | impl_ppi_channel!(PPI_CH15, 15); |
| 190 | 190 | ||
| 191 | impl_saadc_input!(P0_13, ANALOGINPUT0); | 191 | impl_saadc_input!(P0_13, ANALOGINPUT0); |
| 192 | impl_saadc_input!(P0_14, ANALOGINPUT1); | 192 | impl_saadc_input!(P0_14, ANALOGINPUT1); |
diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs index 8dcfb4143..2d51480d8 100644 --- a/embassy-nrf/src/twim.rs +++ b/embassy-nrf/src/twim.rs | |||
| @@ -184,7 +184,7 @@ impl<'d, T: Instance> Twim<'d, T> { | |||
| 184 | // The PTR field is a full 32 bits wide and accepts the full range | 184 | // The PTR field is a full 32 bits wide and accepts the full range |
| 185 | // of values. | 185 | // of values. |
| 186 | w.ptr().bits(buffer.as_mut_ptr() as u32)); | 186 | w.ptr().bits(buffer.as_mut_ptr() as u32)); |
| 187 | r.rxd.maxcnt.write(|w| | 187 | r.rxd.maxcnt.write(|w| |
| 188 | // We're giving it the length of the buffer, so no danger of | 188 | // We're giving it the length of the buffer, so no danger of |
| 189 | // accessing invalid memory. We have verified that the length of the | 189 | // accessing invalid memory. We have verified that the length of the |
| 190 | // buffer fits in an `u8`, so the cast to the type of maxcnt | 190 | // buffer fits in an `u8`, so the cast to the type of maxcnt |
