Previous 199869 Revisions Next

r23595 Monday 10th June, 2013 at 13:45:13 UTC by Curt Coder
Cleanup. (nw)
[src/emu]memory.h
[src/mess/drivers]abc80x.c c900.c portfoli.c tdv2324.c tek410x.c tiki100.c
[src/mess/includes]cosmicos.h eti660.h ql.h studio2.h tdv2324.h tmc2000e.h xerox820.h
[src/mess/machine]ep64_exdos.c isa_wdxt_gen.c wangpckb.c

trunk/src/emu/memory.h
r23594r23595
946946#define READ64_DELEGATE(_class, _member)               read64_delegate(FUNC(_class::_member), this)
947947#define WRITE64_DELEGATE(_class, _member)               write64_delegate(FUNC(_class::_member), this)
948948
949#define READ8_DEVICE_DELEGATE(_class, _device, _member)      read8_delegate(FUNC(_class::_member), (_class *)_device)
950#define WRITE8_DEVICE_DELEGATE(_class, _device, _member)   write8_delegate(FUNC(_class::_member), (_class *)_device)
951#define READ16_DEVICE_DELEGATE(_class, _device, _member)   read16_delegate(FUNC(_class::_member), (_class *)_device)
952#define WRITE16_DEVICE_DELEGATE(_class, _device, _member)   write16_delegate(FUNC(_class::_member), (_class *)_device)
953#define READ32_DEVICE_DELEGATE(_class, _device, _member)   read32_delegate(FUNC(_class::_member), (_class *)_device)
954#define WRITE32_DEVICE_DELEGATE(_class, _device, _member)   write32_delegate(FUNC(_class::_member), (_class *)_device)
955#define READ64_DEVICE_DELEGATE(_class, _device, _member)   read64_delegate(FUNC(_class::_member), (_class *)_device)
956#define WRITE64_DEVICE_DELEGATE(_class, _device, _member)   write64_delegate(FUNC(_class::_member), (_class *)_device)
949#define READ8_DEVICE_DELEGATE(_device, _class, _member)      read8_delegate(FUNC(_class::_member), (_class *)_device)
950#define WRITE8_DEVICE_DELEGATE(_device, _class, _member)   write8_delegate(FUNC(_class::_member), (_class *)_device)
951#define READ16_DEVICE_DELEGATE(_device, _class, _member)   read16_delegate(FUNC(_class::_member), (_class *)_device)
952#define WRITE16_DEVICE_DELEGATE(_device, _class, _member)   write16_delegate(FUNC(_class::_member), (_class *)_device)
953#define READ32_DEVICE_DELEGATE(_device, _class, _member)   read32_delegate(FUNC(_class::_member), (_class *)_device)
954#define WRITE32_DEVICE_DELEGATE(_device, _class, _member)   write32_delegate(FUNC(_class::_member), (_class *)_device)
955#define READ64_DEVICE_DELEGATE(_device, _class, _member)   read64_delegate(FUNC(_class::_member), (_class *)_device)
956#define WRITE64_DEVICE_DELEGATE(_device, _class, _member)   write64_delegate(FUNC(_class::_member), (_class *)_device)
957957
958958
959959// helper macro for merging data with the memory mask
trunk/src/mess/machine/wangpckb.c
r23594r23595
413413void wangpc_keyboard_device::device_start()
414414{
415415   // set serial callbacks
416   i8051_set_serial_tx_callback(m_maincpu, write8_delegate(FUNC(wangpc_keyboard_device::mcs51_tx_callback),this));
417   i8051_set_serial_rx_callback(m_maincpu, read8_delegate(FUNC(wangpc_keyboard_device::mcs51_rx_callback),this));
416   i8051_set_serial_tx_callback(m_maincpu, WRITE8_DELEGATE(wangpc_keyboard_device, mcs51_tx_callback));
417   i8051_set_serial_rx_callback(m_maincpu, READ8_DELEGATE(wangpc_keyboard_device, mcs51_rx_callback));
418418   set_data_frame(8, 2, SERIAL_PARITY_NONE);
419419}
420420
trunk/src/mess/machine/isa_wdxt_gen.c
r23594r23595
229229{
230230   set_isa_device();
231231   m_isa->install_rom(this, 0xc8000, 0xc9fff, 0, 0, "hdc", "hdc");
232   m_isa->install_device(0x0320, 0x0323, 0, 0, read8_delegate(FUNC(wd11c00_17_device::io_r), (wd11c00_17_device*)m_host), write8_delegate(FUNC(wd11c00_17_device::io_w), (wd11c00_17_device*)m_host));
232   m_isa->install_device(0x0320, 0x0323, 0, 0, READ8_DEVICE_DELEGATE(m_host, wd11c00_17_device, io_r), WRITE8_DEVICE_DELEGATE(m_host, wd11c00_17_device, io_w));
233233   m_isa->set_dma_channel(3, this, FALSE);
234234}
235235
trunk/src/mess/machine/ep64_exdos.c
r23594r23595
154154{
155155   m_slot->program().install_rom(0x080000, 0x087fff, 0, 0, m_rom->base());
156156
157   m_slot->io().install_readwrite_handler(0x10, 0x13, 0, 0x04, READ8_DEVICE_DELEGATE(wd_fdc_t, m_fdc, read), WRITE8_DEVICE_DELEGATE(wd_fdc_t, m_fdc, write));
157   m_slot->io().install_readwrite_handler(0x10, 0x13, 0, 0x04, READ8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, read), WRITE8_DEVICE_DELEGATE(m_fdc, wd_fdc_t, write));
158158   m_slot->io().install_readwrite_handler(0x18, 0x18, 0, 0x04, READ8_DELEGATE(ep64_exdos_device, read), WRITE8_DELEGATE(ep64_exdos_device, write));
159159}
160160
trunk/src/mess/includes/tdv2324.h
r23594r23595
6868   required_device<tms9927_device> m_tms;
6969
7070   virtual void video_start();
71   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
71   UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
7272
7373   DECLARE_READ8_MEMBER( tdv2324_main_io_30 );
7474   DECLARE_READ8_MEMBER( tdv2324_main_io_e6 );
trunk/src/mess/includes/eti660.h
r23594r23595
4949   required_ioport m_pa3;
5050   required_ioport m_special;
5151
52   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
53
5452   DECLARE_READ8_MEMBER( pia_r );
5553   DECLARE_WRITE8_MEMBER( pia_w );
5654   DECLARE_WRITE8_MEMBER( colorram_w );
trunk/src/mess/includes/ql.h
r23594r23595
121121   virtual void machine_start();
122122   virtual void machine_reset();
123123
124   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
125
126124   DECLARE_WRITE8_MEMBER( ipc_w );
127125   DECLARE_WRITE8_MEMBER( ipc_port1_w );
128126   DECLARE_WRITE8_MEMBER( ipc_port2_w );
trunk/src/mess/includes/tmc2000e.h
r23594r23595
5454   virtual void machine_start();
5555   virtual void machine_reset();
5656
57   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
58
5957   DECLARE_READ8_MEMBER( vismac_r );
6058   DECLARE_WRITE8_MEMBER( vismac_w );
6159   DECLARE_READ8_MEMBER( floppy_r );
trunk/src/mess/includes/xerox820.h
r23594r23595
8989   DECLARE_WRITE_LINE_MEMBER( drq_w );
9090   DECLARE_WRITE8_MEMBER( kbd_w );
9191   DECLARE_WRITE_LINE_MEMBER( fr_w );
92   DECLARE_WRITE_LINE_MEMBER( ft_w );
9392
9493   void bankswitch(int bank);
9594   void update_nmi();
trunk/src/mess/includes/cosmicos.h
r23594r23595
7676   virtual void machine_start();
7777   virtual void machine_reset();
7878
79   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
80
8179   DECLARE_READ8_MEMBER( video_off_r );
8280   DECLARE_READ8_MEMBER( video_on_r );
8381   DECLARE_WRITE8_MEMBER( audio_latch_w );
trunk/src/mess/includes/studio2.h
r23594r23595
4545   virtual void machine_start();
4646   virtual void machine_reset();
4747
48   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
49
5048   DECLARE_READ8_MEMBER( dispon_r );
5149   DECLARE_WRITE8_MEMBER( keylatch_w );
5250   DECLARE_WRITE8_MEMBER( dispon_w );
r23594r23595
9290
9391   virtual void machine_reset();
9492
95   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
96
9793   DECLARE_WRITE8_MEMBER( dma_w );
9894   DECLARE_READ_LINE_MEMBER( rdata_r );
9995   DECLARE_READ_LINE_MEMBER( bdata_r );
trunk/src/mess/drivers/portfoli.c
r23594r23595
865865   switch (m_pid)
866866   {
867867   case PID_SERIAL:
868      io.install_readwrite_handler(0x8070, 0x8077, read8_delegate(FUNC(ins8250_device::ins8250_r), (ins8250_device*)m_uart), write8_delegate(FUNC(ins8250_device::ins8250_w), (ins8250_device*)m_uart));
868      io.install_readwrite_handler(0x8070, 0x8077, READ8_DEVICE_DELEGATE(m_uart, ins8250_device, ins8250_r), WRITE8_DEVICE_DELEGATE(m_uart, ins8250_device, ins8250_w));
869869      break;
870870
871871   case PID_PARALLEL:
872      io.install_readwrite_handler(0x8078, 0x807b, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
872      io.install_readwrite_handler(0x8078, 0x807b, READ8_DEVICE_DELEGATE(m_ppi, i8255_device, read), WRITE8_DEVICE_DELEGATE(m_ppi, i8255_device, write));
873873      break;
874874   }
875875}
trunk/src/mess/drivers/abc80x.c
r23594r23595
315315
316316               program.install_read_bank(0x7000, 0x77ff, bank_name);
317317               program.unmap_write(0x7000, 0x77ff);
318               program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r),this), write8_delegate(FUNC(abc806_state::charram_w),this));
318               program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, READ8_DELEGATE(abc806_state, charram_r), WRITE8_DELEGATE(abc806_state, charram_w));
319319               membank(bank_name)->set_entry(0);
320320               break;
321321
r23594r23595
350350         if (start_addr == 0x7000)
351351         {
352352            program.install_readwrite_bank(0x7000, 0x77ff, bank_name);
353            program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r), this), write8_delegate(FUNC(abc806_state::charram_w), this));
353            program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, READ8_DELEGATE(abc806_state, charram_r), WRITE8_DELEGATE(abc806_state, charram_w));
354354         }
355355         else
356356         {
trunk/src/mess/drivers/tiki100.c
r23594r23595
5454      else
5555      {
5656         /* GFXRAM, GFXRAM, RAM */
57         program.install_readwrite_handler(0x0000, 0x7fff, read8_delegate(FUNC(tiki100_state::gfxram_r), this), write8_delegate(FUNC(tiki100_state::gfxram_w), this));
57         program.install_readwrite_handler(0x0000, 0x7fff, READ8_DELEGATE(tiki100_state, gfxram_r), WRITE8_DELEGATE(tiki100_state, gfxram_w));
5858         program.install_readwrite_bank(0x8000, 0xffff, "bank3");
5959
6060         membank("bank1")->set_entry(BANK_VIDEO_RAM);
trunk/src/mess/drivers/tdv2324.c
r23594r23595
230230//  SCREEN_UPDATE_IND16( tdv2324 )
231231//-------------------------------------------------
232232
233UINT32 tdv2324_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
233UINT32 tdv2324_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
234234{
235235   return 0;
236236}
trunk/src/mess/drivers/c900.c
r23594r23595
1919      : driver_device(mconfig, type, tag) ,
2020      m_maincpu(*this, "maincpu") { }
2121
22   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
22   UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
2323   required_device<cpu_device> m_maincpu;
2424};
2525
r23594r23595
3333static INPUT_PORTS_START( c900 )
3434INPUT_PORTS_END
3535
36UINT32 c900_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
36UINT32 c900_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
3737{
3838   return 0;
3939}
trunk/src/mess/drivers/tek410x.c
r23594r23595
3030   virtual void machine_start();
3131
3232   virtual void video_start();
33   UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
33   UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
3434};
3535
3636/* Memory Maps */
r23594r23595
5454{
5555}
5656
57UINT32 tek4107a_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
57UINT32 tek4107a_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
5858{
5959   return 0;
6060}

Previous 199869 Revisions Next

© 1997-2024 The MAME Team