diff --git a/fs/Makefile b/fs/Makefile index c5c61a6d25..856cc231ca 100644 --- a/fs/Makefile +++ b/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/fs/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c similarity index 99% rename from fs/fs_closeblockdriver.c rename to fs/driver/fs_closeblockdriver.c index cc0e3e2bfd..a0add5cc75 100644 --- a/fs/fs_closeblockdriver.c +++ b/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 diff --git a/fs/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c similarity index 99% rename from fs/fs_findblockdriver.c rename to fs/driver/fs_findblockdriver.c index afc1bb2b82..73133f25f1 100644 --- a/fs/fs_findblockdriver.c +++ b/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 diff --git a/fs/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c similarity index 99% rename from fs/fs_openblockdriver.c rename to fs/driver/fs_openblockdriver.c index 5bd7b1a6fc..8c89572d1f 100644 --- a/fs/fs_openblockdriver.c +++ b/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 diff --git a/fs/fs_registerblockdriver.c b/fs/driver/fs_registerblockdriver.c similarity index 99% rename from fs/fs_registerblockdriver.c rename to fs/driver/fs_registerblockdriver.c index d55407ff8d..671ca2fa16 100644 --- a/fs/fs_registerblockdriver.c +++ b/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 diff --git a/fs/fs_registerdriver.c b/fs/driver/fs_registerdriver.c similarity index 99% rename from fs/fs_registerdriver.c rename to fs/driver/fs_registerdriver.c index db2aa617d5..b249861d13 100644 --- a/fs/fs_registerdriver.c +++ b/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 diff --git a/fs/fs_unregisterblockdriver.c b/fs/driver/fs_unregisterblockdriver.c similarity index 98% rename from fs/fs_unregisterblockdriver.c rename to fs/driver/fs_unregisterblockdriver.c index 2065254617..f886cdce40 100644 --- a/fs/fs_unregisterblockdriver.c +++ b/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 diff --git a/fs/fs_unregisterdriver.c b/fs/driver/fs_unregisterdriver.c similarity index 99% rename from fs/fs_unregisterdriver.c rename to fs/driver/fs_unregisterdriver.c index ffd2873831..f9a073e195 100644 --- a/fs/fs_unregisterdriver.c +++ b/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 diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c index d9db965c79..839cf4f210 100644 --- a/fs/inode/fs_files.c +++ b/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 diff --git a/fs/inode/fs_foreachinode.c b/fs/inode/fs_foreachinode.c index 06412d6eac..a5f32b7c0b 100644 --- a/fs/inode/fs_foreachinode.c +++ b/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 diff --git a/fs/inode/fs_inode.c b/fs/inode/fs_inode.c index 3eb89ab4f7..bcb0d28549 100644 --- a/fs/inode/fs_inode.c +++ b/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 diff --git a/fs/inode/fs_inodeaddref.c b/fs/inode/fs_inodeaddref.c index b5c14e0b06..c0365dfcad 100644 --- a/fs/inode/fs_inodeaddref.c +++ b/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 diff --git a/fs/inode/fs_inodebasename.c b/fs/inode/fs_inodebasename.c index 4fa78e028f..d2a2ad46fe 100644 --- a/fs/inode/fs_inodebasename.c +++ b/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 diff --git a/fs/inode/fs_inodefind.c b/fs/inode/fs_inodefind.c index 88f34c87de..d91567b913 100644 --- a/fs/inode/fs_inodefind.c +++ b/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 diff --git a/fs/inode/fs_inoderelease.c b/fs/inode/fs_inoderelease.c index 5fef133deb..134a59ce25 100644 --- a/fs/inode/fs_inoderelease.c +++ b/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 diff --git a/fs/inode/fs_inoderemove.c b/fs/inode/fs_inoderemove.c index 9cc6e0907c..b78bf651c5 100644 --- a/fs/inode/fs_inoderemove.c +++ b/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 diff --git a/fs/inode/fs_inodereserve.c b/fs/inode/fs_inodereserve.c index 72d2ff0311..563be7f76b 100644 --- a/fs/inode/fs_inodereserve.c +++ b/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