pwm.h moved from include/nuttx/ to include/nuttx/drivers.

2016-07-20 13:48:24 -06:00 · 2016-07-20 13:48:24 -06:00 · 1b9b3a7b47
commit 1b9b3a7b47
parent ddcaa3d425
41 changed files with 44 additions and 44 deletions
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@ -4439,7 +4439,7 @@ void board_autoled_off(int led);
 </p>
 <ul>
  <li><b>Interface Definition</b>.
-    The header file for the NuttX PWM driver reside at <code>include/nuttx/pwm.h</code>.
+    The header file for the NuttX PWM driver reside at <code>include/nuttx/drivers/pwm.h</code>.
    This header file includes both the application level interface to the PWM driver as well as the interface between the &quot;upper half&quot; and &quot;lower half&quot; drivers.
    The PWM module uses a standard character driver framework.
    However, since the PWM driver is a devices control interface and not a data transfer interface,
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@ -47,7 +47,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_arch.h"
--- a/arch/arm/src/efm32/efm32_pwm.h
+++ b/arch/arm/src/efm32/efm32_pwm.h
@ -39,7 +39,7 @@
 /* The EFM32 does not have dedicated PWM hardware.  Rather, pulsed output 
 * control is a capability of the EFM32 timers.  The logic in this file 
 * implements the lower half of the standard, NuttX PWM interface using the 
- * EFM32 timers. That interface is described in include/nuttx/pwm.h.
+ * EFM32 timers. That interface is described in include/nuttx/drivers/pwm.h.
 */

 /****************************************************************************
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@ -49,7 +49,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@ -48,7 +48,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@ -47,7 +47,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@ -47,7 +47,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@ -47,7 +47,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@ -47,7 +47,7 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@ -47,7 +47,7 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include "chip/sam_pinmap.h"
 #include <arch/board/board.h>
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@ -48,7 +48,7 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/stm32/stm32_pwm.h
+++ b/arch/arm/src/stm32/stm32_pwm.h
@ -41,7 +41,7 @@
 /* The STM32 does not have dedicated PWM hardware.  Rather, pulsed output control
 * is a capabilitiy of the STM32 timers.  The logic in this file implements the
 * lower half of the standard, NuttX PWM interface using the STM32 timers.  That
- * interface is described in include/nuttx/pwm.h.
+ * interface is described in include/nuttx/drivers/pwm.h.
 */

 /************************************************************************************
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@ -48,7 +48,7 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "up_internal.h"
--- a/arch/arm/src/stm32l4/stm32l4_pwm.h
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.h
@ -41,7 +41,7 @@
 /* The STM32L4 does not have dedicated PWM hardware.  Rather, pulsed output control
 * is a capability of the STM32L4 timers.  The logic in this file implements the
 * lower half of the standard, NuttX PWM interface using the STM32L4 timers.  That
- * interface is described in include/nuttx/pwm.h.
+ * interface is described in include/nuttx/drivers/pwm.h.
 */

 /************************************************************************************
--- a/configs/freedom-kl25z/src/kl_pwm.c
+++ b/configs/freedom-kl25z/src/kl_pwm.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/freedom-kl26z/src/kl_pwm.c
+++ b/configs/freedom-kl26z/src/kl_pwm.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "chip.h"
--- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/mbed/src/lpc17_pwm.c
+++ b/configs/mbed/src/lpc17_pwm.c
@ -46,7 +46,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/mikroe-stm32f4/src/stm32_pwm.c
+++ b/configs/mikroe-stm32f4/src/stm32_pwm.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@ -46,7 +46,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include "stm32_pwm.h"
 #include "nucleo-f303re.h"
--- a/configs/sama5d3-xplained/src/sam_pwm.c
+++ b/configs/sama5d3-xplained/src/sam_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/configs/sama5d3x-ek/src/sam_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/stm3220g-eval/src/stm32_pwm.c
+++ b/configs/stm3220g-eval/src/stm32_pwm.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/stm3240g-eval/src/stm32_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/stm32_tiny/src/stm32_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/stm32f3discovery/src/stm32_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@ -43,7 +43,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/stm32f4discovery/src/stm32_pwm.c
+++ b/configs/stm32f4discovery/src/stm32_pwm.c
@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <arch/board/board.h>

 #include "chip.h"
--- a/configs/stm32f4discovery/src/stm32_rgbled.c
+++ b/configs/stm32f4discovery/src/stm32_rgbled.c
@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/leds/rgbled.h>
 #include <arch/board/board.h>

--- a/configs/stm32ldiscovery/src/stm32_pwm.c
+++ b/configs/stm32ldiscovery/src/stm32_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/teensy-lc/src/kl_pwm.c
+++ b/configs/teensy-lc/src/kl_pwm.c
@ -45,7 +45,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/configs/u-blox-c027/src/lpc17_pwm.c
+++ b/configs/u-blox-c027/src/lpc17_pwm.c
@ -44,7 +44,7 @@
 #include <debug.h>

 #include <nuttx/board.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <arch/board/board.h>

--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@ -286,7 +286,7 @@ menuconfig PWM
 	default n
 	---help---
 		This selection enables building of the "upper-half" PWM driver.
-		See include/nuttx/pwm.h for further PWM driver information.
+		See include/nuttx/drivers/pwm.h for further PWM driver information.

 if PWM

--- a/drivers/README.txt
+++ b/drivers/README.txt
@ -25,7 +25,7 @@ dev_null.c and dev_zero.c
 pwm.c
  Provides the "upper half" of a pulse width modulation (PWM) driver.
  The "lower half" of the PWM driver is provided by device-specific
-  logic.  See include/nuttx/pwm.h for usage information.
+  logic.  See include/nuttx/drivers/pwm.h for usage information.

 ramdisk.c
  Can be used to set up a block of memory or (read-only) FLASH as
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@ -55,7 +55,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/leds/rgbled.h>

 #include <arch/irq.h>
--- a/drivers/pwm.c
+++ b/drivers/pwm.c
@ -58,7 +58,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/arch.h>
-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>

 #include <nuttx/irq.h>

--- a/include/nuttx/drivers/pwm.h
+++ b/include/nuttx/drivers/pwm.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/pwm.h
+ * include/nuttx/drivers/pwm.h
 *
 *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_NUTTX_PWM_H
-#define __INCLUDE_NUTTX_PWM_H
+#ifndef __INCLUDE_NUTTX_DRIVERS_PWM_H
+#define __INCLUDE_NUTTX_DRIVERS_PWM_H

 /* For the purposes of this driver, a PWM device is any device that generates
 * periodic output pulses s of controlled frequency and pulse width.  Such a
@ -316,4 +316,4 @@ void pwm_expired(FAR void *handle);
 #endif

 #endif /* CONFIG_PWM */
-#endif /* __INCLUDE_NUTTX_PWM_H */
+#endif /* __INCLUDE_NUTTX_DRIVERS_PWM_H */
--- a/include/nuttx/fs/ioctl.h
+++ b/include/nuttx/fs/ioctl.h
@ -251,7 +251,7 @@
                                           * IN: None
                                           * OUT: None */

-/* NuttX PWM ioctl definitions (see nuttx/pwm.h) ****************************/
+/* NuttX PWM ioctl definitions (see nuttx/drivers/pwm.h) ****************************/

 #define _PWMIOCVALID(c)   (_IOC_TYPE(c)==_PWMIOCBASE)
 #define _PWMIOC(nr)       _IOC(_PWMIOCBASE,nr)
--- a/include/nuttx/leds/rgbled.h
+++ b/include/nuttx/leds/rgbled.h
@ -45,7 +45,7 @@

 #include <fixedmath.h>

-#include <nuttx/pwm.h>
+#include <nuttx/drivers/pwm.h>
 #include <nuttx/fs/ioctl.h>

 #ifdef CONFIG_RGBLED