summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus/neogeo/neogeo_intf.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/bus/neogeo/neogeo_intf.h')
-rw-r--r--src/emu/bus/neogeo/neogeo_intf.h70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/emu/bus/neogeo/neogeo_intf.h b/src/emu/bus/neogeo/neogeo_intf.h
index 07c60c12c54..eac0f4f5f3c 100644
--- a/src/emu/bus/neogeo/neogeo_intf.h
+++ b/src/emu/bus/neogeo/neogeo_intf.h
@@ -23,44 +23,44 @@ public:
virtual void decrypt_all(DECRYPT_ALL_PARAMS) { };
virtual int get_fixed_bank_type(void) { return 0; }
- void rom_alloc(UINT32 size) { if (m_rom == NULL) m_rom.resize(size/sizeof(UINT16)); }
- UINT16* get_rom_base() { return m_rom; }
- UINT32 get_rom_size() { return m_rom.bytes(); }
-
- void fixed_alloc(UINT32 size) { if (m_fixed == NULL) m_fixed.resize(size/sizeof(UINT8)); }
- UINT8* get_fixed_base() { return m_fixed; }
- UINT32 get_fixed_size() { return m_fixed.bytes(); }
-
- void audio_alloc(UINT32 size) { if (m_audio == NULL) m_audio.resize(size/sizeof(UINT8)); }
- UINT8* get_audio_base() { return m_audio; }
- UINT32 get_audio_size() { return m_audio.bytes(); }
-
- void audiocrypt_alloc(UINT32 size) { if (m_audiocrypt == NULL) m_audiocrypt.resize(size/sizeof(UINT8)); }
- UINT8* get_audiocrypt_base() { return m_audiocrypt; }
- UINT32 get_audiocrypt_size() { return m_audiocrypt.bytes(); }
-
- void sprites_alloc(UINT32 size) { if (m_sprites == NULL) m_sprites.resize(size/sizeof(UINT8)); }
- UINT8* get_sprites_base() { return m_sprites; }
- UINT32 get_sprites_size() { return m_sprites.bytes(); }
- UINT8* get_sprites_optimized() { return m_sprites_optimized; }
+ void rom_alloc(UINT32 size) { m_rom.resize(size/sizeof(UINT16)); }
+ UINT16* get_rom_base() { return &m_rom[0]; }
+ UINT32 get_rom_size() { return m_rom.size()*sizeof(UINT16); }
+
+ void fixed_alloc(UINT32 size) { m_fixed.resize(size); }
+ UINT8* get_fixed_base() { return &m_fixed[0]; }
+ UINT32 get_fixed_size() { return m_fixed.size(); }
+
+ void audio_alloc(UINT32 size) { m_audio.resize(size); }
+ UINT8* get_audio_base() { return &m_audio[0]; }
+ UINT32 get_audio_size() { return m_audio.size(); }
+
+ void audiocrypt_alloc(UINT32 size) { m_audiocrypt.resize(size); }
+ UINT8* get_audiocrypt_base() { return &m_audiocrypt[0]; }
+ UINT32 get_audiocrypt_size() { return m_audiocrypt.size(); }
+
+ void sprites_alloc(UINT32 size) { m_sprites.resize(size); }
+ UINT8* get_sprites_base() { return &m_sprites[0]; }
+ UINT32 get_sprites_size() { return m_sprites.size(); }
+ UINT8* get_sprites_optimized() { return &m_sprites_optimized[0]; }
UINT32 get_sprites_addrmask() { return m_sprite_gfx_address_mask; }
- dynamic_array<UINT8>& get_sprites_optimized_arr() { return m_sprites_optimized; }
+ std::vector<UINT8>& get_sprites_optimized_arr() { return m_sprites_optimized; }
- void ym_alloc(UINT32 size) { if (m_ym == NULL) m_ym.resize(size/sizeof(UINT8)); }
- UINT8* get_ym_base() { return m_ym; }
- UINT32 get_ym_size() { return m_ym.bytes(); }
+ void ym_alloc(UINT32 size) { m_ym.resize(size); }
+ UINT8* get_ym_base() { return &m_ym[0]; }
+ UINT32 get_ym_size() { return m_ym.size(); }
- void ymdelta_alloc(UINT32 size) { if (m_ymdelta == NULL) m_ymdelta.resize(size/sizeof(UINT8)); }
- UINT8* get_ymdelta_base() { return m_ymdelta; }
- UINT32 get_ymdelta_size() { return m_ymdelta.bytes(); }
+ void ymdelta_alloc(UINT32 size) { m_ymdelta.resize(size); }
+ UINT8* get_ymdelta_base() { return &m_ymdelta[0]; }
+ UINT32 get_ymdelta_size() { return m_ymdelta.size(); }
- dynamic_array<UINT16> m_rom;
- dynamic_array<UINT8> m_fixed;
- dynamic_array<UINT8> m_sprites;
- dynamic_array<UINT8> m_sprites_optimized;
- dynamic_array<UINT8> m_audio;
- dynamic_array<UINT8> m_ym;
- dynamic_array<UINT8> m_ymdelta;
+ std::vector<UINT16> m_rom;
+ std::vector<UINT8> m_fixed;
+ std::vector<UINT8> m_sprites;
+ std::vector<UINT8> m_sprites_optimized;
+ std::vector<UINT8> m_audio;
+ std::vector<UINT8> m_ym;
+ std::vector<UINT8> m_ymdelta;
UINT32 m_sprite_gfx_address_mask;
@@ -68,7 +68,7 @@ public:
protected:
// internal state
- dynamic_array<UINT8> m_audiocrypt;
+ std::vector<UINT8> m_audiocrypt;
};