kamkow1/mop3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Device IRQs WIP

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-03-12 19:23:47 +01:00
parent 04b7355a3d
commit 19793e9126
29 changed files with 420 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
kernel/fs/fat1.c
View File

@@ -1,7 +1,19 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wmacro-redefined"
#include <fs/fat1.h>
#include <fs/fatfs_ctx.h>
#include <proc/proc.h>
#include <proc/reschedule.h>
static int media_write (struct fatfs* _fs, struct fatfs_ctx* ctx, size_t sector, uint8_t* buffer, size_t sector_count) {
return _fs->disk_io.write_media (ctx, sector, buffer, sector_count);
}
static int media_read (struct fatfs* _fs, struct fatfs_ctx* ctx, size_t sector, uint8_t* buffer, size_t sector_count) {
return _fs->disk_io.read_media (ctx, sector, buffer, sector_count);
}
#define _KERNEL_LIBK_STRING_H
#define _KERNEL_LIBK_STD_H
@@ -225,14 +237,6 @@ typedef __WCHAR_TYPE__ wchar_t;
#define NULL ((void*)0)
#undef offsetof
#define offsetof(s, m) __builtin_offsetof (s, m)
typedef enum memory_order {
memory_order_relaxed = __ATOMIC_RELAXED,
memory_order_consume = __ATOMIC_CONSUME,
memory_order_acquire = __ATOMIC_ACQUIRE,
memory_order_release = __ATOMIC_RELEASE,
memory_order_acq_rel = __ATOMIC_ACQ_REL,
memory_order_seq_cst = __ATOMIC_SEQ_CST
} memory_order;
typedef _Atomic (_Bool) atomic_bool;
typedef _Atomic (char) atomic_char;
typedef _Atomic (signed char) atomic_schar;
@@ -270,9 +274,6 @@ typedef _Atomic (size_t) atomic_size_t;
typedef _Atomic (ptrdiff_t) atomic_ptrdiff_t;
typedef _Atomic (intmax_t) atomic_intmax_t;
typedef _Atomic (uintmax_t) atomic_uintmax_t;
typedef struct atomic_flag {
atomic_bool _Value;
} atomic_flag;
#define ATOMIC_FLAG_INIT ((atomic_flag){0})
#define atomic_store(object, desired) __c11_atomic_store (object, desired, __ATOMIC_SEQ_CST)
#define atomic_store_explicit __c11_atomic_store
@@ -813,7 +814,7 @@ static int fatfs_fat_writeback (struct fatfs_ctx* ctx, struct fatfs* fs, struct
sectors = FAT_BUFFER_SECTORS;
else
sectors = fs->fat_sectors - offset;
if (!fs->disk_io.write_media (ctx, pcur->address, pcur->sector, sectors))
if (!media_write (fs, ctx, pcur->address, pcur->sector, sectors))
return 0;
}
pcur->dirty = 0;
@@ -849,7 +850,7 @@ static struct fat_buffer* fatfs_fat_read_sector (struct fatfs_ctx* ctx, struct f
if (!fatfs_fat_writeback (ctx, fs, pcur))
return 0;
pcur->address = sector;
if (!fs->disk_io.read_media (ctx, pcur->address, pcur->sector, FAT_BUFFER_SECTORS)) {
if (!media_read (fs, ctx, pcur->address, pcur->sector, FAT_BUFFER_SECTORS)) {
pcur->address = FAT32_INVALID_CLUSTER;
return NULL;
}
@@ -904,7 +905,7 @@ void fatfs_set_fs_info_next_free_cluster (struct fatfs_ctx* ctx, struct fatfs* f
FAT32_SET_32BIT_WORD (pbuf, 492, newValue);
fs->next_free_cluster = newValue;
if (fs->disk_io.write_media)
fs->disk_io.write_media (ctx, pbuf->address, pbuf->sector, 1);
media_write (fs, ctx, pbuf->address, pbuf->sector, 1);
pbuf->address = FAT32_INVALID_CLUSTER;
pbuf->dirty = 0;
}
@@ -1180,8 +1181,7 @@ int fatfs_add_file_entry (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 dirClu
if (entryCount == 0) {
fatfs_sfn_create_entry (shortfilename, size, startCluster, &shortEntry, dir);
memcpy (&fs->currentsector.sector[recordoffset], &shortEntry, sizeof (shortEntry));
return fs->disk_io.write_media (ctx, fs->currentsector.address,
fs->currentsector.sector, 1);
return media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
} else {
entryCount--;
fatfs_filename_to_lfn (filename, &fs->currentsector.sector[recordoffset], entryCount,
@@ -1191,7 +1191,7 @@ int fatfs_add_file_entry (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 dirClu
}
}
if (dirtySector) {
if (!fs->disk_io.write_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1))
if (!media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1))
return 0;
dirtySector = 0;
}
@@ -1215,7 +1215,7 @@ int fatfs_init (struct fatfs_ctx* ctx, struct fatfs* fs) {
fatfs_fat_init (fs);
if (!fs->disk_io.read_media)
return FAT_INIT_MEDIA_ACCESS_ERROR;
if (!fs->disk_io.read_media (ctx, 0, fs->currentsector.sector, 1))
if (!media_read (fs, ctx, 0, fs->currentsector.sector, 1))
return FAT_INIT_MEDIA_ACCESS_ERROR;
if (fs->currentsector.sector[SIGNATURE_POSITION] != 0x55 ||
fs->currentsector.sector[SIGNATURE_POSITION + 1] != 0xAA)
@@ -1245,7 +1245,7 @@ int fatfs_init (struct fatfs_ctx* ctx, struct fatfs* fs) {
fs->lba_begin = GET_32BIT_WORD (fs->currentsector.sector, PARTITION1_LBA_BEGIN_LOCATION);
else
fs->lba_begin = 0;
if (!fs->disk_io.read_media (ctx, fs->lba_begin, fs->currentsector.sector, 1))
if (!media_read (fs, ctx, fs->lba_begin, fs->currentsector.sector, 1))
return FAT_INIT_MEDIA_ACCESS_ERROR;
if (GET_16BIT_WORD (fs->currentsector.sector, 0x0B) != FAT_SECTOR_SIZE)
return FAT_INIT_INVALID_SECTOR_SIZE;
@@ -1303,11 +1303,11 @@ uint32 fatfs_lba_of_cluster (struct fatfs* fs, uint32 Cluster_Number) {
}
int fatfs_sector_read (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 lba, uint8* target,
uint32 count) {
return fs->disk_io.read_media (ctx, lba, target, count);
return media_read (fs, ctx, lba, target, count);
}
int fatfs_sector_write (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 lba, uint8* target,
uint32 count) {
return fs->disk_io.write_media (ctx, lba, target, count);
return media_write (fs, ctx, lba, target, count);
}
int fatfs_sector_reader (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 start_cluster,
uint32 offset, uint8* target) {
@@ -1332,10 +1332,10 @@ int fatfs_sector_reader (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 start_c
lba = fatfs_lba_of_cluster (fs, cluster_chain) + sector_to_read;
}
if (target)
return fs->disk_io.read_media (ctx, lba, target, 1);
return media_read (fs, ctx, lba, target, 1);
else if (lba != fs->currentsector.address) {
fs->currentsector.address = lba;
return fs->disk_io.read_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1);
return media_read (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
} else
return 1;
}
@@ -1348,18 +1348,18 @@ int fatfs_read_sector (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 cluster,
else
return 0;
if (target) {
return fs->disk_io.read_media (ctx, lba, target, 1);
return media_read (fs, ctx, lba, target, 1);
} else {
fs->currentsector.address = lba;
return fs->disk_io.read_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1);
return media_read (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
} else {
if (target) {
uint32 lba = fatfs_lba_of_cluster (fs, cluster) + sector;
return fs->disk_io.read_media (ctx, lba, target, 1);
return media_read (fs, ctx, lba, target, 1);
} else {
fs->currentsector.address = fatfs_lba_of_cluster (fs, cluster) + sector;
return fs->disk_io.read_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1);
return media_read (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
}
}
@@ -1374,18 +1374,18 @@ int fatfs_write_sector (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 cluster,
else
return 0;
if (target) {
return fs->disk_io.write_media (ctx, lba, target, 1);
return media_write (fs, ctx, lba, target, 1);
} else {
fs->currentsector.address = lba;
return fs->disk_io.write_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1);
return media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
} else {
if (target) {
uint32 lba = fatfs_lba_of_cluster (fs, cluster) + sector;
return fs->disk_io.write_media (ctx, lba, target, 1);
return media_write (fs, ctx, lba, target, 1);
} else {
fs->currentsector.address = fatfs_lba_of_cluster (fs, cluster) + sector;
return fs->disk_io.write_media (ctx, fs->currentsector.address, fs->currentsector.sector, 1);
return media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
}
}
@@ -1501,8 +1501,7 @@ int fatfs_update_file_length (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 Cl
directoryEntry->FileSize = FAT_HTONL (fileLength);
memcpy ((uint8*)(fs->currentsector.sector + recordoffset), (uint8*)directoryEntry,
sizeof (struct fat_dir_entry));
return fs->disk_io.write_media (ctx, fs->currentsector.address,
fs->currentsector.sector, 1);
return media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
}
}
@@ -1533,8 +1532,7 @@ int fatfs_mark_file_deleted (struct fatfs_ctx* ctx, struct fatfs* fs, uint32 Clu
directoryEntry->Name[0] = FILE_HEADER_DELETED;
memcpy ((uint8*)(fs->currentsector.sector + recordoffset), (uint8*)directoryEntry,
sizeof (struct fat_dir_entry));
return fs->disk_io.write_media (ctx, fs->currentsector.address,
fs->currentsector.sector, 1);
return media_write (fs, ctx, fs->currentsector.address, fs->currentsector.sector, 1);
}
}
}
@@ -1653,7 +1651,7 @@ static int fatfs_erase_sectors (struct fatfs_ctx* ctx, struct fatfs* fs, uint32
int i;
memset (fs->currentsector.sector, 0, FAT_SECTOR_SIZE);
for (i = 0; i < count; i++)
if (!fs->disk_io.write_media (ctx, lba + i, fs->currentsector.sector, 1))
if (!media_write (fs, ctx, lba + i, fs->currentsector.sector, 1))
return 0;
return 1;
}
@@ -1796,7 +1794,7 @@ static int fatfs_create_boot_sector (struct fatfs_ctx* ctx, struct fatfs* fs,
fs->currentsector.sector[510] = 0x55;
fs->currentsector.sector[511] = 0xAA;
}
if (fs->disk_io.write_media (ctx, boot_sector_lba, fs->currentsector.sector, 1))
if (media_write (fs, ctx, boot_sector_lba, fs->currentsector.sector, 1))
return 1;
else
return 0;
@@ -1821,7 +1819,7 @@ static int fatfs_create_fsinfo_sector (struct fatfs_ctx* ctx, struct fatfs* fs,
fs->currentsector.sector[495] = 0xFF;
fs->currentsector.sector[510] = 0x55;
fs->currentsector.sector[511] = 0xAA;
if (fs->disk_io.write_media (ctx, sector_lba, fs->currentsector.sector, 1))
if (media_write (fs, ctx, sector_lba, fs->currentsector.sector, 1))
return 1;
else
return 0;
@@ -1837,11 +1835,11 @@ static int fatfs_erase_fat (struct fatfs_ctx* ctx, struct fatfs* fs, int is_fat3
SET_32BIT_WORD (fs->currentsector.sector, 4, 0xFFFFFFFF);
SET_32BIT_WORD (fs->currentsector.sector, 8, 0x0FFFFFFF);
}
if (!fs->disk_io.write_media (ctx, fs->fat_begin_lba + 0, fs->currentsector.sector, 1))
if (!media_write (fs, ctx, fs->fat_begin_lba + 0, fs->currentsector.sector, 1))
return 0;
memset (fs->currentsector.sector, 0, FAT_SECTOR_SIZE);
for (i = 1; i < fs->fat_sectors * fs->num_of_fats; i++)
if (!fs->disk_io.write_media (ctx, fs->fat_begin_lba + i, fs->currentsector.sector, 1))
if (!media_write (fs, ctx, fs->fat_begin_lba + i, fs->currentsector.sector, 1))
return 0;
return 1;
}