diff options
author | 2012-02-16 09:47:18 +0000 | |
---|---|---|
committer | 2012-02-16 09:47:18 +0000 | |
commit | f0823886a66100e193d6eeb0402eb872a67fa07d (patch) | |
tree | a68b35942d63e5fcaf2311812dba976ad18cd5b6 /src/lib/util/harddisk.c | |
parent | e6dad3759374373e3ce69a76869f16e83ba74df5 (diff) |
Major CHD/chdman update. The CHD version number has been increased
from 4 to 5. This means any diff CHDs will no longer work. If you
absolutely need to keep the data for any existing ones you have,
find both the diff CHD and the original CHD for the game in question
and upgrade using these commands:
rename diff\game.dif diff\game-old.dif
chdman copy -i diff\game-old.dif -ip roms\game.chd -o diff\game.dif -op roms\game.chd -c none
Specifics regarding this change:
Defined a new CHD version 5. New features/behaviors of this version:
- support for up to 4 codecs; each block can use 1 of the 4
- new LZMA codec, which tends to do better than zlib overall
- new FLAC codec, primarily used for CDs (but can be applied anywhere)
- upgraded AVHuff codec now uses FLAC for encoding audio
- new Huffman codec, used to catch more nearly-uncompressable blocks
- compressed CHDs now use a compressed map for significant savings
- CHDs now are aware of a "unit" size; each hunk holds 1 or more units
(in general units map to sectors for hard disks/CDs)
- diff'ing against a parent now diffs at the unit level, greatly
improving compression
Rewrote and modernized chd.c. CHD versions prior to 3 are unsupported,
and version 3/4 CHDs are only supported for reading. Creating a new
CHD now leaves the file open. Added methods to read and write at the
unit and byte level, removing the need to handle this manually. Added
metadata access methods that pass astrings and dynamic_buffers to
simplify the interfaces. A companion class chd_compressor now
implements full multithreaded compression, analyzing and compressing
multiple hunks independently in parallel. Split the codec
implementations out into a separate file chdcodec.*
Updated harddisk.c and cdrom.c to rely on the caching/byte-level read/
write capabilities of the chd_file class. cdrom.c (and chdman) now also
pad CDs to 4-frame boundaries instead of hunk boundaries, ensuring that
the same SHA1 hashes are produced regardless of the hunk size.
Rewrote chdman.exe entirely, switching from positional parameters to
proper options. Use "chdman help" to get a list of commands, and
"chdman help <command>" to get help for any particular command. Many
redundant commands were removed now that additional flexibility is
available. Some basic mappings:
Old: chdman -createblankhd <out.chd> <cyls> <heads> <secs>
New: chdman createhd -o <out.chd> -chs <cyls>,<heads>,<secs>
Old: chdman -createuncomphd <in.raw> <out.chd> ....
New: chdman createhd -i <in.raw> -o <out.chd> -c none ....
Old: chdman -verifyfix <in.chd>
New: chdman verify -i <in.chd> -f
Old: chdman -merge <parent.chd> <diff.chd> <out.chd>
New: chdman copy -i <diff.chd> -ip <parent.chd> -o <out.chd>
Old: chdman -diff <parent.chd> <compare.chd> <diff.chd>
New: chdman copy -i <compare.chd> -o <diff.chd> -op <parent.chd>
Old: chdman -update <in.chd> <out.chd>
New: chdman copy -i <in.chd> -o <out.chd>
Added new core file coretmpl.h to hold core template classes. For now
just one class, dynamic_array<> is defined, which acts like an array
of a given object but which can be appended to and/or resized. Also
defines dynamic_buffer as dynamic_array<UINT8> for holding an
arbitrary buffer of bytes. Expect to see these used a lot.
Added new core helper hashing.c/.h which defines classes for each of
the common hashing methods and creator classes to wrap the
computation of these hashes. A future work item is to reimplement
the core emulator hashing code using these.
Split bit buffer helpers out into C++ classes and into their own
public header in bitstream.h.
Updated huffman.c/.h to C++, and changed the interface to make it
more flexible to use in nonstandard ways. Also added huffman compression
of the static tree for slightly better compression rates.
Created flac.c/.h as simplified C++ wrappers around the FLAC interface.
A future work item is to convert the samples sound device to a modern
device and leverage this for reading FLAC files.
Renamed avcomp.* to avhuff.*, updated to C++, and added support for
FLAC as the audio encoding mechanism. The old huffman audio is still
supported for decode only.
Added a variant of core_fload that loads to a dynamic_buffer.
Tweaked winwork.c a bit to not limit the maximum number of processors
unless the work queue was created with the WORK_QUEUE_FLAG_HIGH_FREQ
option. Further adjustments here are likely going to be necessary.
Fixed bug in aviio.c which caused errors when reading some AVI files.
Diffstat (limited to 'src/lib/util/harddisk.c')
-rw-r--r-- | src/lib/util/harddisk.c | 61 |
1 files changed, 7 insertions, 54 deletions
diff --git a/src/lib/util/harddisk.c b/src/lib/util/harddisk.c index ffae861a6d4..64af494405a 100644 --- a/src/lib/util/harddisk.c +++ b/src/lib/util/harddisk.c @@ -46,13 +46,10 @@ TYPE DEFINITIONS ***************************************************************************/ -struct _hard_disk_file +struct hard_disk_file { chd_file * chd; /* CHD file */ hard_disk_info info; /* hard disk info */ - UINT32 hunksectors; /* sectors per hunk */ - UINT32 cachehunk; /* which hunk is cached */ - UINT8 * cache; /* cache of the current hunk */ }; @@ -70,7 +67,7 @@ hard_disk_file *hard_disk_open(chd_file *chd) { int cylinders, heads, sectors, sectorbytes; hard_disk_file *file; - char metadata[256]; + astring metadata; chd_error err; /* punt if no CHD */ @@ -78,7 +75,7 @@ hard_disk_file *hard_disk_open(chd_file *chd) return NULL; /* read the hard disk metadata */ - err = chd_get_metadata(chd, HARD_DISK_METADATA_TAG, 0, metadata, sizeof(metadata), NULL, NULL, NULL); + err = chd->read_metadata(HARD_DISK_METADATA_TAG, 0, metadata); if (err != CHDERR_NONE) return NULL; @@ -97,17 +94,6 @@ hard_disk_file *hard_disk_open(chd_file *chd) file->info.heads = heads; file->info.sectors = sectors; file->info.sectorbytes = sectorbytes; - file->hunksectors = chd_get_header(chd)->hunkbytes / file->info.sectorbytes; - file->cachehunk = -1; - - /* allocate a cache */ - file->cache = (UINT8 *)malloc(chd_get_header(chd)->hunkbytes); - if (file->cache == NULL) - { - free(file); - return NULL; - } - return file; } @@ -118,9 +104,6 @@ hard_disk_file *hard_disk_open(chd_file *chd) void hard_disk_close(hard_disk_file *file) { - /* free the cache */ - if (file->cache != NULL) - free(file->cache); free(file); } @@ -154,21 +137,8 @@ hard_disk_info *hard_disk_get_info(hard_disk_file *file) UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer) { - UINT32 hunknum = lbasector / file->hunksectors; - UINT32 sectoroffs = lbasector % file->hunksectors; - - /* if we haven't cached this hunk, read it now */ - if (file->cachehunk != hunknum) - { - chd_error err = chd_read(file->chd, hunknum, file->cache); - if (err != CHDERR_NONE) - return 0; - file->cachehunk = hunknum; - } - - /* copy out the requested sector */ - memcpy(buffer, &file->cache[sectoroffs * file->info.sectorbytes], file->info.sectorbytes); - return 1; + chd_error err = file->chd->read_units(lbasector, buffer); + return (err == CHDERR_NONE); } @@ -179,23 +149,6 @@ UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer) UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer) { - UINT32 hunknum = lbasector / file->hunksectors; - UINT32 sectoroffs = lbasector % file->hunksectors; - chd_error err; - - /* if we haven't cached this hunk, read it now */ - if (file->cachehunk != hunknum) - { - err = chd_read(file->chd, hunknum, file->cache); - if (err != CHDERR_NONE) - return 0; - file->cachehunk = hunknum; - } - - /* copy in the requested data */ - memcpy(&file->cache[sectoroffs * file->info.sectorbytes], buffer, file->info.sectorbytes); - - /* write it back out */ - err = chd_write(file->chd, hunknum, file->cache); - return (err == CHDERR_NONE) ? 1 : 0; + chd_error err = file->chd->write_units(lbasector, buffer); + return (err == CHDERR_NONE); } |