diff --git a/Makefile b/Makefile index 0b1a35d..b30df1d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ REMOVE = rm -f #Objects -OBJS = main.o vfs.o ramdrive.o +OBJS = main.o vfs.o ramdrive.o ubixfs.o #Includes INCLUDES = -I./include diff --git a/include/ubixfs.h b/include/ubixfs.h index 17fd474..050802b 100644 --- a/include/ubixfs.h +++ b/include/ubixfs.h @@ -30,10 +30,18 @@ #ifndef __UBIXFS_H_ #define __UBIXFS_H_ +class UbixFS { + public: + int init(); + }; + #endif /*** $Log$ + Revision 1.2 2004/08/13 16:51:55 reddawg + Start of ubixfs shell + END ***/ diff --git a/include/vfs.h b/include/vfs.h index aecfc6d..7db42a7 100644 --- a/include/vfs.h +++ b/include/vfs.h @@ -31,29 +31,34 @@ #define __VFS_H_ #include +#include class vfs { private: vfs *prev; vfs *next; public: - dev_t *dev; - int vfs_initFS(); - int vfs_read(char *,long,long); - int vfs_Write(char *,long,long); - int vfs_OpenFile(void *,void *); - int vfs_Unlink(char *,void *); - int vfs_MakeDir(char *,void *); - int vfs_RemDir(char *); - int vfs_Sync(void); - int vfs_Type; - int open(); + dev_t *dev; + UbixFS *fs; + int vfs_initFS(); + int vfs_read(char *,long,long); + int vfs_Write(char *,long,long); + int vfs_OpenFile(void *,void *); + int vfs_Unlink(char *,void *); + int vfs_MakeDir(char *,void *); + int vfs_RemDir(char *); + int vfs_Sync(void); + int vfs_Type; + int open(); }; #endif /*** $Log$ + Revision 1.1 2004/08/13 16:51:55 reddawg + Start of ubixfs shell + END ***/ diff --git a/ramdrive.cc b/ramdrive.cc index 05e9feb..e4d7978 100644 --- a/ramdrive.cc +++ b/ramdrive.cc @@ -43,13 +43,16 @@ ramDrive = (dev_t *)malloc(sizeof(dev_t)); - //ramDrive->read = ramDrive_read; + ramDrive->read = ramDrive_read; return(ramDrive); } /*** $Log$ + Revision 1.2 2004/08/13 16:54:14 reddawg + fixed + Revision 1.1 2004/08/13 16:51:55 reddawg Start of ubixfs shell diff --git a/ubixfs.cc b/ubixfs.cc new file mode 100644 index 0000000..fe63650 --- /dev/null +++ b/ubixfs.cc @@ -0,0 +1,47 @@ +/***************************************************************************************** + Copyright (c) 2002-2004 The UbixOS Project + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of + conditions, the following disclaimer and the list of authors. Redistributions in binary + form must reproduce the above copyright notice, this list of conditions, the following + disclaimer and the list of authors in the documentation and/or other materials provided + with the distribution. Neither the name of the UbixOS Project 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. + + $Id$ + +*****************************************************************************************/ + +#include + +#include +#include + +int UbixFS::init() { + printf("Initializing UbixFS\n"); + return(0x0); + } + +/*** + $Log$ + Revision 1.2 2004/08/13 16:51:55 reddawg + Start of ubixfs shell + + END + ***/ + diff --git a/vfs.cc b/vfs.cc index 94f9224..af694da 100644 --- a/vfs.cc +++ b/vfs.cc @@ -30,13 +30,18 @@ #include #include +#include int vfs::vfs_initFS() { + fs->init(); return(0x0); } /*** $Log$ + Revision 1.2 2004/08/13 16:54:14 reddawg + fixed + Revision 1.1 2004/08/13 16:51:55 reddawg Start of ubixfs shell