2 files changed, 18 insertions, 14 deletions
diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.c b/os/hal/platforms/STM32/OTGv1/usb_lld.c
index 1132416ee..2efd4dfea 100644
--- a/os/hal/platforms/STM32/OTGv1/usb_lld.c
+++ b/os/hal/platforms/STM32/OTGv1/usb_lld.c
@@ -989,7 +989,7 @@ void usb_lld_prepare_transmit(USBDriver *usbp, usbep_t ep,
  * @brief   Prepares for a receive transaction on an OUT endpoint.
  * @post    The endpoint is ready for @p usbStartReceiveI().
  * @note    The receive transaction size is equal to the space in the queue
- *          rounded to the lower multiple of a packet size. So make sure there
+ *          rounded to the lower multiple of a packet size. Make sure there
  *          is room for at least one packet in the queue before starting
  *          the receive operation.
  *
diff --git a/os/hal/platforms/STM32/sdc_lld.h b/os/hal/platforms/STM32/sdc_lld.h
index a2cb6472d..7511bf581 100644
--- a/os/hal/platforms/STM32/sdc_lld.h
+++ b/os/hal/platforms/STM32/sdc_lld.h
@@ -198,13 +198,29 @@ typedef struct {
 } SDCConfig;
 
 /**
+ * @brief   @p SDCDriver specific methods.
+ */
+#define _sdc_driver_methods                                                 \
+  _mmcsd_block_device_methods
+
+/**
+ * @extends MMCSDBlockDeviceVMT
+ *
+ * @brief   @p SDCDriver virtual methods table.
+ */
+struct SDCDriverVMT {
+  _sdc_driver_methods
+};
+
+/**
  * @brief   Structure representing an SDC driver.
  */
 struct SDCDriver {
   /**
    * @brief Virtual Methods Table.
    */
-  const struct MMCSDBlockDeviceVMT *vmt;
+  const struct SDCDriverVMT *vmt;
+  _mmcsd_block_device_data
   /**
    * @brief Driver state.
    */
@@ -222,21 +238,9 @@ struct SDCDriver {
    */
   sdcflags_t                errors;
   /**
-   * @brief Card CID.
-   */
-  uint32_t                  cid[4];
-  /**
-   * @brief Card CSD.
-   */
-  uint32_t                  csd[4];
-  /**
    * @brief Card RCA.
    */
   uint32_t                  rca;
-  /**
-   * @brief Total number of blocks in card.
-   */
-  uint32_t                  capacity;
   /* End of the mandatory fields.*/
   /**
    * @brief Thread waiting for I/O completion IRQ.