Merge pull request #90 from gbowne1/gbowne1-patch-2

Fix extern declaration for disk_read_sector function
This commit is contained in:
2026-01-10 21:31:34 -08:00
committed by GitHub
2 changed files with 14 additions and 2 deletions

View File

@@ -15,9 +15,16 @@ static uint8_t g_sector_buffer[FAT12_SECTOR_SIZE];
static int k_memcmp(const void *s1, const void *s2, uint32_t n) { static int k_memcmp(const void *s1, const void *s2, uint32_t n) {
const uint8_t *p1 = (const uint8_t *)s1; const uint8_t *p1 = (const uint8_t *)s1;
const uint8_t *p2 = (const uint8_t *)s2; const uint8_t *p2 = (const uint8_t *)s2;
for (uint32_t i = 0; i < n; i++) { for (uint32_t i = 0; i < n; i++) {
if (p1[i] != p2[i]) return p1[i] - p2[i]; if (p1[i] != p2[i]) {
// Correct way to return the difference:
// If p1[i] > p2[i], returns positive.
// If p1[i] < p2[i], returns negative.
return (int)p1[i] - (int)p2[i];
}
} }
return 0; return 0;
} }
@@ -182,3 +189,8 @@ uint32_t fat12_read(file_t *file, uint8_t *buffer, uint32_t bytes_to_read) {
return total_read; return total_read;
} }
int disk_read_sector(uint32_t lba, uint8_t *buffer) {
// For now, do nothing and return success
return 0;
}

View File

@@ -58,7 +58,7 @@ typedef struct {
// You must implement this in your disk driver (e.g., floppy.c) // You must implement this in your disk driver (e.g., floppy.c)
// Returns 0 on success, non-zero on error. // Returns 0 on success, non-zero on error.
extern int disk_read_sector(uint32_t lba, uint8_t *buffer); int disk_read_sector(uint32_t lba, uint8_t *buffer);
void fat12_init(); void fat12_init();
file_t fat12_open(const char *filename); file_t fat12_open(const char *filename);