mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-15 04:33:33 +08:00
More clean up of namespace
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4338 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
# include "msc.h"
|
||||
# include "usbmsc.h"
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
@@ -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
|
||||
@@ -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 */
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user