Rename card_size_bytes to num_bytes.

Matches the num_blocks command in the BlockDevice API.

Author: jonathanpallant

README.md

@@ -13,7 +13,7 @@ You will need something that implements the `BlockDevice` trait, which can read
 ```rust
 // Build an SD Card interface out of an SPI device
 let sdcard = embedded_sdmmc::SdCard::new(sdmmc_spi, sdmmc_cs);
-write!(uart, "Card size is {} bytes", sdcard.card_size_bytes()?)?;
+write!(uart, "Card size is {} bytes", sdcard.num_bytes()?)?;
 // Now let's look for volumes (also known as partitions) on our block device.
 let mut cont = embedded_sdmmc::VolumeManager::new(sdcard, time_source);
 // Try and access Volume 0 (i.e. the first partition)

src/lib.rs

@@ -41,9 +41,9 @@
 //! # let mut sdmmc_cs = DummyCsPin;
 //! # let time_source = DummyTimeSource;
 //! let sdcard = embedded_sdmmc::SdCard::new(sdmmc_spi, sdmmc_cs);
-//! println!("Card size {} bytes", sdcard.card_size_bytes()?);
+//! println!("Card size {} bytes", sdcard.num_bytes()?);
 //! let mut volume_mgr = VolumeManager::new(sdcard, time_source);
-//! println!("Card size is still {} bytes", volume_mgr.device().card_size_bytes()?);
+//! println!("Card size is still {} bytes", volume_mgr.device().num_bytes()?);
 //! let mut volume0 = volume_mgr.get_volume(embedded_sdmmc::VolumeIdx(0))?;
 //! println!("Volume 0: {:?}", volume0);
 //! let root_dir = volume_mgr.open_root_dir(&volume0)?;

src/sdcard/mod.rs

@@ -89,10 +89,10 @@ where
     }
 
     /// Return the usable size of this SD card in bytes.
-    pub fn card_size_bytes(&self) -> Result<u64, Error> {
+    pub fn num_bytes(&self) -> Result<u64, Error> {
         let mut inner = self.inner.borrow_mut();
         inner.check_init()?;
-        inner.card_size_bytes()
+        inner.num_bytes()
     }
 
     /// Can this card erase single blocks?
@@ -166,7 +166,7 @@ where
     fn num_blocks(&self) -> Result<BlockCount, Self::Error> {
         let mut inner = self.inner.borrow_mut();
         inner.check_init()?;
-        inner.card_size_blocks()
+        inner.num_blocks()
     }
 }
 
@@ -251,7 +251,7 @@ where
     }
 
     /// Determine how many blocks this device can hold.
-    fn card_size_blocks(&mut self) -> Result<BlockCount, Error> {
+    fn num_blocks(&mut self) -> Result<BlockCount, Error> {
         let num_blocks = self.with_chip_select(|s| {
             let csd = s.read_csd()?;
             debug!("CSD: {:?}", csd);
@@ -264,7 +264,7 @@ where
     }
 
     /// Return the usable size of this SD card in bytes.
-    fn card_size_bytes(&mut self) -> Result<u64, Error> {
+    fn num_bytes(&mut self) -> Result<u64, Error> {
         self.with_chip_select(|s| {
             let csd = s.read_csd()?;
             debug!("CSD: {:?}", csd);