diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-27 04:48:13 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-27 04:48:13 +1000 |
commit | c15531dddca6a144b9172077fe7251ea96f4cc7e (patch) | |
tree | f2ffe409c8d6f6392d99e16540a6492a18fa4630 /src/devices/bus | |
parent | decf1fd1fa17a45e2547c5b8d059da3665fb971b (diff) |
srcclean (nw)
Diffstat (limited to 'src/devices/bus')
-rw-r--r-- | src/devices/bus/a2bus/a2diskiing.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_118.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_26.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_86.cpp | 22 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_86.h | 4 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_snd.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/cbus/pc9801_snd.h | 6 | ||||
-rw-r--r-- | src/devices/bus/interpro/sr/edge.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/interpro/sr/edge.h | 8 | ||||
-rw-r--r-- | src/devices/bus/isa/lbaenhancer.cpp | 26 | ||||
-rw-r--r-- | src/devices/bus/isa/lbaenhancer.h | 2 |
11 files changed, 43 insertions, 43 deletions
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp index 5459c4249ce..28194db0421 100644 --- a/src/devices/bus/a2bus/a2diskiing.cpp +++ b/src/devices/bus/a2bus/a2diskiing.cpp @@ -39,7 +39,7 @@ ROM_END ROM_START( diskiing13 ) ROM_REGION(0x100, DISKII_ROM_REGION, 0) - ROM_LOAD( "341-0009.bin", 0x000000, 0x000100, CRC(d34eb2ff) SHA1(afd060e6f35faf3bb0146fa889fc787adf56330a) ) + ROM_LOAD( "341-0009.bin", 0x000000, 0x000100, CRC(d34eb2ff) SHA1(afd060e6f35faf3bb0146fa889fc787adf56330a) ) ROM_END FLOPPY_FORMATS_MEMBER( diskiing_device::floppy_formats ) diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp index e05c61a3cf6..57e17a9e465 100644 --- a/src/devices/bus/cbus/pc9801_118.cpp +++ b/src/devices/bus/cbus/pc9801_118.cpp @@ -8,7 +8,7 @@ TODO: - preliminary, presumably needs CS-4231 too - - verify sound irq; + - verify sound irq; ***************************************************************************/ diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp index 95ef0baf69c..a06ac5c07ef 100644 --- a/src/devices/bus/cbus/pc9801_26.cpp +++ b/src/devices/bus/cbus/pc9801_26.cpp @@ -7,8 +7,8 @@ Legacy sound card for PC-98xx family, composed by a single YM2203 TODO: - - verify sound irq; - + - verify sound irq; + ***************************************************************************/ #include "emu.h" diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index e022b745712..f14d362f9a6 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -3,24 +3,24 @@ /*************************************************************************** NEC PC-9801-86 sound card - NEC PC-9801-SpeakBoard sound card + NEC PC-9801-SpeakBoard sound card Similar to PC-9801-26, this one has YM2608 instead of YM2203 and an additional DAC port - SpeakBoard sound card seems to be derived design from -86, with an additional - OPNA mapped at 0x58* + SpeakBoard sound card seems to be derived design from -86, with an additional + OPNA mapped at 0x58* TODO: - joystick code should be shared between -26, -86 and -118 - Test all pcm modes - Make volume work - Recording - - actual stereo sound routing (currently routes to ALL_OUTPUTS) - - SpeakBoard: no idea about software that uses this, also board shows a single YM2608B? - "-86 only supports ADPCM instead of PCM, while SpeakBoard has OPNA + 256 Kbit RAM" - Sounds like a sound core flaw since OPNA requires a rom region in any case; - - SpeakBoard: sounds horrible, due of the MAME mixing (same as Sega 32X, needs user to lower individual channel volumes); - - verify sound irq; + - actual stereo sound routing (currently routes to ALL_OUTPUTS) + - SpeakBoard: no idea about software that uses this, also board shows a single YM2608B? + "-86 only supports ADPCM instead of PCM, while SpeakBoard has OPNA + 256 Kbit RAM" + Sounds like a sound core flaw since OPNA requires a rom region in any case; + - SpeakBoard: sounds horrible, due of the MAME mixing (same as Sega 32X, needs user to lower individual channel volumes); + - verify sound irq; ***************************************************************************/ @@ -136,7 +136,7 @@ pc9801_86_device::pc9801_86_device(const machine_config &mconfig, device_type ty pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pc9801_86_device(mconfig, PC9801_86, tag, owner, clock) { - + } @@ -399,7 +399,7 @@ MACHINE_CONFIG_END void pc9801_speakboard_device::device_start() { pc9801_86_device::device_start(); - + m_bus->install_io(0x0588, 0x058f, read8_delegate(FUNC(pc9801_speakboard_device::opna_slave_r), this), write8_delegate(FUNC(pc9801_speakboard_device::opna_slave_w), this) ); } diff --git a/src/devices/bus/cbus/pc9801_86.h b/src/devices/bus/cbus/pc9801_86.h index 910713a0b35..2042bb0eda3 100644 --- a/src/devices/bus/cbus/pc9801_86.h +++ b/src/devices/bus/cbus/pc9801_86.h @@ -51,7 +51,7 @@ protected: void pc9801_86_config(machine_config &config); required_device<pc9801_slot_device> m_bus; - + private: int queue_count(); uint8_t queue_pop(); @@ -81,7 +81,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual const tiny_rom_entry *device_rom_region() const override; - + private: required_device<ym2608_device> m_opna_slave; }; diff --git a/src/devices/bus/cbus/pc9801_snd.cpp b/src/devices/bus/cbus/pc9801_snd.cpp index 68b4d3df97d..670e423e4d3 100644 --- a/src/devices/bus/cbus/pc9801_snd.cpp +++ b/src/devices/bus/cbus/pc9801_snd.cpp @@ -2,8 +2,8 @@ // copyright-holders:Angelo Salese /*************************************************************************** - NEC PC-9801 - common functions for CBUS sound boards -26, -86, -118 + NEC PC-9801 + common functions for CBUS sound boards -26, -86, -118 ***************************************************************************/ diff --git a/src/devices/bus/cbus/pc9801_snd.h b/src/devices/bus/cbus/pc9801_snd.h index a5d9b8d3c61..600e555b329 100644 --- a/src/devices/bus/cbus/pc9801_snd.h +++ b/src/devices/bus/cbus/pc9801_snd.h @@ -2,8 +2,8 @@ // copyright-holders:Angelo Salese /*************************************************************************** - NEC PC-9801 - common functions for CBUS sound boards -26, -86, -118 + NEC PC-9801 + common functions for CBUS sound boards -26, -86, -118 ***************************************************************************/ @@ -13,7 +13,7 @@ #pragma once class pc9801_snd_device : public device_t -{ +{ public: pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp index 80c8fc6e0f9..d65791e66ac 100644 --- a/src/devices/bus/interpro/sr/edge.cpp +++ b/src/devices/bus/interpro/sr/edge.cpp @@ -253,7 +253,7 @@ void edge1_device_base::map_dynamic(address_map &map) [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write((offset >> 2) | (offset & 0x3), data); }); //map(0x02028200, 0x0202827f).lr32("idprom", - // [this](address_space &space, offs_t offset, u8 mem_mask) { return memregion("idprom")->as_u32(offset); }); + // [this](address_space &space, offs_t offset, u8 mem_mask) { return memregion("idprom")->as_u32(offset); }); map(0x02410000, 0x0241000f).m("ramdac", FUNC(bt458_device::map)).umask32(0x000000ff); @@ -321,7 +321,7 @@ void edge2plus_framebuffer_device_base::map_dynamic(address_map &map) [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); }); - map(0x01000000, 0x01ffffff).lrw8("vram", + map(0x01000000, 0x01ffffff).lrw8("vram", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_vram->read(offset); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write(offset, data); }); @@ -383,7 +383,7 @@ ROM_END * "9 planes (1 for highlights) of double-buffered graphics, 256 colours from 16.7 million" * 1024x1024x10x2 == 2621440 bytes == 2560KiB == 2.5MiB * FIXME: diag reports 128KiB static ram, 1MiB video ram, 4 screens, 1 user, z-buffer absent -* +* */ MACHINE_CONFIG_START(mpcb828_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/devices/bus/interpro/sr/edge.h b/src/devices/bus/interpro/sr/edge.h index f8c73cfced7..5f3247b5158 100644 --- a/src/devices/bus/interpro/sr/edge.h +++ b/src/devices/bus/interpro/sr/edge.h @@ -45,10 +45,10 @@ enum attention_mask enum reg0_mask { /* - 0x08, - 0x10, // mouse button interrupt? - 0x20, - 0x40, + 0x08, + 0x10, // mouse button interrupt? + 0x20, + 0x40, */ SCC_INT = 0x80, // serial controller VBLANK = 0x1000, // vertical blank? diff --git a/src/devices/bus/isa/lbaenhancer.cpp b/src/devices/bus/isa/lbaenhancer.cpp index 683572b37b5..14bd28826ef 100644 --- a/src/devices/bus/isa/lbaenhancer.cpp +++ b/src/devices/bus/isa/lbaenhancer.cpp @@ -6,7 +6,7 @@ *********************************************************************** - Generic BIOS extension card. Adds 28 bit LBA mode to any pre-1994 + Generic BIOS extension card. Adds 28 bit LBA mode to any pre-1994 board with an empty ISA slot. Supports 1 to 4 large hard disks. Bios boot remains possible. @@ -18,13 +18,13 @@ See: ftp://ami.com/archive/utility/LBA.TXT Usage: - select type 47 for each LBA drive and set C,H,S (params) to '8', + select type 47 for each LBA drive and set C,H,S (params) to '8', then repartition and reformat (Fdisk and Format). Data is lost. Other notes: ROM bank should be excluded in EMM386. - C8000 - CBFFF is sometimes occupied (by graphics). + C8000 - CBFFF is sometimes occupied (by graphics). Changes to the ROM location require a hard reset! - + Requirements: Compatible OS (DOS >= 6.22) and LBA capable drive(s). *********************************************************************** @@ -48,7 +48,7 @@ Notes: J3, J2, J1 set BIOS (start) address to C800, CC00, D000, D400, D800 or DC00 -- one CD74LS245 +- one CD74LS245 - one PALCE16V8H-25 - one 32 K EPROM : 27C256 (STM) (mirrored after 16 K) @@ -85,23 +85,23 @@ const tiny_rom_entry *lba_enhancer_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- MACHINE_CONFIG_START( lba_enhancer_device::device_add_mconfig ) -// MCFG_DEVICE_ADD("lba_enhancer", lba_enhancer, 0) +// MCFG_DEVICE_ADD("lba_enhancer", lba_enhancer, 0) MACHINE_CONFIG_END //------------------------------------------------- -// jumpers +// jumpers //------------------------------------------------- static INPUT_PORTS_START( lba_enhancer_dsw ) PORT_START("ROM_ADDRESS") PORT_CONFNAME( 0x07, 0x00, "16 K ROM bank") PORT_CONFSETTING( 0, "C8000 - CBFFF" ) - PORT_CONFSETTING( 1, "CC000 - CFFFF" ) - PORT_CONFSETTING( 2, "D0000 - D3FFF" ) - PORT_CONFSETTING( 3, "D4000 - D7FFF" ) - PORT_CONFSETTING( 4, "D8000 - DBFFF" ) - PORT_CONFSETTING( 5, "DC000 - DFFFF" ) + PORT_CONFSETTING( 1, "CC000 - CFFFF" ) + PORT_CONFSETTING( 2, "D0000 - D3FFF" ) + PORT_CONFSETTING( 3, "D4000 - D7FFF" ) + PORT_CONFSETTING( 4, "D8000 - DBFFF" ) + PORT_CONFSETTING( 5, "DC000 - DFFFF" ) INPUT_PORTS_END //------------------------------------------------- @@ -133,7 +133,7 @@ void lba_enhancer_device::device_reset() uint32_t current_rom_end = m_current_rom_start + 0x04000 - 1; m_isa->install_rom(this, m_current_rom_start, current_rom_end, "lbabios", "lbabios"); - + logerror("LBA enhancer (for 28 bit LBA) located at BIOS address %x - %x\n", m_current_rom_start, current_rom_end); } } diff --git a/src/devices/bus/isa/lbaenhancer.h b/src/devices/bus/isa/lbaenhancer.h index f73aaa5eff0..71e36c02665 100644 --- a/src/devices/bus/isa/lbaenhancer.h +++ b/src/devices/bus/isa/lbaenhancer.h @@ -18,7 +18,7 @@ //************************************************************************** class lba_enhancer_device : public device_t, - public device_isa8_card_interface + public device_isa8_card_interface { public: // construction/destruction |