move CardType as well

Author: robamu

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic
 - `crc7` function now returns the actual CRC7 value without left-shifting by and XOR-ing by/with 1.
 - Bumped `embedded-io` to 0.7
 - `CardType::SDHC` renamed to `CardType::SdhcSdcx`
+- `CardType` is now inside the `sdcard` module
 
 ### Added
 

src/sdcard/mod.rs

@@ -33,6 +33,24 @@ pub mod cid;
 pub mod csd;
 pub mod spi;
 
+/// The different types of card we support.
+#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum CardType {
+    /// An standard-capacity SD Card supporting v1.x of the standard.
+    ///
+    /// Uses byte-addressing internally, so limited to 2GiB in size.
+    SD1,
+    /// An standard-capacity SD Card supporting v2.x of the standard.
+    ///
+    /// Uses byte-addressing internally, so limited to 2GiB in size.
+    SD2,
+    /// An high-capacity 'SDHC' Card or an extended-capacity 'SDXC' card.
+    ///
+    /// Uses block-addressing internally to support capacities above 2GiB.
+    SdhcSdxc,
+}
+
 // Possible errors the SD card can return
 /// Card indicates last operation was a success
 pub const ERROR_OK: u8 = 0x00;

src/sdcard/spi.rs

@@ -630,24 +630,6 @@ impl core::fmt::Display for Error {
 
 impl core::error::Error for Error {}
 
-/// The different types of card we support.
-#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum CardType {
-    /// An standard-capacity SD Card supporting v1.x of the standard.
-    ///
-    /// Uses byte-addressing internally, so limited to 2GiB in size.
-    SD1,
-    /// An standard-capacity SD Card supporting v2.x of the standard.
-    ///
-    /// Uses byte-addressing internally, so limited to 2GiB in size.
-    SD2,
-    /// An high-capacity 'SDHC' Card or an extended-capacity 'SDXC' card.
-    ///
-    /// Uses block-addressing internally to support capacities above 2GiB.
-    SdhcSdxc,
-}
-
 /// This an object you can use to busy-wait with a timeout.
 ///
 /// Will let you call `delay` up to `max_retries` times before `delay` returns