summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
commitbc0146c2038c46f789a246d5616afd7c425157f3 (patch)
treeb4d39194034b4c6e56ccd4035d25636034be43ca /src/lib/formats
parent91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff)
Eliminate ARRAY_LENGTH template in favor of C++17's std::size
* osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/ap2_dsk.cpp2
-rw-r--r--src/lib/formats/ap_dsk35.cpp22
-rw-r--r--src/lib/formats/cassimg.cpp4
-rw-r--r--src/lib/formats/cassimg.h1
-rw-r--r--src/lib/formats/flopimg.cpp2
-rw-r--r--src/lib/formats/p2000t_cas.cpp4
-rw-r--r--src/lib/formats/pc_dsk.cpp2
7 files changed, 19 insertions, 18 deletions
diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp
index 1a2e2a65e68..84b87a06e47 100644
--- a/src/lib/formats/ap2_dsk.cpp
+++ b/src/lib/formats/ap2_dsk.cpp
@@ -67,7 +67,7 @@ static const uint8_t *get_untranslate6_map(void)
if (!map_inited)
{
memset(map, 0xff, sizeof(map));
- for (i = 0; i < ARRAY_LENGTH(translate6); i++)
+ for (i = 0; i < std::size(translate6); i++)
map[translate6[i]] = i;
map_inited = 1;
}
diff --git a/src/lib/formats/ap_dsk35.cpp b/src/lib/formats/ap_dsk35.cpp
index 235d9f3d0c2..cecf105c189 100644
--- a/src/lib/formats/ap_dsk35.cpp
+++ b/src/lib/formats/ap_dsk35.cpp
@@ -225,7 +225,7 @@ int apple35_sectors_per_track(floppy_image_legacy *image, int track)
int sectors;
assert(track >= 0);
- assert(track < ARRAY_LENGTH(apple35_tracklen_800kb));
+ assert(track < std::size(apple35_tracklen_800kb));
if (get_apple35_tag(image)->is_1440k)
sectors = 18;
@@ -454,7 +454,7 @@ static uint32_t apple35_get_offset(floppy_image_legacy *floppy, int head, int tr
tag = get_apple35_tag(floppy);
- if (track >= ARRAY_LENGTH(apple35_tracklen_800kb))
+ if (track >= std::size(apple35_tracklen_800kb))
return ~0;
if (head >= tag->sides)
return ~0;
@@ -616,7 +616,7 @@ static floperr_t apple35_read_track(floppy_image_legacy *floppy, int head, int t
tag = get_apple35_tag(floppy);
- if (track >= ARRAY_LENGTH(apple35_tracklen_800kb))
+ if (track >= std::size(apple35_tracklen_800kb))
return FLOPPY_ERROR_SEEKERROR;
if (offset != 0)
return FLOPPY_ERROR_UNSUPPORTED;
@@ -628,7 +628,7 @@ static floperr_t apple35_read_track(floppy_image_legacy *floppy, int head, int t
for (sector = 0; sector < sector_count; sector++)
{
/* read the sector */
- err = apple35_read_sector_td(floppy, head, track, sector, sector_data, ARRAY_LENGTH(sector_data));
+ err = apple35_read_sector_td(floppy, head, track, sector, sector_data, std::size(sector_data));
if (err)
{
return err;
@@ -636,7 +636,7 @@ static floperr_t apple35_read_track(floppy_image_legacy *floppy, int head, int t
sony_nibblize35(sector_data, nibble_data, checksum);
- for (i = 0; i < ARRAY_LENGTH(blk1); i++)
+ for (i = 0; i < std::size(blk1); i++)
sony_filltrack((uint8_t*)buffer, buflen, &pos, blk1[i]);
sum = (track ^ sector ^ side ^ tag->format_byte) & 0x3F;
@@ -647,18 +647,18 @@ static floperr_t apple35_read_track(floppy_image_legacy *floppy, int head, int t
sony_filltrack((uint8_t*)buffer, buflen, &pos, diskbytes[tag->format_byte]);
sony_filltrack((uint8_t*)buffer, buflen, &pos, diskbytes[sum]);
- for (i = 0; i < ARRAY_LENGTH(blk2); i++)
+ for (i = 0; i < std::size(blk2); i++)
sony_filltrack((uint8_t*)buffer, buflen, &pos, blk2[i]);
sony_filltrack((uint8_t*)buffer, buflen, &pos, diskbytes[sector]);
- for (i = 0; i < ARRAY_LENGTH(nibble_data); i++)
+ for (i = 0; i < std::size(nibble_data); i++)
sony_filltrack((uint8_t*)buffer, buflen, &pos, diskbytes[nibble_data[i]]);
for (i = 3; i >= 0; i--)
sony_filltrack((uint8_t*)buffer, buflen, &pos, diskbytes[checksum[i]]);
- for (i = 0; i < ARRAY_LENGTH(blk3); i++)
+ for (i = 0; i < std::size(blk3); i++)
sony_filltrack((uint8_t*)buffer, buflen, &pos, blk3[i]);
}
@@ -681,7 +681,7 @@ static floperr_t apple35_write_track(floppy_image_legacy *floppy, int head, int
tag = get_apple35_tag(floppy);
- if (track >= ARRAY_LENGTH(apple35_tracklen_800kb))
+ if (track >= std::size(apple35_tracklen_800kb))
return FLOPPY_ERROR_SEEKERROR;
if (offset != 0)
return FLOPPY_ERROR_UNSUPPORTED;
@@ -756,7 +756,7 @@ static floperr_t apple35_write_track(floppy_image_legacy *floppy, int head, int
continue;
j++;
- for (i = 0; i < ARRAY_LENGTH(nibble_data); i++)
+ for (i = 0; i < std::size(nibble_data); i++)
{
nibble_data[i] = rev_diskbytes[sony_fetchtrack((uint8_t*)buffer, buflen, &pos)];
j++;
@@ -778,7 +778,7 @@ static floperr_t apple35_write_track(floppy_image_legacy *floppy, int head, int
sony_denibblize35(sector_data, nibble_data, checksum);
/* write the sector */
- err = apple35_write_sector_td(floppy, head, track, sector, sector_data, ARRAY_LENGTH(sector_data), 0);
+ err = apple35_write_sector_td(floppy, head, track, sector, sector_data, std::size(sector_data), 0);
if (err)
return err;
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index ee271abc8a7..527bfc884fb 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -94,12 +94,12 @@ const int8_t *choose_wave(const cassette_image::Modulation &modulation, size_t &
if (modulation.flags & cassette_image::MODULATION_SINEWAVE)
{
- wave_bytes_length = ARRAY_LENGTH(sine_wave);
+ wave_bytes_length = std::size(sine_wave);
return sine_wave;
}
else
{
- wave_bytes_length = ARRAY_LENGTH(square_wave);
+ wave_bytes_length = std::size(square_wave);
return square_wave;
}
}
diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
index 09f6aaa0099..3a59870571a 100644
--- a/src/lib/formats/cassimg.h
+++ b/src/lib/formats/cassimg.h
@@ -14,7 +14,6 @@
#include "ioprocs.h"
-#include "coretmpl.h"
#include "osdcore.h"
#include <memory>
diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp
index 9322551124b..cb8d6ca1300 100644
--- a/src/lib/formats/flopimg.cpp
+++ b/src/lib/formats/flopimg.cpp
@@ -876,7 +876,7 @@ const char *floppy_error(floperr_t err)
"Required parameter not specified"
};
- if ((err < 0) || (err >= ARRAY_LENGTH(error_messages)))
+ if ((err < 0) || (err >= std::size(error_messages)))
return nullptr;
return error_messages[err];
}
diff --git a/src/lib/formats/p2000t_cas.cpp b/src/lib/formats/p2000t_cas.cpp
index 7bc0c6b21a9..de6652d41ad 100644
--- a/src/lib/formats/p2000t_cas.cpp
+++ b/src/lib/formats/p2000t_cas.cpp
@@ -3,6 +3,8 @@
#include "p2000t_cas.h"
+#include "coretmpl.h" // BIT
+
#include <cassert>
#include <ostream>
@@ -294,7 +296,7 @@ static cassette_image::error p2000t_cas_load(cassette_image *cassette)
// Insert sync header.. 0xAA, 0x00, 0x00, 0xAA
CHR(p2000t_silence(cassette, &time_idx, P2000_BOB_GAP));
- CHR(p2000t_put_bytes(cassette, &time_idx, &unused, BLOCK_MARK, ARRAY_LENGTH(BLOCK_MARK)));
+ CHR(p2000t_put_bytes(cassette, &time_idx, &unused, BLOCK_MARK, std::size(BLOCK_MARK)));
CHR(p2000t_silence(cassette, &time_idx, P2000_MARK_GAP));
// Insert data block
diff --git a/src/lib/formats/pc_dsk.cpp b/src/lib/formats/pc_dsk.cpp
index 75e05f87654..ef9efce3bf3 100644
--- a/src/lib/formats/pc_dsk.cpp
+++ b/src/lib/formats/pc_dsk.cpp
@@ -48,7 +48,7 @@ static floperr_t pc_dsk_compute_geometry(floppy_image_legacy *floppy, struct bas
memset(geometry, 0, sizeof(*geometry));
size = floppy_image_size(floppy);
- for (i = 0; i < ARRAY_LENGTH(disk_sizes); i++)
+ for (i = 0; i < std::size(disk_sizes); i++)
{
if (disk_sizes[i].image_size == size)
{