OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More clean up of namespace 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4338 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-01-26 14:24:15 +00:00
parent 270bd0a9c2
commit e10dc26580
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/NuttxPortingGuide.html
View File

@ -3080,7 +3080,7 @@ extern void up_ledoff(int led);
</p>
<p>
<b>Examples</b>:
<code>drivers/usbdev/usbdev_serial.c</code> and <code>drivers/usbdev/usbdev_storage.c</code>
<code>drivers/usbdev/pl2303.c</code> and <code>drivers/usbdev/usbmsc.c</code>
</p>
</li>
<li>
@ -3100,8 +3100,8 @@ extern void up_ledoff(int led);
</p>
<p>
<b>Examples</b>:
The function <code>usbdev_serialinitialize()</code> in the file <code>drivers/usbdev/usbdev_serial.c</code> and
the function <code></code> in the file <code>drivers/usbdev/usbdev_storage.c</code>
The function <code>usbdev_serialinitialize()</code> in the file <code>drivers/usbdev/pl2303.c</code> and
the function <code></code> in the file <code>drivers/usbdev/usbmsc.c</code>
</p>
</li>
<li>

2
arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h
View File

@ -127,7 +127,7 @@
#define STM32_UART5_BASE 0x40005000 /* 0x40005000-0x400053ff: UART5 */
#define STM32_I2C1_BASE 0x40005400 /* 0x40005400-0x400057ff: I2C1 */
#define STM32_I2C2_BASE 0x40005800 /* 0x40005800-0x40005Bff: I2C2 */
#define STM32_I2C3_BASE 0x40005C00 /* 0x40005c00-0x40005fff: I2C3 */
#define STM32_I2C3_BASE 0x40005c00 /* 0x40005c00-0x40005fff: I2C3 */
#define STM32_CAN1_BASE 0x40006400 /* 0x40006400-0x400067ff: bxCAN1 */
#define STM32_CAN2_BASE 0x40006800 /* 0x40006800-0x40006bff: bxCAN2 */
#define STM32_PWR_BASE 0x40007000 /* 0x40007000-0x400073ff: Power control PWR */

2
drivers/usbdev/Make.defs
View File

@ -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)

2
drivers/usbdev/composite.h
View File

@ -56,7 +56,7 @@
#endif
#ifdef CONFIG_USBMSC_COMPOSITE
# include "msc.h"
# include "usbmsc.h"
#endif
/****************************************************************************

4
drivers/usbdev/msc.c → drivers/usbdev/usbmsc.c
View File

@ -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

8
drivers/usbdev/msc.h → drivers/usbdev/usbmsc.h
View File

@ -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 */

4
drivers/usbdev/msc_descriptors.c → drivers/usbdev/usbmsc_descriptors.c
View File

@ -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

4
drivers/usbdev/msc_scsi.c → drivers/usbdev/usbmsc_scsi.c
View File

@ -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