diff options
author | 2021-12-14 21:38:14 -0500 | |
---|---|---|
committer | 2021-12-14 21:42:42 -0500 | |
commit | 1214aac0928e5c7ebe3484f06a5c9a000f9962ef (patch) | |
tree | 08e4ee14aa16c1fd721dfef0b9dc1eb28471eb8a /src/lib/formats/fs_vtech.h | |
parent | 8a8b56bc24a398f5bda13b0e24a56012a1252353 (diff) |
Filesystem code cleanup
- Eliminate dependencies on emu.h, replacing most fatalerror calls and floptool's ersatz emu_fatalerror class with standard exception classes
- Use range-based std::string constructors in some methods
- Move filesystem metadata handling to a separate source file
- Eliminate src/emu as an include path for libformats (necessitates kludge in ti99_dsk.cpp)
Diffstat (limited to 'src/lib/formats/fs_vtech.h')
-rw-r--r-- | src/lib/formats/fs_vtech.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/formats/fs_vtech.h b/src/lib/formats/fs_vtech.h index 0a73c15778d..d4f27b1c472 100644 --- a/src/lib/formats/fs_vtech.h +++ b/src/lib/formats/fs_vtech.h @@ -29,31 +29,31 @@ public: virtual file_t file_create(const fs_meta_data &info) override; virtual void file_delete(uint64_t key) override; - void update_file(u16 key, const u8 *entry); + void update_file(uint16_t key, const uint8_t *entry); private: impl &m_fs; - std::pair<fsblk_t::block_t, u32> get_dir_block(uint64_t key); + std::pair<fsblk_t::block_t, uint32_t> get_dir_block(uint64_t key); }; class file : public ifile_t { public: - file(impl &fs, root_dir *dir, const u8 *entry, u16 key); + file(impl &fs, root_dir *dir, const uint8_t *entry, uint16_t key); virtual ~file() = default; virtual void drop_weak_references() override; virtual fs_meta_data metadata() override; virtual void metadata_change(const fs_meta_data &info) override; - virtual std::vector<u8> read_all() override; - virtual void replace(const std::vector<u8> &data) override; + virtual std::vector<uint8_t> read_all() override; + virtual void replace(const std::vector<uint8_t> &data) override; private: impl &m_fs; root_dir *m_dir; - u16 m_key; - u8 m_entry[18]; + uint16_t m_key; + uint8_t m_entry[18]; }; impl(fsblk_t &blockdev); @@ -66,9 +66,9 @@ public: void drop_root_ref(); - std::vector<std::pair<u8, u8>> allocate_blocks(u32 count); - void free_blocks(const std::vector<std::pair<u8, u8>> &blocks); - u32 free_block_count(); + std::vector<std::pair<uint8_t, uint8_t>> allocate_blocks(uint32_t count); + void free_blocks(const std::vector<std::pair<uint8_t, uint8_t>> &blocks); + uint32_t free_block_count(); private: dir_t m_root; |