diff --git a/Doxyfile b/Doxyfile
index 963133c..528535d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -22,20 +22,20 @@
a \
an \
the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
+ALWAYS_DETAILED_SEC = YES
+INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = /usr/home/reddawg/
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
+DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_JAVA = NO
SUBGROUPING = YES
#---------------------------------------------------------------------------
@@ -166,9 +166,9 @@
GENERATE_HTMLHELP = NO
CHM_FILE =
HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
+GENERATE_CHI = YES
+BINARY_TOC = YES
+TOC_EXPAND = YES
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = YES
@@ -184,8 +184,8 @@
PAPER_TYPE = a4wide
EXTRA_PACKAGES =
LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
#---------------------------------------------------------------------------
@@ -248,15 +248,15 @@
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
+HAVE_DOT = YES
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
+UML_LOOK = YES
+TEMPLATE_RELATIONS = YES
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
+CALL_GRAPH = YES
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
@@ -272,4 +272,4 @@
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-SEARCHENGINE = NO
+SEARCHENGINE = YES
diff --git a/doc/vfs.txt b/doc/vfs.txt
new file mode 100644
index 0000000..c72b414
--- /dev/null
+++ b/doc/vfs.txt
@@ -0,0 +1,4 @@
+$Id$
+
+fd offset -
+This will be adjusted by the read and write calls inside the FS module
diff --git a/src/bin/shell/exec.c b/src/bin/shell/exec.c
index a31d5e5..41ff599 100644
--- a/src/bin/shell/exec.c
+++ b/src/bin/shell/exec.c
@@ -49,9 +49,9 @@
exit(-1);
}
else {
- if (data->bg == 0x0) {
+ //if (data->bg == 0x0) {
while (pidStatus(cPid) > 0)
sched_yield();
- }
+ //}
}
}
diff --git a/src/sys/kernel/syscall.c b/src/sys/kernel/syscall.c
index 59febca..e8a19f3 100644
--- a/src/sys/kernel/syscall.c
+++ b/src/sys/kernel/syscall.c
@@ -179,8 +179,11 @@
void sysCheckPid(int pid,int *ptr)
{
kTask_t *tmpTask = schedFindTask(pid);
- if ((tmpTask != 0x0) && (ptr != 0x0))
+ if ((tmpTask != 0x0) && (ptr != 0x0)) {
*ptr = tmpTask->state;
+ if (*ptr != 1)
+ kprintf("[%i]",*ptr);
+ }
else
*ptr = 0x0;
return;
diff --git a/ubixos.kdevelop b/ubixos.kdevelop
index f5dde86..a9a82cd 100644
--- a/ubixos.kdevelop
+++ b/ubixos.kdevelop
@@ -15,7 +15,7 @@
kdevcvsservice
.
false
-
+
@@ -34,27 +34,27 @@
make
-
+
true
1
false
-
+
0
-
-
+
+
default
executable
/
-
-
+
+
false
true
@@ -115,7 +115,7 @@
Doxygen Documentation Collection
ubixos.tag
-
+
@@ -147,10 +147,10 @@
false
3
-
+
-
+
set
m_,_
theValue
@@ -190,12 +190,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
true
false
false
@@ -211,7 +211,7 @@
-
-
+
+
diff --git a/ubixos.kdevelop.pcs b/ubixos.kdevelop.pcs
index 47afd6a..404e462 100644
--- a/ubixos.kdevelop.pcs
+++ b/ubixos.kdevelop.pcs
Binary files differ
diff --git a/ubixos.kdevses b/ubixos.kdevses
index 189ea78..11fb667 100644
--- a/ubixos.kdevses
+++ b/ubixos.kdevses
@@ -1,20 +1,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/ubixos.tag b/ubixos.tag
index ea6b225..39e08cf 100644
--- a/ubixos.tag
+++ b/ubixos.tag
@@ -19857,6 +19857,13 @@
1bb2a92794cb2bb4f6409ba76fe6450b
(const char *)
+
+ virtual int
+ read
+ classFileSystemAbstract.html
+ 7b429977060959206ff6f741a063062d
+ (char *, long, long)=0
+
virtual int
read
@@ -19864,6 +19871,13 @@
de8d72587494f9d7505574e9afe4ab0b
(void *, long, long)
+
+ virtual int
+ write
+ classFileSystemAbstract.html
+ 2f1993d9e8bf9cde4e6f2d60cdccc58f
+ (char *, long, long)=0
+
virtual int
write
@@ -27578,6 +27592,20 @@
virtual int
+ vfs_close
+ classvfs__abstract.html
+ 4d5773ba4f9449ca6f53a284e46319ba
+ (fileDescriptor *)
+
+
+ virtual int
+ vfs_closedir
+ classvfs__abstract.html
+ c051cfe1b772bc4340bf9218d28f1d10
+ (DIR *)
+
+
+ virtual int
vfs_format
classUbixFS.html
e1266337d259778b1404601184d75028
@@ -27612,6 +27640,20 @@
(const char *, fileDescriptor *, int,...)
+ virtual int
+ vfs_opendir
+ classvfs__abstract.html
+ f7f49919b29ae23be0b500691bd7489b
+ (DIR *, const char *)
+
+
+ virtual int
+ vfs_purge
+ classvfs__abstract.html
+ 44b94c11ccc71b299022b24e4810273f
+ (void)
+
+
virtual size_t
vfs_read
classUbixFS.html
@@ -27620,6 +27662,27 @@
virtual int
+ vfs_readdir
+ classvfs__abstract.html
+ e0e736281f7a5c7f6ba6c2fcc1606537
+ (DIR *, struct dirent *)
+
+
+ virtual int
+ vfs_rename
+ classvfs__abstract.html
+ 566f42818133f3151b79409bfcc0a086
+ (const char *, const char *)
+
+
+ virtual int
+ vfs_rmdir
+ classvfs__abstract.html
+ 2ad911bc4b4ad0867e0b1037a0bafd6e
+ (const char *)
+
+
+ virtual int
vfs_stop
classUbixFS.html
c2ccea3f574eaa7d4700748d0b4bde71
@@ -27633,6 +27696,13 @@
(void)
+ virtual int
+ vfs_unlink
+ classvfs__abstract.html
+ 0b409654c320cf8724e83d403bcf1099
+ (const char *)
+
+
virtual size_t
vfs_write
classUbixFS.html
@@ -27710,6 +27780,13 @@
(blockRun)
+ device_t *
+ device
+ classvfs__abstract.html
+ e10cade4827cea8db0f94e517d82dcfd
+
+
+
signed char *
freeBlockList
classUbixFS.html
@@ -27717,6 +27794,20 @@
+ vfs_abstract *
+ next
+ classvfs__abstract.html
+ 45ce75cdedbdca884f4d7d965ce91802
+
+
+
+ vfs_abstract *
+ prev
+ classvfs__abstract.html
+ b766870262f3d41bbf21326abf40cad8
+
+
+
fileDescriptor *
root
classUbixFS.html