1 files changed, 6 insertions, 63 deletions
diff --git a/nuttx/configs/shenzhou/src/up_composite.c b/nuttx/configs/shenzhou/src/up_composite.c
index 58f90797b..cf61aeaad 100644
--- a/nuttx/configs/shenzhou/src/up_composite.c
+++ b/nuttx/configs/shenzhou/src/up_composite.c
@@ -4,7 +4,7 @@
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
- * Configure and register the STM32 MMC/SD SDIO block driver.
+ * Configure and register the STM32 SPI-based MMC/SD block driver.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,38 +43,19 @@
 
 #include <stdio.h>
 #include <debug.h>
-#include <errno.h>
 
-#include <nuttx/sdio.h>
-#include <nuttx/mmcsd.h>
-#include <nuttx/usb/composite.h>
-
-#include "stm32_internal.h"
-
-/* There is nothing to do here if SDIO support is not selected. */
-
-#ifdef CONFIG_STM32_SDIO
+#include "shenzhou_internal.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
-
 /* Configuration ************************************************************/
+/* Device minor number */
 
 #ifndef CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1
 #  define CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1 0
 #endif
 
-/* SLOT number(s) could depend on the board configuration */
-
-#ifdef CONFIG_ARCH_BOARD_STM3210E_EVAL
-#  undef STM32_MMCSDSLOTNO
-#  define STM32_MMCSDSLOTNO 0
-#else
-   /* Add configuration for new STM32 boards here */
-#  error "Unrecognized STM32 board"
-#endif
-
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
@@ -118,46 +99,8 @@ int composite_archinitialize(void)
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
-  FAR struct sdio_dev_s *sdio;
-  int ret;
-
-  /* First, get an instance of the SDIO interface */
-
-  message("composite_archinitialize: Initializing SDIO slot %d\n",
-          STM32_MMCSDSLOTNO);
-
-  sdio = sdio_initialize(STM32_MMCSDSLOTNO);
-  if (!sdio)
-    {
-      message("composite_archinitialize: Failed to initialize SDIO slot %d\n",
-              STM32_MMCSDSLOTNO);
-      return -ENODEV;
-    }
-
-  /* Now bind the SDIO interface to the MMC/SD driver */
-
-  message("composite_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1);
-
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1, sdio);
-  if (ret != OK)
-    {
-      message("composite_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n",
-              ret);
-      return ret;
-    }
-  message("composite_archinitialize: Successfully bound SDIO to the MMC/SD driver\n");
-  
-  /* Then let's guess and say that there is a card in the slot.  I need to check to
-   * see if the STM3210E-EVAL board supports a GPIO to detect if there is a card in
-   * the slot.
-   */
-
-   sdio_mediachange(sdio, true);
-
+  return sd_mount(CONFIG_EXAMPLES_COMPOSITE_DEVMINOR1);
+#else
+  return OK;
 #endif /* CONFIG_NSH_BUILTIN_APPS */
-
-   return OK;
 }
-
-#endif /* CONFIG_STM32_SDIO */