sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAM4E: Revise board-specific USB MSC support

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-18 09:31:02 -06:00
parent 36908413ac
commit 77a2ecce0f
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
system/usbmsc/usbmsc_main.c
View File

@ -51,7 +51,7 @@
#include "usbmsc.h" #include "usbmsc.h"
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SYSTEM_USBMSC_TRACEINIT #ifdef CONFIG_SYSTEM_USBMSC_TRACEINIT
@ -432,6 +432,7 @@ static int msconn_daemon(int argc, char *argv[])
message("msconn_main: usbmsc_archinitialize failed: %d\n", -ret); message("msconn_main: usbmsc_archinitialize failed: %d\n", -ret);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbmsc_archinitialize()"); check_test_memory_usage("After usbmsc_archinitialize()");
/* Then exports the LUN(s) */ /* Then exports the LUN(s) */
@ -444,6 +445,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
message("msconn_main: handle=%p\n", handle); message("msconn_main: handle=%p\n", handle);
check_test_memory_usage("After usbmsc_configure()"); check_test_memory_usage("After usbmsc_configure()");
@ -456,6 +458,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbmsc_bindlun()"); check_test_memory_usage("After usbmsc_bindlun()");
#if CONFIG_SYSTEM_USBMSC_NLUNS > 1 #if CONFIG_SYSTEM_USBMSC_NLUNS > 1
@ -469,6 +472,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbmsc_bindlun() #2"); check_test_memory_usage("After usbmsc_bindlun() #2");
#if CONFIG_SYSTEM_USBMSC_NLUNS > 2 #if CONFIG_SYSTEM_USBMSC_NLUNS > 2
@ -482,6 +486,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbmsc_bindlun() #3"); check_test_memory_usage("After usbmsc_bindlun() #3");
#endif #endif
@ -494,6 +499,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbmsc_exportluns()"); check_test_memory_usage("After usbmsc_exportluns()");
/* It this program was configued as an NSH command, then just exit now. /* It this program was configued as an NSH command, then just exit now.
@ -519,6 +525,7 @@ static int msconn_daemon(int argc, char *argv[])
usbmsc_uninitialize(handle); usbmsc_uninitialize(handle);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("After usbtrace_enumerate()"); check_test_memory_usage("After usbtrace_enumerate()");
# else # else
message("msconn_main: Still alive\n"); message("msconn_main: Still alive\n");
@ -643,18 +650,19 @@ int msdis_main(int argc, char *argv[])
message("msdis: ERROR: Not connected\n"); message("msdis: ERROR: Not connected\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
check_test_memory_usage("Since MS connection");
check_test_memory_usage("Since MS connection");
/* Then disconnect the device and uninitialize the USB mass storage driver */ /* Then disconnect the device and uninitialize the USB mass storage driver */
usbmsc_uninitialize(g_usbmsc.mshandle); usbmsc_uninitialize(g_usbmsc.mshandle);
g_usbmsc.mshandle = NULL; g_usbmsc.mshandle = NULL;
message("msdis: Disconnected\n"); message("msdis: Disconnected\n");
check_test_memory_usage("After usbmsc_uninitialize()"); check_test_memory_usage("After usbmsc_uninitialize()");
/* Dump debug memory usage */ /* Dump debug memory usage */
final_memory_usage("Final memory usage"); final_memory_usage("Final memory usage");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#endif #endif