diff options
Diffstat (limited to 'src/mess/machine')
28 files changed, 194 insertions, 200 deletions
diff --git a/src/mess/machine/64h156.c b/src/mess/machine/64h156.c index 085cee38612..a33928aeada 100644 --- a/src/mess/machine/64h156.c +++ b/src/mess/machine/64h156.c @@ -757,7 +757,7 @@ void c64h156_device::set_side(int side) if (m_side != side) { m_side = side; - + // read new track data read_current_track(); } diff --git a/src/mess/machine/a2applicard.c b/src/mess/machine/a2applicard.c index 163e988f13e..c568f1085d5 100644 --- a/src/mess/machine/a2applicard.c +++ b/src/mess/machine/a2applicard.c @@ -3,10 +3,10 @@ a2applicard.c Implementation of the PCPI AppliCard Z-80 card - + Unlike the SoftCard and clones, this has its own 64k of RAM on board and the Z80 runs completely independently of the host's 6502. - + *********************************************************************/ #include "a2applicard.h" @@ -25,7 +25,7 @@ const device_type A2BUS_APPLICARD = &device_creator<a2bus_applicard_device>; #define Z80_TAG "z80" -#define Z80_ROM_REGION "z80_rom" +#define Z80_ROM_REGION "z80_rom" static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8, a2bus_applicard_device ) AM_RANGE(0x0000, 0xffff) AM_READWRITE(dma_r, dma_w) @@ -36,7 +36,7 @@ static ADDRESS_MAP_START( z80_io, AS_IO, 8, a2bus_applicard_device ) ADDRESS_MAP_END MACHINE_CONFIG_FRAGMENT( a2applicard ) - MCFG_CPU_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz + MCFG_CPU_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz MCFG_CPU_PROGRAM_MAP(z80_mem) MCFG_CPU_IO_MAP(z80_io) MACHINE_CONFIG_END @@ -147,7 +147,7 @@ UINT8 a2bus_applicard_device::read_c0nx(address_space &space, UINT8 offset) m_z80->reset(); break; - case 6: // IRQ on Z80 via CTC channel 3 (CP/M doesn't use the CTC or IRQs) + case 6: // IRQ on Z80 via CTC channel 3 (CP/M doesn't use the CTC or IRQs) fatalerror("Applicard: Z80 IRQ not supported yet\n"); break; @@ -163,7 +163,7 @@ void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT { switch (offset & 0xf) { - case 0: // are these legal to write? + case 0: // are these legal to write? case 2: case 3: break; @@ -176,7 +176,7 @@ void a2bus_applicard_device::write_c0nx(address_space &space, UINT8 offset, UINT case 5: case 6: case 7: - read_c0nx(space, offset); // let the read handler take care of these + read_c0nx(space, offset); // let the read handler take care of these break; } } @@ -206,9 +206,9 @@ READ8_MEMBER( a2bus_applicard_device::z80_io_r ) return tmp; case 0x60: - break; + break; } - return 0xff; + return 0xff; } WRITE8_MEMBER( a2bus_applicard_device::z80_io_w ) @@ -254,7 +254,7 @@ READ8_MEMBER( a2bus_applicard_device::dma_r ) { return m_z80ram[offset]; } - return 0xff; + return 0xff; } diff --git a/src/mess/machine/abc1600mac.c b/src/mess/machine/abc1600mac.c index 0a5512f3138..1e2766fddb7 100644 --- a/src/mess/machine/abc1600mac.c +++ b/src/mess/machine/abc1600mac.c @@ -241,7 +241,7 @@ UINT8 abc1600_mac_device::read_user_memory(offs_t offset) { int nonx = 0, wp = 0; offs_t virtual_offset = translate_address(offset, &nonx, &wp); - + return space().read_byte(virtual_offset); } diff --git a/src/mess/machine/abc1600mac.h b/src/mess/machine/abc1600mac.h index 0acc6377510..353261b00e9 100644 --- a/src/mess/machine/abc1600mac.h +++ b/src/mess/machine/abc1600mac.h @@ -43,7 +43,7 @@ // ======================> abc1600_mac_device class abc1600_mac_device : public device_t, - public device_memory_interface + public device_memory_interface { public: abc1600_mac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c index cd9a5458821..d6148263a66 100644 --- a/src/mess/machine/c2040.c +++ b/src/mess/machine/c2040.c @@ -505,9 +505,9 @@ READ8_MEMBER( c2040_device::riot1_pb_r ) PB0 DEVICE NUMBER SELECTION PB1 DEVICE NUMBER SELECTION PB2 DEVICE NUMBER SELECTION - PB3 - PB4 - PB5 + PB3 + PB4 + PB5 PB6 DACI PB7 RFDI @@ -533,14 +533,14 @@ WRITE8_MEMBER( c2040_device::riot1_pb_w ) bit description - PB0 - PB1 - PB2 + PB0 + PB1 + PB2 PB3 ACT LED 1 PB4 ACT LED 0 PB5 ERR LED - PB6 - PB7 + PB6 + PB7 */ diff --git a/src/mess/machine/c64/magic_voice.c b/src/mess/machine/c64/magic_voice.c index 9defb137f5f..d54d2f4f250 100644 --- a/src/mess/machine/c64/magic_voice.c +++ b/src/mess/machine/c64/magic_voice.c @@ -11,21 +11,21 @@ LA05-123 Pinout --------------- - _____ _____ - NEXTP 1 |* \_/ | 28 +5V - PD0 2 | | 27 _ROML2 - PD1 3 | | 26 _ROML - PD2 4 | | 25 _I/O2 - PD3 5 | | 24 _GAME - CLEAR 6 | | 23 PHI2 + _____ _____ + NEXTP 1 |* \_/ | 28 +5V + PD0 2 | | 27 _ROML2 + PD1 3 | | 26 _ROML + PD2 4 | | 25 _I/O2 + PD3 5 | | 24 _GAME + CLEAR 6 | | 23 PHI2 _RAM/EPROM 7 | LA05-123 | 22 _ROMH2 - PB5 8 | LA05-124 | 21 _ROMH - PB6 9 | | 20 CLOCK - _6525 10 | | 19 SDO - _EPROM 11 | | 18 NEXTS - CA12 12 | | 17 _DA/CA - CA14 13 | | 16 CA15 - GND 14 |_____________| 15 CA13 + PB5 8 | LA05-124 | 21 _ROMH + PB6 9 | | 20 CLOCK + _6525 10 | | 19 SDO + _EPROM 11 | | 18 NEXTS + CA12 12 | | 17 _DA/CA + CA14 13 | | 16 CA15 + GND 14 |_____________| 15 CA13 http://www.stefan-uhlmann.de/cbm/MVM/index.html @@ -34,9 +34,9 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html /* - TODO: + TODO: - - T6721A speech synthesis + - T6721A speech synthesis */ @@ -48,14 +48,14 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html // MACROS / CONSTANTS //************************************************************************** -#define T6721A_TAG "u5" -#define MOS6525_TAG "u2" -#define CMOS40105_TAG "u1" +#define T6721A_TAG "u5" +#define MOS6525_TAG "u2" +#define CMOS40105_TAG "u1" -#define A12 BIT(offset, 12) -#define A13 BIT(offset, 13) -#define A14 BIT(offset, 14) -#define A15 BIT(offset, 15) +#define A12 BIT(offset, 12) +#define A13 BIT(offset, 13) +#define A14 BIT(offset, 14) +#define A15 BIT(offset, 15) #define PB5 BIT(m_tpi_pb, 5) #define PB6 BIT(m_tpi_pb, 6) @@ -80,18 +80,18 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::tpi_irq_w ) READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r ) { /* - + bit description - - 0 - 1 - 2 - 3 - 4 + + 0 + 1 + 2 + 3 + 4 5 J1 _GAME 6 T6721 _EOS 7 FIFO DIR - + */ UINT8 data = 0; @@ -106,18 +106,18 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_r ) WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w ) { /* - + bit description - + 0 FIFO D0 1 FIFO D1 2 FIFO D2 3 FIFO D3 4 FIFO SI - 5 - 6 - 7 - + 5 + 6 + 7 + */ m_fifo->write(data & 0x0f); @@ -127,18 +127,18 @@ WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pa_w ) READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r ) { /* - + bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 + + 0 + 1 + 2 + 3 + 4 + 5 + 6 7 J1 _EXROM - + */ UINT8 data = 0; @@ -151,9 +151,9 @@ READ8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_r ) WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_w ) { /* - + bit description - + 0 T6721 D0 1 T6721 D1 2 T6721 D2 @@ -161,8 +161,8 @@ WRITE8_MEMBER( c64_magic_voice_cartridge_device::tpi_pb_w ) 4 T6721 _WR 5 LA05-124 pin 8 (DA/CA) 6 LA05-124 pin 9 (passthru) - 7 - + 7 + */ if (!BIT(m_tpi_pb, 4) && BIT(data, 4)) @@ -208,7 +208,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::phi2_w ) m_vslsi->di_w(m_pd & 0x01); m_pd >>= 1; - } + } } WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::dtrd_w ) diff --git a/src/mess/machine/c64/magic_voice.h b/src/mess/machine/c64/magic_voice.h index 73e5d81c5e1..a553acad186 100644 --- a/src/mess/machine/c64/magic_voice.h +++ b/src/mess/machine/c64/magic_voice.h @@ -28,7 +28,7 @@ // ======================> c64_magic_voice_cartridge_device class c64_magic_voice_cartridge_device : public device_t, - public device_c64_expansion_card_interface + public device_c64_expansion_card_interface { public: // construction/destruction diff --git a/src/mess/machine/c64/music64.h b/src/mess/machine/c64/music64.h index e5bcfdb46c6..3b7c804f6cb 100644 --- a/src/mess/machine/c64/music64.h +++ b/src/mess/machine/c64/music64.h @@ -25,7 +25,7 @@ // ======================> c64_music64_cartridge_device class c64_music64_cartridge_device : public device_t, - public device_c64_expansion_card_interface + public device_c64_expansion_card_interface { public: // construction/destruction diff --git a/src/mess/machine/c64_nl10.h b/src/mess/machine/c64_nl10.h index 84c61edc02f..6e7c552d3b9 100644 --- a/src/mess/machine/c64_nl10.h +++ b/src/mess/machine/c64_nl10.h @@ -24,7 +24,7 @@ // ======================> c64_nl10_interface_device class c64_nl10_interface_device : public device_t, - public device_cbm_iec_interface + public device_cbm_iec_interface { public: // construction/destruction diff --git a/src/mess/machine/comx_fd.c b/src/mess/machine/comx_fd.c index e1853895ddf..e4b898614ad 100644 --- a/src/mess/machine/comx_fd.c +++ b/src/mess/machine/comx_fd.c @@ -44,9 +44,9 @@ Notes: /* - TODO: + TODO: - - floppy broken (wd1770 digital PLL FM mode incomplete) + - floppy broken (wd1770 digital PLL FM mode incomplete) */ diff --git a/src/mess/machine/dccons.c b/src/mess/machine/dccons.c index 22f25d05bde..1591448f6b4 100644 --- a/src/mess/machine/dccons.c +++ b/src/mess/machine/dccons.c @@ -151,7 +151,7 @@ WRITE32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_w ) /* 12x * 75 Hz = 0,00(1) secs per sector */ /* TODO: make DMA to be single step */ atapi_timer->adjust(attotime::from_usec(1111*atapi_xferlen/2048)); -// atapi_regs[ATAPI_REG_SAMTAG] = GDROM_PAUSE_STATE | 0x80; +// atapi_regs[ATAPI_REG_SAMTAG] = GDROM_PAUSE_STATE | 0x80; } break; @@ -163,7 +163,7 @@ WRITE32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_w ) case GD_UNLOCK: if (data==0 || data==0x001fffff || data==0x42fe) { -// atapi_regs[ATAPI_REG_SAMTAG] = GDROM_PAUSE_STATE | 0x80; +// atapi_regs[ATAPI_REG_SAMTAG] = GDROM_PAUSE_STATE | 0x80; printf("Unlocking GD-ROM! %x\n", data); } break; diff --git a/src/mess/machine/e05a03.c b/src/mess/machine/e05a03.c index 68a3e34e9b4..f7fb6ef5f99 100644 --- a/src/mess/machine/e05a03.c +++ b/src/mess/machine/e05a03.c @@ -29,7 +29,6 @@ e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, dev m_pf_motor(0), m_cr_motor(0) { - } //------------------------------------------------- diff --git a/src/mess/machine/e05a03.h b/src/mess/machine/e05a03.h index 220b5dbde2a..6bfa0ee3785 100644 --- a/src/mess/machine/e05a03.h +++ b/src/mess/machine/e05a03.h @@ -49,10 +49,10 @@ protected: virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); - + private: // internal state - + /* 24-bit shift register, port 0x00, 0x01 and 0x02 */ UINT32 m_shift; diff --git a/src/mess/machine/hardbox.c b/src/mess/machine/hardbox.c index 096b366b06a..32e274bbadd 100644 --- a/src/mess/machine/hardbox.c +++ b/src/mess/machine/hardbox.c @@ -1,42 +1,42 @@ /**************************************************************************** - SSE HardBox emulation + SSE HardBox emulation - Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. ****************************************************************************/ /* - http://mikenaberezny.com/hardware/pet-cbm/sse-hardbox-corvus-interface/ + http://mikenaberezny.com/hardware/pet-cbm/sse-hardbox-corvus-interface/ - The HardBox provides a CBM DOS interface for a Corvus hard disk. Before - it can be used, a hard disk image must first be created and formatted. - Use the CHDMAN utility to create a 20MB image: + The HardBox provides a CBM DOS interface for a Corvus hard disk. Before + it can be used, a hard disk image must first be created and formatted. + Use the CHDMAN utility to create a 20MB image: - $ chdman createhd -o /path/to/corvus20mb.chd -chs 388,5,20 -ss 512 + $ chdman createhd -o /path/to/corvus20mb.chd -chs 388,5,20 -ss 512 - Start the pet8032 emulator with the HardBox attached as device 9, - with the new CHD and the utilities floppy mounted: + Start the pet8032 emulator with the HardBox attached as device 9, + with the new CHD and the utilities floppy mounted: - $ mess pet8032 -ieee9 hardbox \ - -hard1 /path/to/corvus20mb.chd \ - -flop1 /path/to/hardbox-utils.d80 - - Load and run the "configure" program from the floppy. When prompted - for the HardBox device number, enter "9". + $ mess pet8032 -ieee9 hardbox \ + -hard1 /path/to/corvus20mb.chd \ + -flop1 /path/to/hardbox-utils.d80 - Select "q" for quick configure at the menu. It will present a default - drive size and ask if you want to alter it. If the size is not 20, - change it to 20. + Load and run the "configure" program from the floppy. When prompted + for the HardBox device number, enter "9". - After accepting the drive size, it will prompt if you want to perform - a format check. This requires uploading code into the Corvus, which - the high level emulation of the Corvus does not support. Enter "n" - to skip the format check. + Select "q" for quick configure at the menu. It will present a default + drive size and ask if you want to alter it. If the size is not 20, + change it to 20. - Enter "y" to proceed with the format. After it has completed, the - program will exit back to BASIC. The drive should now be usable. + After accepting the drive size, it will prompt if you want to perform + a format check. This requires uploading code into the Corvus, which + the high level emulation of the Corvus does not support. Enter "n" + to skip the format check. + + Enter "y" to proceed with the format. After it has completed, the + program will exit back to BASIC. The drive should now be usable. */ @@ -136,7 +136,7 @@ READ8_MEMBER( hardbox_device::ppi0_pc_r ) { UINT8 data = ioport("SW1")->read(); - /* DIP switches on PC1,PC2,PC3 configure the IEEE-488 primary address. + /* DIP switches on PC1,PC2,PC3 configure the IEEE-488 primary address. We get the address from m_address instead. */ data |= ((m_slot->get_address() - 8) << 1) ^ 0xff; @@ -373,7 +373,7 @@ void hardbox_device::device_start() // reset that must happen after child devices // have performed their resets //------------------------------------------------- - + void hardbox_device::device_reset_after_children() { /* The Z80 starts at address 0x0000 but the HardBox has RAM there and @@ -381,9 +381,9 @@ void hardbox_device::device_reset_after_children() 74S287 PROM that temporarily changes the memory map so that the IC3 EPROM at 0xe000 is mapped to 0x0000 for the first instruction fetch only. The instruction normally at 0xe000 is an absolute jump - into the ROM. On reset, the Z80 will fetch it from 0x0000 and set + into the ROM. On reset, the Z80 will fetch it from 0x0000 and set its PC, then the normal map will be restored before the next - instruction fetch. Here we just set the PC to 0xe000 after the Z80 + instruction fetch. Here we just set the PC to 0xe000 after the Z80 resets, which has the same effect. */ m_maincpu->set_state_int(Z80_PC, 0xe000); @@ -403,4 +403,3 @@ void hardbox_device::ieee488_ifc(int state) m_ifc = state; } - diff --git a/src/mess/machine/hardbox.h b/src/mess/machine/hardbox.h index ebb1a9f49bd..a727f7cfaa7 100644 --- a/src/mess/machine/hardbox.h +++ b/src/mess/machine/hardbox.h @@ -68,7 +68,7 @@ private: required_device<cpu_device> m_maincpu; - int m_ifc; // Tracks previous state of IEEE-488 IFC line + int m_ifc; // Tracks previous state of IEEE-488 IFC line }; // device type definition diff --git a/src/mess/machine/isa_wd1002a_wx1.c b/src/mess/machine/isa_wd1002a_wx1.c index de5da644960..8e01f284cc4 100644 --- a/src/mess/machine/isa_wd1002a_wx1.c +++ b/src/mess/machine/isa_wd1002a_wx1.c @@ -48,7 +48,7 @@ const rom_entry *isa8_wd1002a_wx1_device::device_rom_region() const isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ISA8_WD1002A_WX1, "WD1002A-WX1", tag, owner, clock, "wd1002a_wx1", __FILE__), - device_isa8_card_interface( mconfig, *this ) + device_isa8_card_interface( mconfig, *this ) { } diff --git a/src/mess/machine/isa_xtide.c b/src/mess/machine/isa_xtide.c index 0a8cf135018..221f0a4b69c 100644 --- a/src/mess/machine/isa_xtide.c +++ b/src/mess/machine/isa_xtide.c @@ -222,14 +222,14 @@ ROM_START( xtide ) ROMX_LOAD( "ide_xt.bin(v1.1.5)", 0x000000, 0x002000, CRC(33a7e0ee) SHA1(b610fd8ea31f5b0568b8b3f2c3ef682be4897a3d), ROM_BIOS(14) ) ROM_SYSTEM_BIOS( 14, "xub115xtp", "XTIDE_Universal_BIOS_v1.1.3 (XT 80186+)" ) - ROMX_LOAD( "ide_xtp.bin(v1.1.5)", 0x000000, 0x002000, CRC(44ad9ee9) SHA1(9cd275469703cadb85b6654c56e421a151324ac0), ROM_BIOS(15) ) + ROMX_LOAD( "ide_xtp.bin(v1.1.5)", 0x000000, 0x002000, CRC(44ad9ee9) SHA1(9cd275469703cadb85b6654c56e421a151324ac0), ROM_BIOS(15) ) ROM_SYSTEM_BIOS( 15, "xub115at", "XTIDE_Universal_BIOS_v1.1.5 (AT)" ) ROMX_LOAD( "ide_at.bin(v1.1.5)", 0x000000, 0x002000, CRC(434286ce) SHA1(3fc07d174924e7c48b4758a7ba76ecd5362bd75b), ROM_BIOS(16) ) ROM_SYSTEM_BIOS( 16, "xub200b1xt", "XTIDE_Universal_BIOS_v2.0.0_beta1 (XT)" ) ROMX_LOAD( "ide_xt.bin(v2.0.0_beta1)", 0x000000, 0x002000, CRC(379579e7) SHA1(da5ee7b9c43a55592fe909451d31a6766d0ab977), ROM_BIOS(17) ) - + ROM_SYSTEM_BIOS( 17, "xub200b1xtp", "XTIDE_Universal_BIOS_v2.0.0_beta1 (XT 80186+)" ) ROMX_LOAD( "ide_xtp.bin(v2.0.0_beta1)", 0x000000, 0x002000, CRC(a887ed63) SHA1(fb33d9e8e8824f61a8d247610d7bd215b7e306b4), ROM_BIOS(18) ) diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c index c321f8d7778..e9456f2aee5 100644 --- a/src/mess/machine/mac.c +++ b/src/mess/machine/mac.c @@ -98,7 +98,7 @@ #define AUDIO_IS_CLASSIC (m_model <= MODEL_MAC_CLASSIC) #define MAC_HAS_VIA2 ((m_model >= MODEL_MAC_II) && (m_model != MODEL_MAC_IIFX)) -#define INTS_RBV ((m_model >= MODEL_MAC_IICI) && (m_model <= MODEL_MAC_IIVI)) || ((m_model >= MODEL_MAC_LC) && (m_model <= MODEL_MAC_LC_580)) +#define INTS_RBV ((m_model >= MODEL_MAC_IICI) && (m_model <= MODEL_MAC_IIVI)) || ((m_model >= MODEL_MAC_LC) && (m_model <= MODEL_MAC_LC_580)) #ifdef MAME_DEBUG #define LOG_ADB 0 @@ -673,24 +673,24 @@ void mac_state::keyboard_init() WRITE_LINE_MEMBER(mac_state::mac_kbd_clk_in) { - printf("CLK: %d\n", state^1); - m_via1->write_cb1(state ? 0 : 1); + printf("CLK: %d\n", state^1); + m_via1->write_cb1(state ? 0 : 1); } #ifdef MAC_USE_EMULATED_KBD READ8_MEMBER(mac_state::mac_via_in_cb2) { - printf("Read %d from keyboard (PC=%x)\n", (m_mackbd->data_r() == ASSERT_LINE) ? 1 : 0, m_maincpu->pc()); - return (m_mackbd->data_r() == ASSERT_LINE) ? 1 : 0; + printf("Read %d from keyboard (PC=%x)\n", (m_mackbd->data_r() == ASSERT_LINE) ? 1 : 0, m_maincpu->pc()); + return (m_mackbd->data_r() == ASSERT_LINE) ? 1 : 0; } WRITE8_MEMBER(mac_state::mac_via_out_cb2) { - printf("Sending %d to kbd (PC=%x)\n", data, m_maincpu->pc()); - m_mackbd->data_w((data & 1) ? ASSERT_LINE : CLEAR_LINE); + printf("Sending %d to kbd (PC=%x)\n", data, m_maincpu->pc()); + m_mackbd->data_w((data & 1) ? ASSERT_LINE : CLEAR_LINE); } -#else // keyboard HLE +#else // keyboard HLE TIMER_CALLBACK_MEMBER(mac_state::kbd_clock) { diff --git a/src/mess/machine/mackbd.c b/src/mess/machine/mackbd.c index 7f3663b4e70..40e89851e12 100644 --- a/src/mess/machine/mackbd.c +++ b/src/mess/machine/mackbd.c @@ -57,7 +57,7 @@ // MACROS / CONSTANTS //************************************************************************** -#define MACKBD_CPU_TAG "mackbd" +#define MACKBD_CPU_TAG "mackbd" //************************************************************************** // DEVICE DEFINITIONS @@ -94,7 +94,7 @@ ADDRESS_MAP_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( mackbd ) - MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz" + MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz" MCFG_CPU_PROGRAM_MAP(mackbd_map) MCFG_CPU_IO_MAP(mackbd_io_map) MACHINE_CONFIG_END @@ -135,7 +135,7 @@ static INPUT_PORTS_START( mackbd ) PORT_START("COL4") PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')') PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*') - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') + PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&') PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(') PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+') @@ -143,15 +143,15 @@ static INPUT_PORTS_START( mackbd ) PORT_START("COL5") PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') + PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') PORT_START("COL6") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') + PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':') PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"') + PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('"') PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR('\r') PORT_NAME("Return") @@ -167,7 +167,7 @@ static INPUT_PORTS_START( mackbd ) PORT_START("COL8") PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN) PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN) - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) + PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') PORT_CHAR('~') PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t') @@ -208,7 +208,7 @@ ioport_constructor mackbd_device::device_input_ports() const //------------------------------------------------- mackbd_device::mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock, "mackbd", __FILE__), + : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock, "mackbd", __FILE__), m_maincpu(*this, MACKBD_CPU_TAG), m_clkout_handler(*this) { @@ -278,7 +278,7 @@ WRITE8_MEMBER(mackbd_device::p0_w) else { m_clkout_handler(CLEAR_LINE); -// machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10)); +// machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(10)); } } @@ -311,7 +311,7 @@ WRITE8_MEMBER(mackbd_device::p2_w) if (m_maincpu->pc() != 0x19e && m_maincpu->pc() != 0x1a3) { data_to_mac = data_from_mac = (data & 1); -// printf("data to/from mac = %d (PC=%x)\n", data_to_mac, m_maincpu->pc()); +// printf("data to/from mac = %d (PC=%x)\n", data_to_mac, m_maincpu->pc()); } } @@ -329,4 +329,3 @@ WRITE_LINE_MEMBER(mackbd_device::data_w) { data_from_mac = (state == ASSERT_LINE) ? 1 : 0; } - diff --git a/src/mess/machine/mackbd.h b/src/mess/machine/mackbd.h index c169d2d465a..5f43dbdb17f 100644 --- a/src/mess/machine/mackbd.h +++ b/src/mess/machine/mackbd.h @@ -11,20 +11,20 @@ // MACROS / CONSTANTS //************************************************************************** -#define MACKBD_TAG "mackbd" +#define MACKBD_TAG "mackbd" //************************************************************************** // INTERFACE CONFIGURATION MACROS //************************************************************************** #define MCFG_MACKBD_ADD() \ - MCFG_DEVICE_ADD(MACKBD_TAG, MACKBD, 0) + MCFG_DEVICE_ADD(MACKBD_TAG, MACKBD, 0) #define MCFG_MACKBD_REPLACE() \ - MCFG_DEVICE_REPLACE(MACKBD_TAG, MACKBD, 0) + MCFG_DEVICE_REPLACE(MACKBD_TAG, MACKBD, 0) #define MCFG_MACKBD_REMOVE() \ - MCFG_DEVICE_REMOVE(MACKBD_TAG) + MCFG_DEVICE_REMOVE(MACKBD_TAG) #define MCFG_MACKBD_CLKOUT_HANDLER(_devcb) \ devcb = &mackbd_device::set_clkout_handler(*device, DEVCB2_##_devcb); @@ -42,7 +42,7 @@ public: template<class _Object> static devcb2_base &set_clkout_handler(device_t &device, _Object object) { return downcast<mackbd_device &>(device).m_clkout_handler.set_callback(object); } // construction/destruction - mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(p0_r); DECLARE_WRITE8_MEMBER(p0_w); @@ -56,14 +56,14 @@ public: DECLARE_WRITE_LINE_MEMBER(data_w); protected: - // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + // device-level overrides + virtual void device_start(); + virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const; virtual ioport_constructor device_input_ports() const; - required_device<cpu_device> m_maincpu; + required_device<cpu_device> m_maincpu; private: UINT8 p0, p1, p2, data_from_mac, data_to_mac; diff --git a/src/mess/machine/micropolis.c b/src/mess/machine/micropolis.c index b3ccc909d43..bf620dfd564 100644 --- a/src/mess/machine/micropolis.c +++ b/src/mess/machine/micropolis.c @@ -134,7 +134,7 @@ void micropolis_device::device_start() m_in_dden_func.resolve(m_in_dden_cb, *this); m_out_intrq_func.resolve(m_out_intrq_cb, *this); m_out_drq_func.resolve(m_out_drq_cb, *this); - + save_item(NAME(m_data)); save_item(NAME(m_drive_num)); save_item(NAME(m_track)); diff --git a/src/mess/machine/micropolis.h b/src/mess/machine/micropolis.h index 422b68ec5cc..dd04d0127ea 100644 --- a/src/mess/machine/micropolis.h +++ b/src/mess/machine/micropolis.h @@ -36,7 +36,7 @@ class micropolis_device : public device_t, public: micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~micropolis_device() {} - + void set_drive(UINT8 drive); // set current drive (0-3) DECLARE_READ8_MEMBER( status_r ); @@ -53,14 +53,14 @@ protected: virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); - + private: // internal state - + devcb_resolved_read_line m_in_dden_func; devcb_resolved_write_line m_out_intrq_func; devcb_resolved_write_line m_out_drq_func; - + /* register */ UINT8 m_data; UINT8 m_drive_num; @@ -79,7 +79,7 @@ private: /* this is the drive currently selected */ device_t *m_drive; - + void read_sector(); void write_sector(); }; diff --git a/src/mess/machine/mpu401.c b/src/mess/machine/mpu401.c index c11b4f0d885..c4a18dfb0b8 100644 --- a/src/mess/machine/mpu401.c +++ b/src/mess/machine/mpu401.c @@ -3,32 +3,32 @@ Roland MPU-401 core This emulates the MPU-401 external box with the 6801, ASIC, and RAM in it. - + We do it this way to facilitate the various PC, Apple II, C64, and other possible hookups. - + 6801 GPIO port hookups (from the schematics) - + P10 / P11 / P12: drive the metronome and speaker P13 / P14 / P15: drive 3 pins on the SYNC OUT connector P16: to DSRD on gate array P17: to DRRD on gate array - + P20: to SYC OUT on gate array P21: to SYC IN on gate array, pulled up to Vcc via 4.7K resistor - programmed as output of timer (OLVL) + programmed as output of timer (OLVL) P22: to SRCK on gate array, inverted P23: MIDI IN serial data (SCI in) P24: MIDI OUT serial data (SCI out) - + ASIC addresses from the 6801: 0x20: (r) read pending byte from the PC (w) apparently nothing 0x21: (r) ASIC status, see STAT_xxx bits below (w) send new byte to PC data port - + Theory of operation: 6801's timer/counter is set up to drive a pulse stream out P21 to the ASIC's SYC IN pin. The ASIC in turn generates the MIDI baud rate (times 8) and returns that on pin P22. - + The 6801 is believed to run in mode 2, based on a combination of the schematics and the behavior (ie, internal RAM from 80-FF is clearly present from the program's behavior, and ports 3/4 are obviously external @@ -38,26 +38,26 @@ #include "machine/mpu401.h" -#define M6801_TAG "mpu6801" -#define ROM_TAG "mpurom" -#define MIDIIN_TAG "mdin" -#define MIDIOUT_TAG "mdout" +#define M6801_TAG "mpu6801" +#define ROM_TAG "mpurom" +#define MIDIIN_TAG "mdin" +#define MIDIOUT_TAG "mdout" -#define P2_SYNC_OUT (0x01) -#define P2_SYNC_IN (0x02) -#define P2_SRCK_OUT (0x04) -#define P2_MIDI_IN (0x08) -#define P2_MIDI_OUT (0x10) +#define P2_SYNC_OUT (0x01) +#define P2_SYNC_IN (0x02) +#define P2_SRCK_OUT (0x04) +#define P2_MIDI_IN (0x08) +#define P2_MIDI_OUT (0x10) -#define STAT_CMD_PORT (0x01) // set if the new byte indicated by TX FULL was written to the command port, clear for data port -#define STAT_TX_FULL (0x40) // indicates the PC has written a new byte we haven't read yet -#define STAT_RX_EMPTY (0x80) // indicates we've written a new byte the PC hasn't read yet +#define STAT_CMD_PORT (0x01) // set if the new byte indicated by TX FULL was written to the command port, clear for data port +#define STAT_TX_FULL (0x40) // indicates the PC has written a new byte we haven't read yet +#define STAT_RX_EMPTY (0x80) // indicates we've written a new byte the PC hasn't read yet static ADDRESS_MAP_START( mpu401_map, AS_PROGRAM, 8, mpu401_device ) AM_RANGE(0x0000, 0x001f) AM_READWRITE(regs_mode2_r, regs_mode2_w) AM_RANGE(0x0020, 0x0021) AM_READWRITE(asic_r, asic_w) - AM_RANGE(0x0080, 0x00ff) AM_RAM // on-chip RAM - AM_RANGE(0x0800, 0x0fff) AM_RAM // external RAM + AM_RANGE(0x0080, 0x00ff) AM_RAM // on-chip RAM + AM_RANGE(0x0800, 0x0fff) AM_RAM // external RAM AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION(ROM_TAG, 0) ADDRESS_MAP_END @@ -85,7 +85,7 @@ static const serial_port_interface midiout_intf = }; MACHINE_CONFIG_FRAGMENT( mpu401 ) - MCFG_CPU_ADD(M6801_TAG, M6801, 4000000) /* 4 MHz as per schematics */ + MCFG_CPU_ADD(M6801_TAG, M6801, 4000000) /* 4 MHz as per schematics */ MCFG_CPU_PROGRAM_MAP(mpu401_map) MCFG_CPU_IO_MAP(mpu401_io_map) MCFG_M6801_SER_TX(WRITELINE(mpu401_device, mpu401_midi_tx)) @@ -96,7 +96,7 @@ MACHINE_CONFIG_END ROM_START( mpu401 ) ROM_REGION(0x1000, ROM_TAG, 0) - ROM_LOAD( "roland_6801v0b55p.bin", 0x000000, 0x001000, CRC(65d3a151) SHA1(00efbfb96aeb997b69bb16981c6751d3c784bb87) ) + ROM_LOAD( "roland_6801v0b55p.bin", 0x000000, 0x001000, CRC(65d3a151) SHA1(00efbfb96aeb997b69bb16981c6751d3c784bb87) ) ROM_END //************************************************************************** @@ -156,7 +156,7 @@ void mpu401_device::device_start() void mpu401_device::device_reset() { - m_port2 = 0xff & ~(P2_SRCK_OUT | P2_MIDI_IN); // prevent spurious reception + m_port2 = 0xff & ~(P2_SRCK_OUT | P2_MIDI_IN); // prevent spurious reception m_command = 0; m_mpudata = 0; m_gatearrstat = 0; @@ -182,7 +182,7 @@ READ8_MEMBER(mpu401_device::regs_mode2_r) case 6: case 7: case 0xf: -// printf("MPU401: read @ unk %x (PC=%x)\n", offset, space.device().safe_pc()); +// printf("MPU401: read @ unk %x (PC=%x)\n", offset, space.device().safe_pc()); break; default: @@ -201,7 +201,7 @@ WRITE8_MEMBER(mpu401_device::regs_mode2_w) case 6: case 7: case 0xf: -// printf("MPU401: %02x @ unk %x (PC=%x)\n", data, offset, space.device().safe_pc()); +// printf("MPU401: %02x @ unk %x (PC=%x)\n", data, offset, space.device().safe_pc()); break; default: @@ -216,29 +216,29 @@ READ8_MEMBER(mpu401_device::port1_r) WRITE8_MEMBER(mpu401_device::port1_w) { -// printf("port1_w: %02x met %x syncout %x DSRD %d DRRD %d\n", data, data & 3, (data>>3) & 3, (data>>6) & 1, (data>>7) & 1); +// printf("port1_w: %02x met %x syncout %x DSRD %d DRRD %d\n", data, data & 3, (data>>3) & 3, (data>>6) & 1, (data>>7) & 1); } READ8_MEMBER(mpu401_device::port2_r) { -// printf("Read P2 (PC=%x)\n", space.device().safe_pc()); +// printf("Read P2 (PC=%x)\n", space.device().safe_pc()); return m_port2; } WRITE8_MEMBER(mpu401_device::port2_w) { -// printf("port2_w: %02x SYCOUT %d SYCIN %d SRCK %d MIDI OUT %d\n", data, (data & 1), (data>>1) & 1, (data>>2) & 1, (data>>4) & 1); +// printf("port2_w: %02x SYCOUT %d SYCIN %d SRCK %d MIDI OUT %d\n", data, (data & 1), (data>>1) & 1, (data>>2) & 1, (data>>4) & 1); } READ8_MEMBER(mpu401_device::mpu_r) { -// printf("mpu_r @ %d\n", offset); +// printf("mpu_r @ %d\n", offset); - if (offset == 1) // status + if (offset == 1) // status { return m_gatearrstat; } - else // data + else // data { write_irq(CLEAR_LINE); m_gatearrstat |= STAT_RX_EMPTY; @@ -248,7 +248,7 @@ READ8_MEMBER(mpu401_device::mpu_r) WRITE8_MEMBER(mpu401_device::mpu_w) { -// printf("%02x to MPU-401 @ %d\n", data, offset); +// printf("%02x to MPU-401 @ %d\n", data, offset); m_command = data; m_gatearrstat |= STAT_TX_FULL; @@ -269,7 +269,7 @@ READ8_MEMBER(mpu401_device::asic_r) m_gatearrstat &= ~STAT_TX_FULL; return m_command; } - else if (offset == 1) + else if (offset == 1) { return m_gatearrstat; } @@ -279,7 +279,7 @@ READ8_MEMBER(mpu401_device::asic_r) WRITE8_MEMBER(mpu401_device::asic_w) { -// printf("MPU401: %02x to gate array @ %d\n", data, offset); +// printf("MPU401: %02x to gate array @ %d\n", data, offset); if (offset == 1) { @@ -307,4 +307,3 @@ WRITE_LINE_MEMBER(mpu401_device::mpu401_midi_tx) { m_mdout->tx(state); } - diff --git a/src/mess/machine/mpu401.h b/src/mess/machine/mpu401.h index 620b1986752..0e814787339 100644 --- a/src/mess/machine/mpu401.h +++ b/src/mess/machine/mpu401.h @@ -73,5 +73,3 @@ private: extern const device_type MPU401; #endif /* __MPU401_H__ */ - - diff --git a/src/mess/machine/pc_lpt.h b/src/mess/machine/pc_lpt.h index fb0d2ceabb6..e6f5c2aafb2 100644 --- a/src/mess/machine/pc_lpt.h +++ b/src/mess/machine/pc_lpt.h @@ -40,9 +40,9 @@ public: DECLARE_READ8_MEMBER( status_r ); DECLARE_READ8_MEMBER( control_r ); DECLARE_WRITE8_MEMBER( control_w ); - + DECLARE_WRITE_LINE_MEMBER( ack_w ); - + protected: // device-level overrides virtual void device_config_complete(); diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index b7ecc80259a..0c1e4dcf729 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -1230,7 +1230,7 @@ READ8_MEMBER(rmnimbus_state::cascade_callback) void rmnimbus_state::machine_reset() { /* CPU */ -// nimbus_cpu_reset(); +// nimbus_cpu_reset(); iou_reset(); fdc_reset(); hdc_reset(); @@ -1248,7 +1248,7 @@ DRIVER_INIT_MEMBER(rmnimbus_state,nimbus) void rmnimbus_state::machine_start() { /* init cpu */ -// nimbus_cpu_init(); +// nimbus_cpu_init(); m_keyboard.keyscan_timer=machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(rmnimbus_state::keyscan_callback),this)); m_nimbus_mouse.m_mouse_timer=machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(rmnimbus_state::mouse_callback),this)); diff --git a/src/mess/machine/ti99/spchsyn.c b/src/mess/machine/ti99/spchsyn.c index 2027f088366..e1a9fdffb45 100644 --- a/src/mess/machine/ti99/spchsyn.c +++ b/src/mess/machine/ti99/spchsyn.c @@ -8,8 +8,8 @@ speech synthesizer must be moved into the Peripheral Box. The Speech Synthesizer used for the TI was the CD2501E, AKA TMS5200, - (internal name TMC0285), a predecessor of the TMS5220 which was used in - other commercial products. + (internal name TMC0285), a predecessor of the TMS5220 which was used in + other commercial products. Note that this adapter also contains the speech roms. diff --git a/src/mess/machine/ti99/videowrp.c b/src/mess/machine/ti99/videowrp.c index af91f8e9421..5a17ee06f67 100644 --- a/src/mess/machine/ti99/videowrp.c +++ b/src/mess/machine/ti99/videowrp.c @@ -42,12 +42,12 @@ ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const ch ti_sound_sn94624_device::ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock, "ti_sound_sn94624", __FILE__) -{ +{ } ti_sound_sn76496_device::ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_sound_system_device(mconfig, TISOUND_76496, tag, "Onboard sound (SN76496)", owner, clock, "ti_sound_sn76496", __FILE__) -{ +{ } /*****************************************************************************/ |
