summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/acorn_dsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/acorn_dsk.cpp')
-rw-r--r--src/lib/formats/acorn_dsk.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp
index 2f9f5ebf7ab..c4668478b05 100644
--- a/src/lib/formats/acorn_dsk.cpp
+++ b/src/lib/formats/acorn_dsk.cpp
@@ -29,7 +29,7 @@ const char *acorn_ssd_format::extensions() const
return "ssd,bbc,img";
}
-int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t cat[8];
uint32_t sectors0, sectors2;
@@ -95,7 +95,7 @@ int acorn_ssd_format::find_size(io_generic *io, uint32_t form_factor)
int acorn_ssd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if(type != -1)
return 90;
@@ -171,7 +171,7 @@ const char *acorn_dsd_format::extensions() const
return "dsd";
}
-int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t cat[8];
uint32_t sectors0, sectors2;
@@ -218,7 +218,7 @@ int acorn_dsd_format::find_size(io_generic *io, uint32_t form_factor)
int acorn_dsd_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if (type != -1)
return 90;
@@ -274,7 +274,7 @@ const char *opus_ddos_format::extensions() const
return "dds";
}
-int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor)
+int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t cat[8];
uint32_t sectors0, sectors2;
@@ -313,7 +313,7 @@ int opus_ddos_format::find_size(io_generic *io, uint32_t form_factor)
int opus_ddos_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if (type != -1)
return 90;
@@ -369,7 +369,7 @@ const char *acorn_adfs_old_format::extensions() const
return "adf,ads,adm,adl";
}
-int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t map[3];
uint32_t sectors;
@@ -401,7 +401,7 @@ int acorn_adfs_old_format::find_size(io_generic *io, uint32_t form_factor)
int acorn_adfs_old_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if(type != -1)
return 100;
@@ -465,7 +465,7 @@ const char *acorn_adfs_new_format::extensions() const
return "adf";
}
-int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t dform[4];
uint8_t eform[4];
@@ -498,7 +498,7 @@ int acorn_adfs_new_format::find_size(io_generic *io, uint32_t form_factor)
int acorn_adfs_new_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if (type != -1)
return 100;
@@ -546,7 +546,7 @@ const char *acorn_dos_format::extensions() const
return "img";
}
-int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor)
+int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
uint8_t type;
@@ -569,7 +569,7 @@ int acorn_dos_format::find_size(io_generic *io, uint32_t form_factor)
int acorn_dos_format::identify(io_generic *io, uint32_t form_factor, const std::vector<uint32_t> &variants)
{
- int type = find_size(io, form_factor);
+ int type = find_size(io, form_factor, variants);
if(type != -1)
return 90;