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/vt.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/vt.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rsnix/src/vt.rs b/rsnix/src/vt.rs index 59378f3..2cfb0f3 100644 --- a/rsnix/src/vt.rs +++ b/rsnix/src/vt.rs | |||
| @@ -146,8 +146,8 @@ fn cell(r: usize, c: usize) -> &'static mut Cell { | |||
| 146 | &mut cells()[idx(r, c)] | 146 | &mut cells()[idx(r, c)] |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | fn rendered(r: usize, c: usize) -> &'static mut Cell { | 149 | fn params() -> &'static mut [usize; 4] { |
| 150 | &mut rendered_cells()[idx(r, c)] | 150 | unsafe { &mut *core::ptr::addr_of_mut!(PARAMS) } |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | fn put_cell(r: usize, c: usize, ch: u16) { | 153 | fn put_cell(r: usize, c: usize, ch: u16) { |
| @@ -204,14 +204,14 @@ fn put_byte(b: u8) { | |||
| 204 | CUR = CUR.saturating_mul(10).saturating_add((b - b'0') as usize); | 204 | CUR = CUR.saturating_mul(10).saturating_add((b - b'0') as usize); |
| 205 | } | 205 | } |
| 206 | b';' => { | 206 | b';' => { |
| 207 | if NPARAMS < PARAMS.len() { | 207 | if NPARAMS < params().len() { |
| 208 | PARAMS[NPARAMS] = CUR; | 208 | PARAMS[NPARAMS] = CUR; |
| 209 | NPARAMS += 1; | 209 | NPARAMS += 1; |
| 210 | } | 210 | } |
| 211 | CUR = 0; | 211 | CUR = 0; |
| 212 | } | 212 | } |
| 213 | _ => { | 213 | _ => { |
| 214 | if NPARAMS < PARAMS.len() { | 214 | if NPARAMS < params().len() { |
| 215 | PARAMS[NPARAMS] = CUR; | 215 | PARAMS[NPARAMS] = CUR; |
| 216 | NPARAMS += 1; | 216 | NPARAMS += 1; |
| 217 | } | 217 | } |
