diff options
| author | salmonik <salmonik@tuta.io> | 2026-08-01 03:44:57 +0200 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-08-01 03:44:57 +0200 |
| commit | 63d01e9d8eb6f3ccb6a96b7c577834276cf51add (patch) | |
| tree | f490b9969a8f781f48c2f168dc3e6c71c41339a9 /rsnix/src/ahci.rs | |
| parent | rustfmt: reflow fat.rs/fs.rs formatting (diff) | |
| download | rs-dos-63d01e9d8eb6f3ccb6a96b7c577834276cf51add.tar.gz rs-dos-63d01e9d8eb6f3ccb6a96b7c577834276cf51add.zip | |
Clean up warnings, fix FAT32 multi-cluster dirs, prep for edition 2024
Warning cleanup (cargo check + clippy now 0 across the workspace):
- Migrate all 21 static_mut_refs sites to &raw mut accessors (fat, gop,
ps2, vt, ahci, interrupts, memory) so edition 2024 won't deny them
- panic = "abort" profiles: bare cargo check/build now works without
nightly/-Zbuild-std
- Wire TICKS in the timer ISR (it was never incremented, so the vt scroll
batching trigger was dead code)
- Clippy: efi_main becomes unsafe extern "efiapi" with a # Safety doc,
KeyBuf::new uses inline-const array repeat (no interior-mutable const),
editor main loop is a while-let, PIT control byte regrouped
- [workspace.lints.clippy] allows result_unit_err + needless_range_loop
(deliberate kernel style); large_enum_variant allowed on LineInput
- Drop now-stale static_mut_refs allow from the rsdos bin
FAT32 correctness fixes (both pre-existing, exposed by the SFN fix):
- Unique 8.3 short names: to_8_3() never disambiguated collisions, so
files sharing a long-name prefix got identical SFNs and fsck reported
duplicate directory entries. Add dir_short_names() + unique_short_name()
(~N tails, Windows-style) and force LFN when the SFN changes.
- Multi-cluster directories: scan_dir/dir_short_names stopped at the first
0x00 slot, hiding every entry written into a chained cluster (writes
failed with 'cannot write', duplicate SFNs accumulated); add_dir_entry
now packs the cluster (0xE5 deleted-markers) before extending so other
FAT readers (mtools, Windows) see the continuation too.
Other: delete dead fields (Disk.fis, Volume.fat_count), drop timer_irq/
keyboard_irq/rendered, refresh_and_exit is a documented unsafe fn, CONTEXT
.md corrected (stable toolchain, IRQ input, 4-crate layout), .gitignore
excludes .pi-subagents artifacts.
Validated: cargo check/clippy/fmt clean, make test-disk PASS on fresh and
reused images (incl. two directory-chain extensions and ~10 SFN tails),
editor round-trip smoke test PASS.
Diffstat (limited to '')
| -rw-r--r-- | rsnix/src/ahci.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rsnix/src/ahci.rs b/rsnix/src/ahci.rs index 427345d..9a49431 100644 --- a/rsnix/src/ahci.rs +++ b/rsnix/src/ahci.rs | |||
| @@ -54,7 +54,6 @@ const ATA_WRITE_DMA_EXT: u8 = 0x35; | |||
| 54 | struct Disk { | 54 | struct Disk { |
| 55 | port: usize, // port register base = ABAR + 0x100 | 55 | port: usize, // port register base = ABAR + 0x100 |
| 56 | clb: usize, // command list, 1024 B (32 × 32 B), 256 B aligned | 56 | clb: usize, // command list, 1024 B (32 × 32 B), 256 B aligned |
| 57 | fis: usize, // FIS receive area, 256 B aligned | ||
| 58 | ct: usize, // command table, 256 B, 128 B aligned | 57 | ct: usize, // command table, 256 B, 128 B aligned |
| 59 | buf: usize, // 4 KiB DMA data buffer (page aligned) | 58 | buf: usize, // 4 KiB DMA data buffer (page aligned) |
| 60 | sectors: u64, // total sectors (LBA48 from IDENTIFY) | 59 | sectors: u64, // total sectors (LBA48 from IDENTIFY) |
| @@ -175,7 +174,6 @@ fn start_port(abar: usize, port_idx: u32) -> Option<Disk> { | |||
| 175 | let mut d = Disk { | 174 | let mut d = Disk { |
| 176 | port, | 175 | port, |
| 177 | clb, | 176 | clb, |
| 178 | fis, | ||
| 179 | ct, | 177 | ct, |
| 180 | buf, | 178 | buf, |
| 181 | sectors: 0, | 179 | sectors: 0, |
| @@ -389,8 +387,12 @@ fn issue(d: &Disk, cmd: u8, lba: u64, count: u32, write: bool) -> Result<(), ()> | |||
| 389 | Ok(()) | 387 | Ok(()) |
| 390 | } | 388 | } |
| 391 | 389 | ||
| 390 | fn disks() -> &'static mut [Option<Disk>; MAX_DISKS] { | ||
| 391 | unsafe { &mut *core::ptr::addr_of_mut!(DISKS) } | ||
| 392 | } | ||
| 393 | |||
| 392 | fn active() -> Option<&'static Disk> { | 394 | fn active() -> Option<&'static Disk> { |
| 393 | unsafe { DISKS.get(ACTIVE).and_then(|d| d.as_ref()) } | 395 | disks().get(unsafe { ACTIVE }).and_then(|d| d.as_ref()) |
| 394 | } | 396 | } |
| 395 | 397 | ||
| 396 | /// DMA `count` sectors starting at `lba` into the selected disk's buffer. | 398 | /// DMA `count` sectors starting at `lba` into the selected disk's buffer. |
