add span type

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/nes/sys/cartridge.cc b/lib/nes/sys/cartridge.cc
index fcb7e84..14fff3d 100644
--- a/lib/nes/sys/cartridge.cc
+++ b/lib/nes/sys/cartridge.cc
@@ -5,15 +5,13 @@
 
 namespace nes::sys
 {
-	cartridge::cartridge(u8 const* data, u32 const length)
+	cartridge::cartridge(span<u8 const> const data)
 	{
 		// See: https://www.nesdev.org/wiki/INES
 
-		auto const bytes = static_cast<u8 const*>(data);
-
 		// Parse header.
-		if (length < header_length) { return; }
-		auto const h = header{ bytes };
+		if (data.get_length() < header_length) { return; }
+		auto const h = header{ data.subspan<header_length>(0) };
 		if (h.get_magic_0() != 'N' || h.get_magic_1() != 'E' || h.get_magic_2() != 'S' || h.get_magic_3() != 0x1A)
 		{
 			return;
@@ -28,16 +26,16 @@ namespace nes::sys
 		if (h.get_has_trainer()) { offset += 512; }
 
 		prg_rom_size_ = h.get_prg_rom_banks() * prg_rom_bank_size;
-		if (length < offset + prg_rom_size_) { return; }
+		if (data.get_length() < offset + prg_rom_size_) { return; }
 		if (prg_rom_size_ > max_prg_rom_size) { return; }
-		std::copy_n(&bytes[offset], prg_rom_size_, prg_rom_);
+		std::copy_n(&data[offset], prg_rom_size_, prg_rom_);
 
 		offset += prg_rom_size_;
 
 		chr_rom_size_ = h.get_chr_rom_banks() * chr_rom_bank_size;
-		if (length < offset + chr_rom_size_) { return; }
+		if (data.get_length() < offset + chr_rom_size_) { return; }
 		if (chr_rom_size_ > max_chr_rom_size) { return; }
-		std::copy_n(&bytes[offset], chr_rom_size_, chr_rom_);
+		std::copy_n(&data[offset], chr_rom_size_, chr_rom_);
 
 		ram_size_ = std::max(h.get_ram_banks(), 1u) * ram_bank_size;
 		if (ram_size_ > max_ram_size) { return; }