From 18bcc8e83cfa17cf8bed24f3413eab80ce0cc885 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 13 Feb 2018 19:10:43 +0100 Subject: [PATCH] move some cpu internal memmaps from public to protected (nw) --- src/devices/cpu/e0c6200/e0c6s46.h | 5 +++-- src/devices/cpu/hmcs40/hmcs40.h | 10 ++++++---- src/devices/cpu/melps4/m58846.h | 5 +++-- src/devices/cpu/ucom4/ucom4.h | 10 ++++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/devices/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h index f9fa3e25575..d6e35ab2fbf 100644 --- a/src/devices/cpu/e0c6200/e0c6s46.h +++ b/src/devices/cpu/e0c6200/e0c6s46.h @@ -92,8 +92,6 @@ public: u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void e0c6s46_data(address_map &map); - void e0c6s46_program(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -105,6 +103,9 @@ protected: virtual void execute_one() override; virtual bool check_interrupt() override; + void e0c6s46_data(address_map &map); + void e0c6s46_program(address_map &map); + private: required_shared_ptr m_vram1; required_shared_ptr m_vram2; diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index 830f5c458ba..c91b2a99102 100644 --- a/src/devices/cpu/hmcs40/hmcs40.h +++ b/src/devices/cpu/hmcs40/hmcs40.h @@ -127,10 +127,6 @@ public: template static devcb_base &set_read_d_callback(device_t &device, Object &&cb) { return downcast(device).m_read_d.set_callback(std::forward(cb)); } template static devcb_base &set_write_d_callback(device_t &device, Object &&cb) { return downcast(device).m_write_d.set_callback(std::forward(cb)); } - void data_160x4(address_map &map); - void data_80x4(address_map &map); - void program_1k(address_map &map); - void program_2k(address_map &map); protected: enum { @@ -165,6 +161,12 @@ protected: virtual util::disasm_interface *create_disassembler() override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; + // memorymaps + void program_1k(address_map &map); + void program_2k(address_map &map); + void data_160x4(address_map &map); + void data_80x4(address_map &map); + address_space_config m_program_config; address_space_config m_data_config; address_space *m_program; diff --git a/src/devices/cpu/melps4/m58846.h b/src/devices/cpu/melps4/m58846.h index 45f1809bfce..63ead8d7a60 100644 --- a/src/devices/cpu/melps4/m58846.h +++ b/src/devices/cpu/melps4/m58846.h @@ -21,8 +21,6 @@ class m58846_device : public melps4_cpu_device public: m58846_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void data_128x4(address_map &map); - void program_2kx9(address_map &map); protected: // device-level overrides virtual void device_start() override; @@ -35,6 +33,9 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void write_v(uint8_t data) override; + void data_128x4(address_map &map); + void program_2kx9(address_map &map); + emu_timer *m_timer; void reset_timer(); }; diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h index 5a30c19f72e..3dcadb11e26 100644 --- a/src/devices/cpu/ucom4/ucom4.h +++ b/src/devices/cpu/ucom4/ucom4.h @@ -113,10 +113,6 @@ public: template static devcb_base &set_write_h_callback(device_t &device, Object &&cb) { return downcast(device).m_write_h.set_callback(std::forward(cb)); } template static devcb_base &set_write_i_callback(device_t &device, Object &&cb) { return downcast(device).m_write_i.set_callback(std::forward(cb)); } - void data_64x4(address_map &map); - void data_96x4(address_map &map); - void program_1k(address_map &map); - void program_2k(address_map &map); protected: // construction/destruction ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data); @@ -143,6 +139,12 @@ protected: // device_state_interface overrides virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; + // memorymaps + void program_1k(address_map &map); + void program_2k(address_map &map); + void data_64x4(address_map &map); + void data_96x4(address_map &map); + address_space_config m_program_config; address_space_config m_data_config; address_space *m_program;