46
46
#include " machine/z80sio.h"
47
47
48
48
// Debugging
49
- #undef VERBOSE
50
- #define VERBOSE 0
49
+ // #define VERBOSE 1
51
50
#include " logmacro.h"
52
51
53
52
namespace {
@@ -154,7 +153,7 @@ class base_98628_9_device :
154
153
bool m_rt_in;
155
154
uint8_t m_modem_ctrl;
156
155
uint8_t m_modem_status;
157
- uint8_t m_low_ram[ LOW_RAM_SIZE ];
156
+ uint8_t m_low_ram[LOW_RAM_SIZE];
158
157
};
159
158
160
159
base_98628_9_device::base_98628_9_device (const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
@@ -385,14 +384,16 @@ void base_98628_9_device::cpu_io_mem_map(address_map &map)
385
384
386
385
void base_98628_9_device::install_68k_map (offs_t base_addr)
387
386
{
388
- dio ().install_memory (0x0000 + base_addr,
389
- 0x0007 + base_addr,
390
- read16sm_delegate (*this , [this ](offs_t addr) { return reg_r (addr); }, " " ),
391
- write16sm_delegate (*this , [this ](offs_t addr, uint16_t data) { reg_w (addr, uint8_t (data)); }, " " ));
392
- dio ().install_memory (0x4000 + base_addr,
393
- 0x7fff + base_addr,
394
- read16sm_delegate (*this , FUNC (base_98628_9_device::low_ram_r_68k)),
395
- write16sm_delegate (*this , FUNC (base_98628_9_device::low_ram_w_68k)));
387
+ dio ().install_memory (
388
+ 0x0000 + base_addr,
389
+ 0x0007 + base_addr,
390
+ read16sm_delegate (*this , NAME ([this ] (offs_t addr) { return reg_r (addr); })),
391
+ write16sm_delegate (*this , NAME ([this ] (offs_t addr, uint16_t data) { reg_w (addr, uint8_t (data)); })));
392
+ dio ().install_memory (
393
+ 0x4000 + base_addr,
394
+ 0x7fff + base_addr,
395
+ read16sm_delegate (*this , FUNC (base_98628_9_device::low_ram_r_68k)),
396
+ write16sm_delegate (*this , FUNC (base_98628_9_device::low_ram_w_68k)));
396
397
}
397
398
398
399
uint8_t base_98628_9_device::reg_r (offs_t addr)
@@ -503,7 +504,7 @@ uint8_t base_98628_9_device::low_ram_r_z80(offs_t addr)
503
504
m_sio->ctsb_w (m_ctsb);
504
505
LOG (" CTSB 0\n " );
505
506
}
506
- return m_low_ram[ addr & (LOW_RAM_SIZE - 1 ) ];
507
+ return m_low_ram[addr & (LOW_RAM_SIZE - 1 )];
507
508
}
508
509
509
510
uint16_t base_98628_9_device::low_ram_r_68k (offs_t addr)
@@ -514,7 +515,7 @@ uint16_t base_98628_9_device::low_ram_r_68k(offs_t addr)
514
515
update_irq ();
515
516
LOG (" IRQ 0\n " );
516
517
}
517
- return m_low_ram[ addr & (LOW_RAM_SIZE - 1 ) ];
518
+ return m_low_ram[addr & (LOW_RAM_SIZE - 1 )];
518
519
}
519
520
520
521
void base_98628_9_device::low_ram_w_z80 (offs_t addr, uint8_t data)
@@ -525,7 +526,7 @@ void base_98628_9_device::low_ram_w_z80(offs_t addr, uint8_t data)
525
526
LOG (" IRQ 1\n " );
526
527
update_irq ();
527
528
}
528
- m_low_ram[ addr & (LOW_RAM_SIZE - 1 ) ] = data;
529
+ m_low_ram[addr & (LOW_RAM_SIZE - 1 )] = data;
529
530
}
530
531
531
532
void base_98628_9_device::low_ram_w_68k (offs_t addr, uint16_t data)
@@ -536,7 +537,7 @@ void base_98628_9_device::low_ram_w_68k(offs_t addr, uint16_t data)
536
537
LOG (" CTSB 1\n " );
537
538
m_sio->ctsb_w (m_ctsb);
538
539
}
539
- m_low_ram[ addr & (LOW_RAM_SIZE - 1 ) ] = uint8_t (data);
540
+ m_low_ram[addr & (LOW_RAM_SIZE - 1 )] = uint8_t (data);
540
541
}
541
542
542
543
uint8_t base_98628_9_device::sio_r (offs_t addr)
@@ -873,7 +874,7 @@ class dio16_98629_device :
873
874
bool m_tx;
874
875
bool m_last_tt;
875
876
uint8_t m_sr;
876
- uint8_t m_high_ram[ HIGH_RAM_SIZE ];
877
+ uint8_t m_high_ram[HIGH_RAM_SIZE];
877
878
};
878
879
879
880
void dio16_98629_device::device_start ()
@@ -995,20 +996,21 @@ void dio16_98629_device::cpu_program_mem_map(address_map &map)
995
996
void dio16_98629_device::install_68k_map (offs_t base_addr)
996
997
{
997
998
base_98628_9_device::install_68k_map (base_addr);
998
- dio ().install_memory (0x8000 + base_addr,
999
- 0xbfff + base_addr,
1000
- read16sm_delegate (*this , [this ](offs_t addr) { return high_ram_r_z80 (addr); }, " " ),
1001
- write16sm_delegate (*this , [this ](offs_t addr, uint16_t data) { high_ram_w_z80 (addr, uint8_t (data)); }, " " ));
999
+ dio ().install_memory (
1000
+ 0x8000 + base_addr,
1001
+ 0xbfff + base_addr,
1002
+ read16sm_delegate (*this , NAME ([this ] (offs_t addr) { return high_ram_r_z80 (addr); })),
1003
+ write16sm_delegate (*this , NAME ([this ] (offs_t addr, uint16_t data) { high_ram_w_z80 (addr, uint8_t (data)); })));
1002
1004
}
1003
1005
1004
1006
uint8_t dio16_98629_device::high_ram_r_z80 (offs_t addr)
1005
1007
{
1006
- return m_high_ram[ addr & (HIGH_RAM_SIZE - 1 ) ];
1008
+ return m_high_ram[addr & (HIGH_RAM_SIZE - 1 )];
1007
1009
}
1008
1010
1009
1011
void dio16_98629_device::high_ram_w_z80 (offs_t addr, uint8_t data)
1010
1012
{
1011
- m_high_ram[ addr & (HIGH_RAM_SIZE - 1 ) ] = data;
1013
+ m_high_ram[addr & (HIGH_RAM_SIZE - 1 )] = data;
1012
1014
}
1013
1015
1014
1016
void dio16_98629_device::tx_out (int state)
0 commit comments