Move clock functions from sched/ to sched/clock

69 files changed, 127 insertions, 87 deletions

diff --git a/nuttx/arch/8051/src/up_timerisr.c b/nuttx/arch/8051/src/up_timerisr.c
index edf7e5059..7abe5d2fe 100644
--- a/nuttx/arch/8051/src/up_timerisr.c
+++ b/nuttx/arch/8051/src/up_timerisr.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <8052.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /************************************************************************
diff --git a/nuttx/arch/8051/src/up_unblocktask.c b/nuttx/arch/8051/src/up_unblocktask.c
index cb4e65fc0..451487f1b 100644
--- a/nuttx/arch/8051/src/up_unblocktask.c
+++ b/nuttx/arch/8051/src/up_unblocktask.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/arch.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "os_internal.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/arm/src/arm/up_unblocktask.c b/nuttx/arch/arm/src/arm/up_unblocktask.c
index 3476441b4..696007b80 100644
--- a/nuttx/arch/arm/src/arm/up_unblocktask.c
+++ b/nuttx/arch/arm/src/arm/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
index 7a76a24d8..fa6b8c652 100644
--- a/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
+++ b/nuttx/arch/arm/src/armv6-m/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
index c5ca09092..71106fd25 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
index f2455e594..bd83ace9f 100644
--- a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
+++ b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/c5471/c5471_timerisr.c b/nuttx/arch/arm/src/c5471/c5471_timerisr.c
index fc1143162..d253ee143 100644
--- a/nuttx/arch/arm/src/c5471/c5471_timerisr.c
+++ b/nuttx/arch/arm/src/c5471/c5471_timerisr.c
@@ -45,7 +45,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /************************************************************
diff --git a/nuttx/arch/arm/src/dm320/dm320_timerisr.c b/nuttx/arch/arm/src/dm320/dm320_timerisr.c
index fae340714..193138a2b 100644
--- a/nuttx/arch/arm/src/dm320/dm320_timerisr.c
+++ b/nuttx/arch/arm/src/dm320/dm320_timerisr.c
@@ -46,7 +46,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/imx/imx_timerisr.c b/nuttx/arch/arm/src/imx/imx_timerisr.c
index d21b804c6..eab5f24e4 100644
--- a/nuttx/arch/arm/src/imx/imx_timerisr.c
+++ b/nuttx/arch/arm/src/imx/imx_timerisr.c
@@ -48,7 +48,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c
index b4bde4cae..f00c29bab 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c
@@ -47,7 +47,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/kl/kl_timerisr.c b/nuttx/arch/arm/src/kl/kl_timerisr.c
index fe1cd1681..31dc2ba5d 100644
--- a/nuttx/arch/arm/src/kl/kl_timerisr.c
+++ b/nuttx/arch/arm/src/kl/kl_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_timerisr.c b/nuttx/arch/arm/src/lpc17xx/lpc17_timerisr.c
index 4aec2da40..572712e90 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_timerisr.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_timerisr.c
@@ -47,7 +47,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
index 6039939ab..f80bce018 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -46,7 +46,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 #include "lpc214x_timer.h"
diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index 1b655fc9a..9005283d1 100644
--- a/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -48,7 +48,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_timerisr.c b/nuttx/arch/arm/src/lpc31xx/lpc31_timerisr.c
index 967843399..156409677 100644
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_timerisr.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c b/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
index 81a2937c5..e384be701 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
@@ -47,7 +47,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_timerisr.c b/nuttx/arch/arm/src/nuc1xx/nuc_timerisr.c
index 6b895ca09..3840a13c1 100644
--- a/nuttx/arch/arm/src/nuc1xx/nuc_timerisr.c
+++ b/nuttx/arch/arm/src/nuc1xx/nuc_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/sam34/sam_timerisr.c b/nuttx/arch/arm/src/sam34/sam_timerisr.c
index d4793a114..98c1ac193 100644
--- a/nuttx/arch/arm/src/sam34/sam_timerisr.c
+++ b/nuttx/arch/arm/src/sam34/sam_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/samd/sam_timerisr.c b/nuttx/arch/arm/src/samd/sam_timerisr.c
index 766486f02..d16986943 100644
--- a/nuttx/arch/arm/src/samd/sam_timerisr.c
+++ b/nuttx/arch/arm/src/samd/sam_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/stm32/stm32_timerisr.c b/nuttx/arch/arm/src/stm32/stm32_timerisr.c
index 6d739eb2c..1822bbc52 100644
--- a/nuttx/arch/arm/src/stm32/stm32_timerisr.c
+++ b/nuttx/arch/arm/src/stm32/stm32_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/arm/src/str71x/str71x_timerisr.c b/nuttx/arch/arm/src/str71x/str71x_timerisr.c
index c11bd53bf..39c257671 100644
--- a/nuttx/arch/arm/src/str71x/str71x_timerisr.c
+++ b/nuttx/arch/arm/src/str71x/str71x_timerisr.c
@@ -47,7 +47,7 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 #include "str71x_internal.h"
diff --git a/nuttx/arch/arm/src/tiva/tiva_timerisr.c b/nuttx/arch/arm/src/tiva/tiva_timerisr.c
index 6f371a33a..70cfacc82 100644
--- a/nuttx/arch/arm/src/tiva/tiva_timerisr.c
+++ b/nuttx/arch/arm/src/tiva/tiva_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "nvic.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/avr/src/avr/up_unblocktask.c b/nuttx/arch/avr/src/avr/up_unblocktask.c
index 6fb2e67e5..3947c3e8b 100644
--- a/nuttx/arch/avr/src/avr/up_unblocktask.c
+++ b/nuttx/arch/avr/src/avr/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/avr32/up_unblocktask.c b/nuttx/arch/avr/src/avr32/up_unblocktask.c
index f53550da9..c124d9733 100644
--- a/nuttx/arch/avr/src/avr32/up_unblocktask.c
+++ b/nuttx/arch/avr/src/avr32/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/common/up_unblocktask.c b/nuttx/arch/hc/src/common/up_unblocktask.c
index 425db0f98..379ccdde2 100644
--- a/nuttx/arch/hc/src/common/up_unblocktask.c
+++ b/nuttx/arch/hc/src/common/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c
index 2658e440a..dd954c097 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/mips/src/mips32/up_unblocktask.c b/nuttx/arch/mips/src/mips32/up_unblocktask.c
index dab958b15..470942b84 100644
--- a/nuttx/arch/mips/src/mips32/up_unblocktask.c
+++ b/nuttx/arch/mips/src/mips32/up_unblocktask.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-timerisr.c b/nuttx/arch/mips/src/pic32mx/pic32mx-timerisr.c
index 0a8b096f6..a08b7b856 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-timerisr.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/sh/src/common/up_unblocktask.c b/nuttx/arch/sh/src/common/up_unblocktask.c
index a4b598499..3978594cf 100644
--- a/nuttx/arch/sh/src/common/up_unblocktask.c
+++ b/nuttx/arch/sh/src/common/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/sh/src/m16c/m16c_timerisr.c b/nuttx/arch/sh/src/m16c/m16c_timerisr.c
index 04d4a619b..9b02099c4 100644
--- a/nuttx/arch/sh/src/m16c/m16c_timerisr.c
+++ b/nuttx/arch/sh/src/m16c/m16c_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/sh/src/sh1/sh1_timerisr.c b/nuttx/arch/sh/src/sh1/sh1_timerisr.c
index fe0ab89c5..2f988984f 100644
--- a/nuttx/arch/sh/src/sh1/sh1_timerisr.c
+++ b/nuttx/arch/sh/src/sh1/sh1_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/sim/src/up_unblocktask.c b/nuttx/arch/sim/src/up_unblocktask.c
index 2da05edcc..66f7a6d34 100644
--- a/nuttx/arch/sim/src/up_unblocktask.c
+++ b/nuttx/arch/sim/src/up_unblocktask.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "os_internal.h"
 #include "up_internal.h"
 
diff --git a/nuttx/arch/x86/src/common/up_unblocktask.c b/nuttx/arch/x86/src/common/up_unblocktask.c
index 9e5597f16..89dcf5418 100644
--- a/nuttx/arch/x86/src/common/up_unblocktask.c
+++ b/nuttx/arch/x86/src/common/up_unblocktask.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/x86/src/qemu/qemu_timerisr.c b/nuttx/arch/x86/src/qemu/qemu_timerisr.c
index 4ca7cf520..111b52126 100644
--- a/nuttx/arch/x86/src/qemu/qemu_timerisr.c
+++ b/nuttx/arch/x86/src/qemu/qemu_timerisr.c
@@ -51,7 +51,7 @@
 #include <arch/io.h>
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/nuttx/arch/z16/src/common/up_unblocktask.c b/nuttx/arch/z16/src/common/up_unblocktask.c
index 28bb95417..fab6e9a84 100644
--- a/nuttx/arch/z16/src/common/up_unblocktask.c
+++ b/nuttx/arch/z16/src/common/up_unblocktask.c
@@ -46,7 +46,7 @@
 
 #include "chip/chip.h"
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z16/src/z16f/z16f_timerisr.c b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
index 2016b557d..79f1dc2eb 100644
--- a/nuttx/arch/z16/src/z16f/z16f_timerisr.c
+++ b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip/chip.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /***************************************************************************
diff --git a/nuttx/arch/z80/src/common/up_unblocktask.c b/nuttx/arch/z80/src/common/up_unblocktask.c
index bc829db0d..3ce1e5a17 100644
--- a/nuttx/arch/z80/src/common/up_unblocktask.c
+++ b/nuttx/arch/z80/src/common/up_unblocktask.c
@@ -47,7 +47,7 @@
 #include "chip/chip.h"
 #include "chip/switch.h"
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/arch/z80/src/ez80/ez80_timerisr.c b/nuttx/arch/z80/src/ez80/ez80_timerisr.c
index abda72877..4fbc49c0d 100644
--- a/nuttx/arch/z80/src/ez80/ez80_timerisr.c
+++ b/nuttx/arch/z80/src/ez80/ez80_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 
 #include "chip/chip.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /***************************************************************************
diff --git a/nuttx/arch/z80/src/z180/z180_timerisr.c b/nuttx/arch/z80/src/z180/z180_timerisr.c
index 55a52c9cb..35d21c5a0 100644
--- a/nuttx/arch/z80/src/z180/z180_timerisr.c
+++ b/nuttx/arch/z80/src/z180/z180_timerisr.c
@@ -45,7 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 #include "chip.h"
diff --git a/nuttx/arch/z80/src/z8/z8_timerisr.c b/nuttx/arch/z80/src/z8/z8_timerisr.c
index 92113e482..b4b620f2b 100644
--- a/nuttx/arch/z80/src/z8/z8_timerisr.c
+++ b/nuttx/arch/z80/src/z8/z8_timerisr.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 
 #include "chip/chip.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /***************************************************************************
diff --git a/nuttx/configs/xtrs/src/xtr_timerisr.c b/nuttx/configs/xtrs/src/xtr_timerisr.c
index 893a41493..fea2c682d 100644
--- a/nuttx/configs/xtrs/src/xtr_timerisr.c
+++ b/nuttx/configs/xtrs/src/xtr_timerisr.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/arch.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/configs/z80sim/src/z80_timerisr.c b/nuttx/configs/z80sim/src/z80_timerisr.c
index 51ae04add..861689485 100644
--- a/nuttx/configs/z80sim/src/z80_timerisr.c
+++ b/nuttx/configs/z80sim/src/z80_timerisr.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/arch.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile
index cc2d1f3e8..fb34c7589 100644
--- a/nuttx/sched/Makefile
+++ b/nuttx/sched/Makefile
@@ -110,10 +110,6 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 TIME_SRCS += nanosleep.c
 endif
 
-CLOCK_SRCS  = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c
-CLOCK_SRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
-CLOCK_SRCS += clock_gettimeofday.c clock_systimer.c
-
 ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
 TIMER_SRCS += timer_initialize.c timer_create.c timer_delete.c timer_getoverrun.c
 TIMER_SRCS += timer_gettime.c timer_settime.c timer_release.c
@@ -130,11 +126,12 @@ include semaphore/Make.defs
 include signal/Make.defs
 include pthread/Make.defs
 include mqueue/Make.defs
+include clock/Make.defs
 include environ/Make.defs
 
 CSRCS  = $(MISC_SRCS) $(TSK_SRCS) $(SCHED_SRCS)
-CSRCS += $(TIME_SRCS)  $(TIMER_SRCS) $(PGFILL_SRCS) $(CLOCK_SRCS)
-CSRCS +=  $(IRQ_SRCS) $(GRP_SRCS) $(WDOG_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(ENV_SRCS)
+CSRCS += $(TIME_SRCS)  $(TIMER_SRCS) $(PGFILL_SRCS)
+CSRCS +=  $(IRQ_SRCS) $(GRP_SRCS) $(WDOG_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS) $(ENV_SRCS)
 
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
diff --git a/nuttx/sched/clock/Make.defs b/nuttx/sched/clock/Make.defs
new file mode 100644
index 000000000..aa7dce762
--- /dev/null
+++ b/nuttx/sched/clock/Make.defs
@@ -0,0 +1,43 @@
+############################################################################
+# sched/clock/Make.defs
+#
+#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+CLOCK_SRCS  = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c
+CLOCK_SRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
+CLOCK_SRCS += clock_gettimeofday.c clock_systimer.c
+
+# Include clock build support
+
+DEPPATH += --dep-path clock
+VPATH += :clock
diff --git a/nuttx/sched/clock_internal.h b/nuttx/sched/clock/clock.h
index db857743e..976ec117f 100644
--- a/nuttx/sched/clock_internal.h
+++ b/nuttx/sched/clock/clock.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/clock_internal.h
+ * sched/clock/clock.h
  *
  *   Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************/
 
-#ifndef __SCHED_CLOCK_INTERNAL_H
-#define __SCHED_CLOCK_INTERNAL_H
+#ifndef __SCHED_CLOCK_CLOCK_H
+#define __SCHED_CLOCK_CLOCK_H
 
 /********************************************************************************
  * Included Files
@@ -90,4 +90,4 @@ int    clock_abstime2ticks(clockid_t clockid,
 int    clock_time2ticks(FAR const struct timespec *reltime, FAR int *ticks);
 int    clock_ticks2time(int ticks, FAR struct timespec *reltime);
 
-#endif /* __SCHED_CLOCK_INTERNAL_H */
+#endif /* __SCHED_CLOCK_CLOCK_H */
diff --git a/nuttx/sched/clock_abstime2ticks.c b/nuttx/sched/clock/clock_abstime2ticks.c
index 4f436dc14..1f8845d05 100644
--- a/nuttx/sched/clock_abstime2ticks.c
+++ b/nuttx/sched/clock/clock_abstime2ticks.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * clock_abstime2ticks.c
+ * sched/clock/clock_abstime2ticks.c
  *
  *   Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,10 +42,10 @@
 #include <time.h>
 #include <errno.h>
 #include <debug.h>
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /********************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ********************************************************************************/
 
 /********************************************************************************
diff --git a/nuttx/sched/clock_dow.c b/nuttx/sched/clock/clock_dow.c
index 93bcfc2d9..00e9703bc 100644
--- a/nuttx/sched/clock_dow.c
+++ b/nuttx/sched/clock/clock_dow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/clock_dow.c
+ * sched/clock/clock_dow.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 
 #include <nuttx/clock.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/clock_getres.c b/nuttx/sched/clock/clock_getres.c
index edbc87bf0..5f4a0b6e8 100644
--- a/nuttx/sched/clock_getres.c
+++ b/nuttx/sched/clock/clock_getres.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/clock_getres.c
+ * sched/clock/clock_getres.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/clock_gettime.c b/nuttx/sched/clock/clock_gettime.c
index 5244bc531..d0cc48370 100644
--- a/nuttx/sched/clock_gettime.c
+++ b/nuttx/sched/clock/clock_gettime.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/clock_gettime.c
+ * sched/clock/clock_gettime.c
  *
  *   Copyright (C) 2007, 2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 
 #include <arch/irq.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/clock_gettimeofday.c b/nuttx/sched/clock/clock_gettimeofday.c
index 6437ef955..46db6e698 100644
--- a/nuttx/sched/clock_gettimeofday.c
+++ b/nuttx/sched/clock/clock_gettimeofday.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/clock_gettimeofday.c
+ * sched/clock/clock_gettimeofday.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/clock_initialize.c b/nuttx/sched/clock/clock_initialize.c
index 374e675ac..62a41cd69 100644
--- a/nuttx/sched/clock_initialize.c
+++ b/nuttx/sched/clock/clock_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/clock_initialize.c
+ * sched/clock/clock_initialize.c
  *
  *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +53,7 @@
 #include <nuttx/time.h>
 #include <nuttx/rtc.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/clock_settime.c b/nuttx/sched/clock/clock_settime.c
index 302bead24..8d26da155 100644
--- a/nuttx/sched/clock_settime.c
+++ b/nuttx/sched/clock/clock_settime.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * sched/clock_settime.c
+ * sched/clock/clock_settime.c
  *
  *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <arch/irq.h>
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/clock_systimer.c b/nuttx/sched/clock/clock_systimer.c
index 65487da6e..1d24803ef 100644
--- a/nuttx/sched/clock_systimer.c
+++ b/nuttx/sched/clock/clock_systimer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/clock_systimer.c
+ * sched/clock/clock_systimer.c
  *
  *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/clock_ticks2time.c b/nuttx/sched/clock/clock_ticks2time.c
index fd300692d..416487667 100644
--- a/nuttx/sched/clock_ticks2time.c
+++ b/nuttx/sched/clock/clock_ticks2time.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * clock_ticks2time.c
+ * sched/clock/clock_ticks2time.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <time.h>
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /********************************************************************************
  * Definitions
diff --git a/nuttx/sched/clock_time2ticks.c b/nuttx/sched/clock/clock_time2ticks.c
index fc900c18c..c54cc949b 100644
--- a/nuttx/sched/clock_time2ticks.c
+++ b/nuttx/sched/clock/clock_time2ticks.c
@@ -1,5 +1,5 @@
 /********************************************************************************
- * sched/clock_time2ticks.c
+ * sched/clock/clock_time2ticks.c
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /********************************************************************************
  * Definitions
diff --git a/nuttx/sched/mqueue/mq_timedreceive.c b/nuttx/sched/mqueue/mq_timedreceive.c
index 081959c9c..9ff42c86d 100644
--- a/nuttx/sched/mqueue/mq_timedreceive.c
+++ b/nuttx/sched/mqueue/mq_timedreceive.c
@@ -51,7 +51,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "mqueue/mqueue.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/mqueue/mq_timedsend.c b/nuttx/sched/mqueue/mq_timedsend.c
index b3e79d48e..3174c341b 100644
--- a/nuttx/sched/mqueue/mq_timedsend.c
+++ b/nuttx/sched/mqueue/mq_timedsend.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <nuttx/arch.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "os_internal.h"
 #include "mqueue/mqueue.h"
 
diff --git a/nuttx/sched/nanosleep.c b/nuttx/sched/nanosleep.c
index 4dc76de56..43414f2f2 100644
--- a/nuttx/sched/nanosleep.c
+++ b/nuttx/sched/nanosleep.c
@@ -47,7 +47,7 @@
 #include <nuttx/clock.h>
 #include <arch/irq.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index dc610222b..dd5d79620 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -61,7 +61,7 @@
 #ifndef CONFIG_DISABLE_PTHREAD
 # include "pthread/pthread.h"
 #endif
-#include  "clock_internal.h"
+#include  "clock/clock.h"
 #include  "timer_internal.h"
 #include  "irq/irq.h"
 #ifdef HAVE_TASK_GROUP
diff --git a/nuttx/sched/pthread/pthread_condtimedwait.c b/nuttx/sched/pthread/pthread_condtimedwait.c
index bd883d253..16cce8690 100644
--- a/nuttx/sched/pthread/pthread_condtimedwait.c
+++ b/nuttx/sched/pthread/pthread_condtimedwait.c
@@ -52,7 +52,7 @@
 
 #include "os_internal.h"
 #include "pthread/pthread.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "signal/signal.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/pthread/pthread_create.c b/nuttx/sched/pthread/pthread_create.c
index a4b583e23..b3969e4f7 100644
--- a/nuttx/sched/pthread/pthread_create.c
+++ b/nuttx/sched/pthread/pthread_create.c
@@ -54,7 +54,7 @@
 
 #include "os_internal.h"
 #include "group/group.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "pthread/pthread.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/sched_processtimer.c b/nuttx/sched/sched_processtimer.c
index 281bfe385..86bee80b8 100644
--- a/nuttx/sched/sched_processtimer.c
+++ b/nuttx/sched/sched_processtimer.c
@@ -48,7 +48,7 @@
 
 #include "os_internal.h"
 #include "wdog/wdog.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/sched_rrgetinterval.c b/nuttx/sched/sched_rrgetinterval.c
index 0dd9ec040..9790f461d 100644
--- a/nuttx/sched/sched_rrgetinterval.c
+++ b/nuttx/sched/sched_rrgetinterval.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_setscheduler.c b/nuttx/sched/sched_setscheduler.c
index cabf81bec..3aaae4013 100644
--- a/nuttx/sched/sched_setscheduler.c
+++ b/nuttx/sched/sched_setscheduler.c
@@ -47,7 +47,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/sched/sched_timerexpiration.c b/nuttx/sched/sched_timerexpiration.c
index d060b921b..60acda509 100644
--- a/nuttx/sched/sched_timerexpiration.c
+++ b/nuttx/sched/sched_timerexpiration.c
@@ -51,7 +51,7 @@
 
 #include "os_internal.h"
 #include "wdog/wdog.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 #ifdef CONFIG_SCHED_TICKLESS
 
diff --git a/nuttx/sched/semaphore/sem_timedwait.c b/nuttx/sched/semaphore/sem_timedwait.c
index 971251f56..c18ddf3fe 100644
--- a/nuttx/sched/semaphore/sem_timedwait.c
+++ b/nuttx/sched/semaphore/sem_timedwait.c
@@ -50,7 +50,7 @@
 #include <nuttx/arch.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "semaphore/semaphore.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/signal/sig_timedwait.c b/nuttx/sched/signal/sig_timedwait.c
index e01f35807..a71b78c6b 100644
--- a/nuttx/sched/signal/sig_timedwait.c
+++ b/nuttx/sched/signal/sig_timedwait.c
@@ -54,7 +54,7 @@
 
 #include "os_internal.h"
 #include "signal/signal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/sched/timer_gettime.c b/nuttx/sched/timer_gettime.c
index 7598dbec5..c624badd1 100644
--- a/nuttx/sched/timer_gettime.c
+++ b/nuttx/sched/timer_gettime.c
@@ -42,7 +42,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "timer_internal.h"
 
 #ifndef CONFIG_DISABLE_POSIX_TIMERS
diff --git a/nuttx/sched/timer_settime.c b/nuttx/sched/timer_settime.c
index 747a25834..e3cd2cb15 100644
--- a/nuttx/sched/timer_settime.c
+++ b/nuttx/sched/timer_settime.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include "os_internal.h"
-#include "clock_internal.h"
+#include "clock/clock.h"
 #include "signal/signal.h"
 #include "timer_internal.h"