More clean up of namespace

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4338 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 12 insertions, 12 deletions

diff --git a/nuttx/drivers/usbdev/Make.defs b/nuttx/drivers/usbdev/Make.defs
index d5b56683e..445cf7817 100644
--- a/nuttx/drivers/usbdev/Make.defs
+++ b/nuttx/drivers/usbdev/Make.defs
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_CDCACM),y)
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-  CSRCS += msc.c msc_descriptors.c msc_scsi.c
+  CSRCS += usbmsc.c usbmsc_descriptors.c usbmsc_scsi.c
 endif
 
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
diff --git a/nuttx/drivers/usbdev/composite.h b/nuttx/drivers/usbdev/composite.h
index 18ac7d53e..114754ec4 100644
--- a/nuttx/drivers/usbdev/composite.h
+++ b/nuttx/drivers/usbdev/composite.h
@@ -56,7 +56,7 @@
 #endif
 
 #ifdef CONFIG_USBMSC_COMPOSITE
-#  include "msc.h"
+#  include "usbmsc.h"
 #endif
 
 /****************************************************************************
diff --git a/nuttx/drivers/usbdev/msc.c b/nuttx/drivers/usbdev/usbmsc.c
index a040128d8..e99342abc 100644
--- a/nuttx/drivers/usbdev/msc.c
+++ b/nuttx/drivers/usbdev/usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc.c
+ * drivers/usbdev/usbmsc.c
  *
  *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -80,7 +80,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/drivers/usbdev/msc.h b/nuttx/drivers/usbdev/usbmsc.h
index 587649cac..910aef8bd 100644
--- a/nuttx/drivers/usbdev/msc.h
+++ b/nuttx/drivers/usbdev/usbmsc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc.h
+ * drivers/usbdev/usbmsc.h
  *
  *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************/
 
-#ifndef __DRIVERS_USBDEV_MSC_H
-#define __DRIVERS_USBDEV_MSC_H
+#ifndef __DRIVERS_USBDEV_USBMSC_H
+#define __DRIVERS_USBDEV_USBMSC_H
 
 /****************************************************************************
  * Included Files
@@ -686,4 +686,4 @@ EXTERN void usbmsc_deferredresponse(FAR struct usbmsc_dev_s *priv, bool failed);
 }
 #endif
 
-#endif /* #define __DRIVERS_USBDEV_MSC_H */
+#endif /* #define __DRIVERS_USBDEV_USBMSC_H */
diff --git a/nuttx/drivers/usbdev/msc_descriptors.c b/nuttx/drivers/usbdev/usbmsc_descriptors.c
index 0c86eaba9..30a48f1bf 100644
--- a/nuttx/drivers/usbdev/msc_descriptors.c
+++ b/nuttx/drivers/usbdev/usbmsc_descriptors.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc_descriptors.c
+ * drivers/usbdev/usbmsc_descriptors.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/drivers/usbdev/msc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c
index 0af86011f..799f81ea6 100644
--- a/nuttx/drivers/usbdev/msc_scsi.c
+++ b/nuttx/drivers/usbdev/usbmsc_scsi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc_scsi.c
+ * drivers/usbdev/usbmsc_scsi.c
  *
  *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +73,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions