aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/include
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2015-03-09 17:04:04 +0100
committerAlex Auvolat <alex@adnab.me>2015-03-09 17:04:04 +0100
commit3341e7a3a184b5bea17f0f678b40bc51c92d72a4 (patch)
treec77a940a371148b256676f7b59caaecc725a1f1d /src/kernel/include
parent436418e575b68fd7e85f7fdaf039e03874ec1cb9 (diff)
downloadkogata-3341e7a3a184b5bea17f0f678b40bc51c92d72a4.tar.gz
kogata-3341e7a3a184b5bea17f0f678b40bc51c92d72a4.zip
Partial implement VFS pager (enough for ISO9660!)
Also add some debugging facilities (especially stack trace).
Diffstat (limited to 'src/kernel/include')
-rw-r--r--src/kernel/include/pager.h4
-rw-r--r--src/kernel/include/region.h4
-rw-r--r--src/kernel/include/vfs.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/include/pager.h b/src/kernel/include/pager.h
index 7ef8b6c..7f93b8c 100644
--- a/src/kernel/include/pager.h
+++ b/src/kernel/include/pager.h
@@ -33,8 +33,8 @@ typedef struct pager {
union {
struct {
- fs_node_t* vfs_data;
- vfs_pager_ops_t *vfs_ops;
+ fs_node_t* node;
+ vfs_pager_ops_t *ops;
} vfs_pager;
struct {
size_t phys_offset;
diff --git a/src/kernel/include/region.h b/src/kernel/include/region.h
index d5cba2d..eb6f7e8 100644
--- a/src/kernel/include/region.h
+++ b/src/kernel/include/region.h
@@ -24,8 +24,8 @@ region_info_t *find_region(void* addr);
void region_free(void* addr);
// some usefull PF handlers
-void pf_handler_unexpected(pagedir_t *pd, struct region_info *r, void* addr); // Expects never to be called
-void pf_handler_stackoverflow(pagedir_t *pd, struct region_info *r, void* addr); // Stack overflow detected
+// void pf_handler_unexpected(pagedir_t *pd, struct region_info *r, void* addr); // Expects never to be called
+// void pf_handler_stackoverflow(pagedir_t *pd, struct region_info *r, void* addr); // Stack overflow detected
// some functions for freeing regions and frames
// region_free_unmap_free : deletes a region and frees all frames that were mapped in it
diff --git a/src/kernel/include/vfs.h b/src/kernel/include/vfs.h
index cdd9e8d..2d50c9a 100644
--- a/src/kernel/include/vfs.h
+++ b/src/kernel/include/vfs.h
@@ -90,11 +90,11 @@ typedef struct fs_node_ops {
bool (*stat)(fs_node_ptr n, stat_t *st);
int (*ioctl)(fs_node_ptr f, int command, void* data);
- bool (*walk)(fs_node_ptr n, const char* file, struct fs_node *node_d);
+ bool (*walk)(fs_node_t *n, const char* file, struct fs_node *node_d);
bool (*delete)(fs_node_ptr n, const char* file);
bool (*move)(fs_node_ptr dir, const char* old_name, struct fs_node *new_parent, const char *new_name);
bool (*create)(fs_node_ptr n, const char* name, int type); // create sub-node in directory
- void (*dispose)(fs_node_ptr n);
+ void (*dispose)(fs_node_t *n);
} fs_node_ops_t;
typedef struct fs_node {