kamkow1/my-os-project2
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shorter ata driver and partition dev names

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-11-16 00:08:31 +01:00
parent 0a43ba36cd
commit 58a47edc79
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base/scripts/mount.tb
View File

@ -1,6 +1,6 @@
print 'Mounting filesystems...\n' print 'Mounting filesystems...\n'
setlogcmds yes setlogcmds yes
# MOUNTPOINT FILESYSTEM DEVICE NAME DO FORMATTING # MOUNTPOINT FILESYSTEM DEVICE NAME DO FORMATTING
$fs mount -mp uhome -fs LittleFS -dev atasd-ch0-M-part2 -fmt no $fs mount -mp uhome -fs LittleFS -dev atasd0mp2 -fmt no

2
kernel/diskpart/mbr.c
View File

@ -52,7 +52,7 @@ void diskpart_mbr_expose_partitions(StoreDev *sd, MBR *mbr) {
}; };
char name1[100]; char name1[100];
ksprintf(name1, "%s-part%zu", name, i+1); ksprintf(name1, "%sp%zu", name, i+1);
kprintf("%s\n", name1); kprintf("%s\n", name1);
storedev_create(STOREDEV_PARTSD, name1, &extra); storedev_create(STOREDEV_PARTSD, name1, &extra);
} }

8
kernel/storedev/atasd.c
View File

@ -121,7 +121,7 @@ void ata_probe(void) {
.iobase = 0x1F0, .iobase = 0x1F0,
.ctrlbase = 0x3F6, .ctrlbase = 0x3F6,
}; };
storedev_create(STOREDEV_ATASD, "atasd-ch0-M", (void *)&extra); storedev_create(STOREDEV_ATASD, "atasd0m", (void *)&extra);
} }
probesize = ata_probesize_bytes(0x1F0, 0x3F6, ATA_SLAVE); probesize = ata_probesize_bytes(0x1F0, 0x3F6, ATA_SLAVE);
@ -135,7 +135,7 @@ void ata_probe(void) {
.iobase = 0x1F0, .iobase = 0x1F0,
.ctrlbase = 0x3F6, .ctrlbase = 0x3F6,
}; };
storedev_create(STOREDEV_ATASD, "atasd-ch0-S", (void *)&extra); storedev_create(STOREDEV_ATASD, "atasd0s", (void *)&extra);
} }
probesize = ata_probesize_bytes(0x170, 0x376, ATA_MASTER); probesize = ata_probesize_bytes(0x170, 0x376, ATA_MASTER);
@ -149,7 +149,7 @@ void ata_probe(void) {
.iobase = 0x170, .iobase = 0x170,
.ctrlbase = 0x376, .ctrlbase = 0x376,
}; };
storedev_create(STOREDEV_ATASD, "atasd-ch1-M", (void *)&extra); storedev_create(STOREDEV_ATASD, "atasd1m", (void *)&extra);
} }
probesize = ata_probesize_bytes(0x170, 0x376, ATA_SLAVE); probesize = ata_probesize_bytes(0x170, 0x376, ATA_SLAVE);
@ -163,7 +163,7 @@ void ata_probe(void) {
.iobase = 0x170, .iobase = 0x170,
.ctrlbase = 0x376, .ctrlbase = 0x376,
}; };
storedev_create(STOREDEV_ATASD, "atasd-ch1-S", (void *)&extra); storedev_create(STOREDEV_ATASD, "atasd1s", (void *)&extra);
} }
} }

4
kernel/vfs/vfs.c
View File

@ -230,7 +230,7 @@ void vfs_init(void) {
{ {
RamSdInitExtra extra = { .capacity = baseimg_getsize(), .preallocbuffer = (uint8_t *)baseimg_getaddr() }; RamSdInitExtra extra = { .capacity = baseimg_getsize(), .preallocbuffer = (uint8_t *)baseimg_getaddr() };
StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd-0", &extra); StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd0", &extra);
if (backingsd == NULL) { if (backingsd == NULL) {
return; return;
} }
@ -239,7 +239,7 @@ void vfs_init(void) {
{ {
RamSdInitExtra extra = { .capacity = (1024*1024*10) }; RamSdInitExtra extra = { .capacity = (1024*1024*10) };
StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd-1", &extra); StoreDev *backingsd = storedev_create(STOREDEV_RAMSD, "ramsd1", &extra);
if (backingsd == NULL) { if (backingsd == NULL) {
return; return;
} }