diff --git a/sys/fs/fat/fat.c b/sys/fs/fat/fat.c index 429b07f..41e0b03 100644 --- a/sys/fs/fat/fat.c +++ b/sys/fs/fat/fat.c @@ -138,7 +138,7 @@ assert(fd->mp->device->devInfo->read); assert(file); - kprintf(file); + kprintf("Mode: 0x%X\n", fd->mode); _file = fl_fopen(file, "r"); diff --git a/sys/fs/fat/fat_access.c b/sys/fs/fat/fat_access.c index 2182695..e5679c4 100644 --- a/sys/fs/fat/fat_access.c +++ b/sys/fs/fat/fat_access.c @@ -408,7 +408,6 @@ fatfs_lfn_cache_entry(&lfn, fs->currentsector.sector + recordoffset); } else if (fatfs_entry_lfn_invalid(directoryEntry)) { // If Invalid record found delete any long file name information collated - kprintf("DB[%s:%i]", __FILE__, __LINE__); fatfs_lfn_cache_init(&lfn, 0); } diff --git a/sys/fs/fat/fat_filelib.c b/sys/fs/fat/fat_filelib.c index 7373c3d..5c37840 100644 --- a/sys/fs/fat/fat_filelib.c +++ b/sys/fs/fat/fat_filelib.c @@ -71,7 +71,6 @@ static FL_FILE* _allocate_file(void) { // Allocate free file struct fat_node *node = fat_list_pop_head(&_free_file_list); - kprintf("[%s:%i] 0x%X", __FILE__, __LINE__, node); // Add to open list if (node) fat_list_insert_last(&_open_file_list, node); @@ -307,10 +306,8 @@ // Allocate a new file handle file = _allocate_file(); - kprintf("DB[%s:%i]: 0x%X\n", __FILE__, __LINE__, file); if (!file) return NULL; - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // Clear filename memset(file->path, '\0', sizeof(file->path)); @@ -321,14 +318,12 @@ _free_file(file); return NULL; } - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // Check if file already open if (_check_file_open(file)) { _free_file(file); return NULL; } - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // If file is in the root dir if (file->path[0] == 0) file->parentcluster = fatfs_get_root_cluster(&_fs); @@ -339,13 +334,10 @@ return NULL; } } - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // Using dir cluster address search for filename if (fatfs_get_file_entry(&_fs, file->parentcluster, file->filename, &sfEntry)) { - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // Make sure entry is file not dir! if (fatfs_entry_is_file(&sfEntry)) { - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); // Initialise file details memcpy(file->shortfilename, sfEntry.Name, FAT_SFN_SIZE_FULL); file->filelength = FAT_HTONL(sfEntry.FileSize); @@ -366,7 +358,6 @@ return file; } } - kprintf("DB[%s:%i]\n", __FILE__, __LINE__); _free_file(file); return NULL; } diff --git a/sys/init/main.c b/sys/init/main.c index a627402..238e38a 100644 --- a/sys/init/main.c +++ b/sys/init/main.c @@ -147,10 +147,10 @@ /* New Root Mount Point */ /* Old 2 new 10 */ kprintf("[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR(rootdev), B_CONTROLLER(rootdev), B_SLICE(rootdev), B_UNIT(rootdev), B_PARTITION(rootdev), B_TYPE(rootdev)); - /* if ( vfs_mount( B_UNIT(_bootdev), B_PARTITION(_bootdev), 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { */ + /* if ( vfs_mount( B_UNIT(_bootdev), B_PARTITION(_bootdev), 0x0, 0xAA, "sys2", "rw" ) != 0x0 ) { */ if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "sys2", "rw") != 0x0) { //UFS FS - kprintf("Problem Mounting sys2 Mount Point\n"); + kprintf("Problem Mounting sys Mount Point\n"); } else kprintf("Mounted sys2\n");