Move drive from fs/. to fs/driver/.

17 files changed, 17 insertions, 20 deletions

diff --git a/nuttx/fs/Makefile b/nuttx/fs/Makefile
index c5c61a6d2..856cc231c 100644
--- a/nuttx/fs/Makefile
+++ b/nuttx/fs/Makefile
@@ -67,14 +67,11 @@ CSRCS += fs_open.c fs_opendir.c fs_poll.c fs_read.c fs_readdir.c
 CSRCS += fs_rename.c fs_rewinddir.c fs_rmdir.c fs_seekdir.c fs_stat.c
 CSRCS += fs_statfs.c fs_select.c fs_unlink.c fs_write.c
 
-CSRCS += fs_registerdriver.c fs_unregisterdriver.c
-CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c
-CSRCS += fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c
-
 DEPPATH = --dep-path .
 VPATH = .
 
 include inode/Make.defs
+include driver/Make.defs
 include mmap/Make.defs
 
 # Stream support
diff --git a/nuttx/fs/fs_closeblockdriver.c b/nuttx/fs/driver/fs_closeblockdriver.c
index cc0e3e2bf..a0add5cc7 100644
--- a/nuttx/fs/fs_closeblockdriver.c
+++ b/nuttx/fs/driver/fs_closeblockdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_closeblockdriver.c
+ * fs/driver/fs_closeblockdriver.c
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_findblockdriver.c b/nuttx/fs/driver/fs_findblockdriver.c
index afc1bb2b8..73133f25f 100644
--- a/nuttx/fs/fs_findblockdriver.c
+++ b/nuttx/fs/driver/fs_findblockdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_openblockdriver.c
+ * fs/driver/fs_openblockdriver.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_openblockdriver.c b/nuttx/fs/driver/fs_openblockdriver.c
index 5bd7b1a6f..8c89572d1 100644
--- a/nuttx/fs/fs_openblockdriver.c
+++ b/nuttx/fs/driver/fs_openblockdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_openblockdriver.c
+ * fs/driver/fs_openblockdriver.c
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_registerblockdriver.c b/nuttx/fs/driver/fs_registerblockdriver.c
index d55407ff8..671ca2fa1 100644
--- a/nuttx/fs/fs_registerblockdriver.c
+++ b/nuttx/fs/driver/fs_registerblockdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_registerblockdriver.c
+ * fs/driver/fs_registerblockdriver.c
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_registerdriver.c b/nuttx/fs/driver/fs_registerdriver.c
index db2aa617d..b249861d1 100644
--- a/nuttx/fs/fs_registerdriver.c
+++ b/nuttx/fs/driver/fs_registerdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_registerdriver.c
+ * fs/driver/fs_registerdriver.c
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_unregisterblockdriver.c b/nuttx/fs/driver/fs_unregisterblockdriver.c
index 206525461..f886cdce4 100644
--- a/nuttx/fs/fs_unregisterblockdriver.c
+++ b/nuttx/fs/driver/fs_unregisterblockdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_unregisterblockdriver.c
+ * fs/driver/fs_unregisterblockdriver.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/driver/fs_unregisterdriver.c
index ffd287383..f9a073e19 100644
--- a/nuttx/fs/fs_unregisterdriver.c
+++ b/nuttx/fs/driver/fs_unregisterdriver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_unregisterdriver.c
+ * fs/driver/fs_unregisterdriver.c
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_files.c b/nuttx/fs/inode/fs_files.c
index d9db965c7..839cf4f21 100644
--- a/nuttx/fs/inode/fs_files.c
+++ b/nuttx/fs/inode/fs_files.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_files.c
+ * fs/inode/fs_files.c
  *
  *   Copyright (C) 2007-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_foreachinode.c b/nuttx/fs/inode/fs_foreachinode.c
index 06412d6ea..a5f32b7c0 100644
--- a/nuttx/fs/inode/fs_foreachinode.c
+++ b/nuttx/fs/inode/fs_foreachinode.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_foreachinode.c
+ * fs/inode/fs_foreachinode.c
  *
  *   Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inode.c b/nuttx/fs/inode/fs_inode.c
index 3eb89ab4f..bcb0d2854 100644
--- a/nuttx/fs/inode/fs_inode.c
+++ b/nuttx/fs/inode/fs_inode.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_inode.c
+ * fs/inode/fs_inode.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inodeaddref.c b/nuttx/fs/inode/fs_inodeaddref.c
index b5c14e0b0..c0365dfca 100644
--- a/nuttx/fs/inode/fs_inodeaddref.c
+++ b/nuttx/fs/inode/fs_inodeaddref.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_inodeaddref.c
+ * fs/inode/fs_inodeaddref.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inodebasename.c b/nuttx/fs/inode/fs_inodebasename.c
index 4fa78e028..d2a2ad46f 100644
--- a/nuttx/fs/inode/fs_inodebasename.c
+++ b/nuttx/fs/inode/fs_inodebasename.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_basename.c
+ * fs/inode/fs_basename.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inodefind.c b/nuttx/fs/inode/fs_inodefind.c
index 88f34c87d..d91567b91 100644
--- a/nuttx/fs/inode/fs_inodefind.c
+++ b/nuttx/fs/inode/fs_inodefind.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_inodefind.c
+ * fs/inode/fs_inodefind.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inoderelease.c b/nuttx/fs/inode/fs_inoderelease.c
index 5fef133de..134a59ce2 100644
--- a/nuttx/fs/inode/fs_inoderelease.c
+++ b/nuttx/fs/inode/fs_inoderelease.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs_inoderelease.c
+ * fs/inode/fs_inoderelease.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inoderemove.c b/nuttx/fs/inode/fs_inoderemove.c
index 9cc6e0907..b78bf651c 100644
--- a/nuttx/fs/inode/fs_inoderemove.c
+++ b/nuttx/fs/inode/fs_inoderemove.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_inoderemove.c
+ * fs/inode/fs_inoderemove.c
  *
  *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/fs/inode/fs_inodereserve.c b/nuttx/fs/inode/fs_inodereserve.c
index 72d2ff031..563be7f76 100644
--- a/nuttx/fs/inode/fs_inodereserve.c
+++ b/nuttx/fs/inode/fs_inodereserve.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/fs_registerreserve.c
+ * fs/inode/fs_registerreserve.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>