Skip to content

Commit 26903e1

Browse files
galibertcuavas
authored andcommitted
cdimono: reorder things a little
1 parent 1add0a6 commit 26903e1

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

src/mame/philips/cdi.h

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,30 @@ class cdi_state : public driver_device
4040
void cdi910(machine_config &config);
4141

4242
protected:
43-
virtual void machine_reset() override;
44-
45-
void cdimono1_mem(address_map &map);
46-
47-
required_device<scc68070_device> m_maincpu;
48-
required_region_ptr<uint16_t> m_main_rom;
49-
optional_device<screen_device> m_lcd;
50-
optional_device<cdislave_hle_device> m_slave_hle;
51-
5243
enum servo_portc_bit_t
5344
{
5445
INV_JUC_OUT = (1 << 2),
5546
INV_DIV4_IN = (1 << 5),
5647
INV_CADDYSWITCH_IN = (1 << 7)
5748
};
5849

50+
required_device<scc68070_device> m_maincpu;
51+
required_region_ptr<uint16_t> m_main_rom;
52+
optional_device<screen_device> m_lcd;
53+
optional_device<cdislave_hle_device> m_slave_hle;
54+
required_shared_ptr_array<uint16_t, 2> m_plane_ram;
55+
optional_device<m68hc05c8_device> m_servo;
56+
optional_device<m68hc05c8_device> m_slave;
57+
optional_device<cdicdic_device> m_cdic;
58+
required_device<cdrom_image_device> m_cdrom;
59+
required_device<mcd212_device> m_mcd212;
60+
61+
required_device_array<dmadac_sound_device, 2> m_dmadac;
62+
5963
uint32_t screen_update_cdimono1_lcd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
64+
virtual void machine_reset() override;
65+
66+
void cdimono1_mem(address_map &map);
6067

6168
void cdi910_mem(address_map &map);
6269
void cdimono2_mem(address_map &map);
@@ -72,15 +79,6 @@ class cdi_state : public driver_device
7279

7380
uint16_t bus_error_r(offs_t offset);
7481
void bus_error_w(offs_t offset, uint16_t data);
75-
76-
required_shared_ptr_array<uint16_t, 2> m_plane_ram;
77-
optional_device<m68hc05c8_device> m_servo;
78-
optional_device<m68hc05c8_device> m_slave;
79-
optional_device<cdicdic_device> m_cdic;
80-
required_device<cdrom_image_device> m_cdrom;
81-
required_device<mcd212_device> m_mcd212;
82-
83-
required_device_array<dmadac_sound_device, 2> m_dmadac;
8482
};
8583

8684
class quizard_state : public cdi_state, public device_serial_interface

0 commit comments

Comments
 (0)