From 4643727fea491e91f5afe9532775d0e422f744f6 Mon Sep 17 00:00:00 2001 From: Dion Dokter Date: Mon, 11 Oct 2021 15:12:40 +0200 Subject: [PATCH] Made all PPI channels not configurable (even though they are) so they can't use unimplemented features --- embassy-nrf/src/chips/nrf9160.rs | 32 ++++++++++++++++---------------- 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 75b9e71d..1086c73c 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); impl_pin!(P0_30, 0, 30); impl_pin!(P0_31, 0, 31); -impl_ppi_channel!(PPI_CH0, 0, configurable); -impl_ppi_channel!(PPI_CH1, 1, configurable); -impl_ppi_channel!(PPI_CH2, 2, configurable); -impl_ppi_channel!(PPI_CH3, 3, configurable); -impl_ppi_channel!(PPI_CH4, 4, configurable); -impl_ppi_channel!(PPI_CH5, 5, configurable); -impl_ppi_channel!(PPI_CH6, 6, configurable); -impl_ppi_channel!(PPI_CH7, 7, configurable); -impl_ppi_channel!(PPI_CH8, 8, configurable); -impl_ppi_channel!(PPI_CH9, 9, configurable); -impl_ppi_channel!(PPI_CH10, 10, configurable); -impl_ppi_channel!(PPI_CH11, 11, configurable); -impl_ppi_channel!(PPI_CH12, 12, configurable); -impl_ppi_channel!(PPI_CH13, 13, configurable); -impl_ppi_channel!(PPI_CH14, 14, configurable); -impl_ppi_channel!(PPI_CH15, 15, configurable); +impl_ppi_channel!(PPI_CH0, 0); +impl_ppi_channel!(PPI_CH1, 1); +impl_ppi_channel!(PPI_CH2, 2); +impl_ppi_channel!(PPI_CH3, 3); +impl_ppi_channel!(PPI_CH4, 4); +impl_ppi_channel!(PPI_CH5, 5); +impl_ppi_channel!(PPI_CH6, 6); +impl_ppi_channel!(PPI_CH7, 7); +impl_ppi_channel!(PPI_CH8, 8); +impl_ppi_channel!(PPI_CH9, 9); +impl_ppi_channel!(PPI_CH10, 10); +impl_ppi_channel!(PPI_CH11, 11); +impl_ppi_channel!(PPI_CH12, 12); +impl_ppi_channel!(PPI_CH13, 13); +impl_ppi_channel!(PPI_CH14, 14); +impl_ppi_channel!(PPI_CH15, 15); impl_saadc_input!(P0_13, ANALOGINPUT0); impl_saadc_input!(P0_14, ANALOGINPUT1); diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs index 8dcfb414..2d51480d 100644 --- a/embassy-nrf/src/twim.rs +++ b/embassy-nrf/src/twim.rs @@ -184,7 +184,7 @@ impl<'d, T: Instance> Twim<'d, T> { // The PTR field is a full 32 bits wide and accepts the full range // of values. w.ptr().bits(buffer.as_mut_ptr() as u32)); - r.rxd.maxcnt.write(|w| + r.rxd.maxcnt.write(|w| // We're giving it the length of the buffer, so no danger of // accessing invalid memory. We have verified that the length of the // buffer fits in an `u8`, so the cast to the type of maxcnt