Rename SdCardDevice to SdCardSpiDevice

Author: avsaase

src/lib.rs

@@ -117,7 +117,7 @@ pub use crate::sdcard::Error as SdCardError;
 pub use crate::sdcard::SdCard;
 
 #[doc(inline)]
-pub use crate::sdcard::SdCardDevice;
+pub use crate::sdcard::SdCardSpiDevice;
 
 #[doc(inline)]
 pub use crate::sdcard::SdCardDeviceError;

src/sdcard/sd_card_device.rs renamed to src/sdcard/device.rs

@@ -1,4 +1,4 @@
-//! SD card device trait and provided implementations.
+//! SD card SPI device trait and provided implementations.
 
 use core::cell::RefCell;
 
@@ -8,7 +8,7 @@ use embedded_hal::{
 };
 
 /// Trait for SD cards connected via SPI.
-pub trait SdCardDevice {
+pub trait SdCardSpiDevice {
     /// Perform a transaction against the device.
     ///
     /// This is similar to [`embedded_hal::spi::SpiDevice::transaction`], except that this sends
@@ -89,7 +89,7 @@ impl<'a, BUS, CS> RefCellSdCardDevice<'a, BUS, CS> {
     }
 }
 
-impl<BUS, CS> SdCardDevice for RefCellSdCardDevice<'_, BUS, CS>
+impl<BUS, CS> SdCardSpiDevice for RefCellSdCardDevice<'_, BUS, CS>
 where
     BUS: SpiBus,
     CS: OutputPin,
@@ -133,7 +133,7 @@ mod embassy_sync_06 {
         }
     }
 
-    impl<CS, BUS, M> SdCardDevice for EmbassyMutexSdCardDevice<'_, BUS, CS, M>
+    impl<CS, BUS, M> SdCardSpiDevice for EmbassyMutexSdCardDevice<'_, BUS, CS, M>
     where
         CS: OutputPin,
         BUS: SpiBus,
@@ -171,7 +171,7 @@ mod embedded_hal_bus_03 {
     // `ExclusiveDevice` represents exclusive access to the bus so there's no need to send the dummy
     // byte after deasserting the CS pin. We can delegate the implementation to the `embedded_hal` trait.
 
-    impl<CS, BUS, D> SdCardDevice for ExclusiveDevice<BUS, CS, D>
+    impl<CS, BUS, D> SdCardSpiDevice for ExclusiveDevice<BUS, CS, D>
     where
         BUS: SpiBus,
         CS: OutputPin,

src/sdcard/mod.rs

@@ -3,8 +3,8 @@
 //! This is currently optimised for readability and debugability, not
 //! performance.
 
+mod device;
 pub mod proto;
-mod sd_card_device;
 
 use crate::{trace, Block, BlockCount, BlockDevice, BlockIdx};
 use core::cell::RefCell;
@@ -15,7 +15,7 @@ use proto::*;
 // ****************************************************************************
 
 use crate::{debug, warn};
-pub use sd_card_device::*;
+pub use device::*;
 
 // ****************************************************************************
 // Types and Implementations
@@ -39,15 +39,15 @@ pub use sd_card_device::*;
 /// [`SpiDevice`]: embedded_hal::spi::SpiDevice
 pub struct SdCard<SPI, DELAYER>
 where
-    SPI: SdCardDevice,
+    SPI: SdCardSpiDevice,
     DELAYER: embedded_hal::delay::DelayNs,
 {
     inner: RefCell<SdCardInner<SPI, DELAYER>>,
 }
 
 impl<SPI, DELAYER> SdCard<SPI, DELAYER>
 where
-    SPI: SdCardDevice,
+    SPI: SdCardSpiDevice,
     DELAYER: embedded_hal::delay::DelayNs,
 {
     /// Create a new SD/MMC Card driver using a raw SPI interface.
@@ -168,7 +168,7 @@ where
 
 impl<SPI, DELAYER> BlockDevice for SdCard<SPI, DELAYER>
 where
-    SPI: SdCardDevice,
+    SPI: SdCardSpiDevice,
     DELAYER: embedded_hal::delay::DelayNs,
 {
     type Error = Error;
@@ -208,7 +208,7 @@ where
 /// All the APIs required `&mut self`.
 struct SdCardInner<SPI, DELAYER>
 where
-    SPI: SdCardDevice,
+    SPI: SdCardSpiDevice,
     DELAYER: embedded_hal::delay::DelayNs,
 {
     spi: SPI,
@@ -219,7 +219,7 @@ where
 
 impl<SPI, DELAYER> SdCardInner<SPI, DELAYER>
 where
-    SPI: SdCardDevice,
+    SPI: SdCardSpiDevice,
     DELAYER: embedded_hal::delay::DelayNs,
 {
     /// Read one or more blocks, starting at the given block index.