aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDion Dokter <[email protected]>2021-10-11 15:12:40 +0200
committerDion Dokter <[email protected]>2021-10-11 15:12:40 +0200
commit4643727fea491e91f5afe9532775d0e422f744f6 (patch)
tree65837fbcfaf35cdc9838c8db89f2e9bc0337ebe6
parenta8407c8abad163d2b795d7ab068f8b9861c6df2a (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.rs32
-rw-r--r--embassy-nrf/src/twim.rs2
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);
171impl_pin!(P0_30, 0, 30); 171impl_pin!(P0_30, 0, 30);
172impl_pin!(P0_31, 0, 31); 172impl_pin!(P0_31, 0, 31);
173 173
174impl_ppi_channel!(PPI_CH0, 0, configurable); 174impl_ppi_channel!(PPI_CH0, 0);
175impl_ppi_channel!(PPI_CH1, 1, configurable); 175impl_ppi_channel!(PPI_CH1, 1);
176impl_ppi_channel!(PPI_CH2, 2, configurable); 176impl_ppi_channel!(PPI_CH2, 2);
177impl_ppi_channel!(PPI_CH3, 3, configurable); 177impl_ppi_channel!(PPI_CH3, 3);
178impl_ppi_channel!(PPI_CH4, 4, configurable); 178impl_ppi_channel!(PPI_CH4, 4);
179impl_ppi_channel!(PPI_CH5, 5, configurable); 179impl_ppi_channel!(PPI_CH5, 5);
180impl_ppi_channel!(PPI_CH6, 6, configurable); 180impl_ppi_channel!(PPI_CH6, 6);
181impl_ppi_channel!(PPI_CH7, 7, configurable); 181impl_ppi_channel!(PPI_CH7, 7);
182impl_ppi_channel!(PPI_CH8, 8, configurable); 182impl_ppi_channel!(PPI_CH8, 8);
183impl_ppi_channel!(PPI_CH9, 9, configurable); 183impl_ppi_channel!(PPI_CH9, 9);
184impl_ppi_channel!(PPI_CH10, 10, configurable); 184impl_ppi_channel!(PPI_CH10, 10);
185impl_ppi_channel!(PPI_CH11, 11, configurable); 185impl_ppi_channel!(PPI_CH11, 11);
186impl_ppi_channel!(PPI_CH12, 12, configurable); 186impl_ppi_channel!(PPI_CH12, 12);
187impl_ppi_channel!(PPI_CH13, 13, configurable); 187impl_ppi_channel!(PPI_CH13, 13);
188impl_ppi_channel!(PPI_CH14, 14, configurable); 188impl_ppi_channel!(PPI_CH14, 14);
189impl_ppi_channel!(PPI_CH15, 15, configurable); 189impl_ppi_channel!(PPI_CH15, 15);
190 190
191impl_saadc_input!(P0_13, ANALOGINPUT0); 191impl_saadc_input!(P0_13, ANALOGINPUT0);
192impl_saadc_input!(P0_14, ANALOGINPUT1); 192impl_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