Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nes: Various minor cleanups. (#9593)

Browse Source
This commit is contained in:
0kmg 2022-04-21 04:41:58 -08:00 committed by GitHub
parent a010d45708
commit 11f5de6ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 54 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hash/nes.xml
View File

@ -51730,9 +51730,9 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</software> </software>
<software name="timedivr"> <software name="timedivr">
<description>Time Diver Eon Man (USA, Prototype)</description> <description>Time Diver Eon Man (USA, prototype)</description>
<year>19??</year> <year>1993</year>
<publisher>&lt;unknown&gt;</publisher> <publisher>Taito</publisher>
<part name="cart" interface="nes_cart"> <part name="cart" interface="nes_cart">
<feature name="slot" value="txrom" /> <feature name="slot" value="txrom" />
<feature name="pcb" value="NES-TLROM" /> <feature name="pcb" value="NES-TLROM" />
@ -57252,14 +57252,14 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<!-- 8k VRAM on cartridge --> <!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192"> <dataarea name="vram" size="8192">
</dataarea> </dataarea>
<!-- 8k WRAM on cartridge, battery backed up --> <!-- 32k WRAM on cartridge, battery backed up -->
<dataarea name="bwram" size="8192"> <dataarea name="bwram" size="32768">
<rom value="0x00" size="8192" offset="0" loadflag="fill" /> <rom value="0x00" size="32768" offset="0" loadflag="fill" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
<software name="sanxiawya" cloneof="sanxiawy" supported="no"> <software name="sanxiawya" cloneof="sanxiawy" supported="no">
<description>San Xia Wu Yi (Chi, Decrypted WXN)</description> <description>San Xia Wu Yi (Chi, Decrypted WXN)</description>
<year>19??</year> <year>19??</year>
<publisher>Waixing</publisher> <publisher>Waixing</publisher>
@ -57274,14 +57274,14 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<!-- 8k VRAM on cartridge --> <!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192"> <dataarea name="vram" size="8192">
</dataarea> </dataarea>
<!-- 8k WRAM on cartridge, battery backed up --> <!-- 32k WRAM on cartridge, battery backed up -->
<dataarea name="bwram" size="8192"> <dataarea name="bwram" size="32768">
<rom value="0x00" size="8192" offset="0" loadflag="fill" /> <rom value="0x00" size="32768" offset="0" loadflag="fill" />
</dataarea> </dataarea>
</part> </part>
</software> </software>
<software name="sanxiawyb" cloneof="sanxiawy" supported="no"> <software name="sanxiawyb" cloneof="sanxiawy" supported="no">
<description>San Xia Wu Yi (Chi, Alt?)</description> <description>San Xia Wu Yi (Chi, Alt?)</description>
<year>19??</year> <year>19??</year>
<publisher>Waixing</publisher> <publisher>Waixing</publisher>
@ -57296,6 +57296,10 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<!-- 8k VRAM on cartridge --> <!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192"> <dataarea name="vram" size="8192">
</dataarea> </dataarea>
<!-- 8k WRAM on cartridge, battery backed up -->
<dataarea name="bwram" size="8192">
<rom value="0x00" size="8192" offset="0" loadflag="fill" />
</dataarea>
</part> </part>
</software> </software>
@ -57760,7 +57764,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<software name="zhentian"> <software name="zhentian" cloneof="sanada">
<description>Zhēntián Shí Yǒngshì (China)</description> <description>Zhēntián Shí Yǒngshì (China)</description>
<year>2005</year> <year>2005</year>
<publisher>Waixing</publisher> <publisher>Waixing</publisher>
@ -61151,6 +61155,23 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<software name="mspeachw" cloneof="menaceb">
<description>Miss Peach World 1 - Super L.A. Cop (Japan)</description>
<year>1991</year>
<publisher>Hacker International</publisher>
<part name="cart" interface="nes_cart">
<feature name="slot" value="discrete_74x377" />
<feature name="pcb" value="COLORDREAMS-74*377" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="65536">
<rom name="miss peach world.prg" size="65536" crc="ea7af97e" sha1="2e68d334193d70f92619b656785f749eae82382a" status="baddump" />
</dataarea>
<dataarea name="chr" size="65536">
<rom name="miss peach world.chr" size="65536" crc="a9d5bea7" sha1="2241cf3ea84889d50009928e66ead5f15bff2cca" status="baddump" />
</dataarea>
</part>
</software>
<!-- nointro --> <!-- nointro -->
<!-- Same as Galactic Crusader, but with nudity) --> <!-- Same as Galactic Crusader, but with nudity) -->
<software name="papillon"> <software name="papillon">
@ -65652,23 +65673,6 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part> </part>
</software> </software>
<software name="mspeachw" cloneof="menaceb">
<description>Miss Peach World 1 - Super L.A. Cop (Japan)</description>
<year>1991</year>
<publisher>Hacker International</publisher>
<part name="cart" interface="nes_cart">
<feature name="slot" value="discrete_74x377" />
<feature name="pcb" value="COLORDREAMS-74*377" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="65536">
<rom name="miss peach world.prg" size="65536" crc="ea7af97e" sha1="2e68d334193d70f92619b656785f749eae82382a" status="baddump" />
</dataarea>
<dataarea name="chr" size="65536">
<rom name="miss peach world.chr" size="65536" crc="a9d5bea7" sha1="2241cf3ea84889d50009928e66ead5f15bff2cca" status="baddump" />
</dataarea>
</part>
</software>
<software name="molizhan"> <software name="molizhan">
<description>Mo Li Zhan Shi (Chi)</description> <description>Mo Li Zhan Shi (Chi)</description>
<year>19??</year> <year>19??</year>

1
src/devices/bus/nes/bandai.h
View File

@ -74,7 +74,6 @@ public:
// construction/destruction // construction/destruction
nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override { fcg_write(offset, data); } virtual void write_h(offs_t offset, uint8_t data) override { fcg_write(offset, data); }
protected: protected:

1
src/devices/bus/nes/bootleg.h
View File

@ -400,6 +400,7 @@ class nes_whirlwind_device : public nes_nrom_device
{ {
public: public:
virtual u8 read_m(offs_t offset) override; virtual u8 read_m(offs_t offset) override;
virtual void pcb_reset() override; virtual void pcb_reset() override;
protected: protected:

1
src/devices/bus/nes/legacy.h
View File

@ -64,7 +64,6 @@ public:
// construction/destruction // construction/destruction
nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_l(offs_t offset, uint8_t data) override;
virtual void write_h(offs_t offset, uint8_t data) override {} virtual void write_h(offs_t offset, uint8_t data) override {}

1
src/devices/bus/nes/mmc2.h
View File

@ -41,7 +41,6 @@ public:
// construction/destruction // construction/destruction
nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override;
virtual void pcb_reset() override; virtual void pcb_reset() override;

22
src/devices/bus/nes/mmc3_clones.cpp
View File

@ -158,7 +158,7 @@ ioport_constructor nes_bmc_kc885_device::device_input_ports() const
// LIVE DEVICE // LIVE DEVICE
//************************************************************************** //**************************************************************************
nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_NITRA, tag, owner, clock) : nes_txrom_device(mconfig, NES_NITRA, tag, owner, clock)
{ {
} }
@ -168,17 +168,17 @@ nes_bmw8544_device::nes_bmw8544_device(const machine_config &mconfig, const char
{ {
} }
nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_FS6, tag, owner, clock) : nes_txrom_device(mconfig, NES_FS6, tag, owner, clock)
{ {
} }
nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_SBROS11, tag, owner, clock) : nes_txrom_device(mconfig, NES_SBROS11, tag, owner, clock)
{ {
} }
nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_MALISB, tag, owner, clock) : nes_txrom_device(mconfig, NES_MALISB, tag, owner, clock)
{ {
} }
@ -1128,10 +1128,10 @@ void nes_smd133_device::pcb_reset()
Bootleg Board by Nitra Bootleg Board by Nitra
Games: Time Diver Avenger Games: Queen Bee, Time Diver Avenger
This acts basically like a MMC3 with different use of write MMC3 clone with A10 tied to what is normally A0 and
address. data instead coming from the lower address lines.
iNES: mapper 250 iNES: mapper 250
@ -1234,6 +1234,8 @@ void nes_sbros11_device::write_h(offs_t offset, u8 data)
This is very similar to mapper 196, but with additional This is very similar to mapper 196, but with additional
data bit swap. data bit swap.
NES 2.0: mapper 325
In MAME: Supported. In MAME: Supported.
-------------------------------------------------*/ -------------------------------------------------*/
@ -1254,10 +1256,8 @@ void nes_malisb_device::write_h(offs_t offset, u8 data)
{ {
LOG_MMC(("malisb write_h, offset: %04x, data: %02x\n", offset, data)); LOG_MMC(("malisb write_h, offset: %04x, data: %02x\n", offset, data));
if (offset > 0x4000) offset = (offset & 0x6000) | BIT(offset, 3) | (BIT(offset, 14) & BIT(offset, 2));
txrom_write((offset & 0xfffe) | BIT(offset, 2) | BIT(offset, 3), data); txrom_write(offset, data);
else
txrom_write((offset & 0xfffe) | BIT(offset, 3), data);
} }
/*------------------------------------------------- /*-------------------------------------------------

26
src/devices/bus/nes/mmc3_clones.h
View File

@ -14,10 +14,9 @@ class nes_nitra_device : public nes_txrom_device
{ {
public: public:
// construction/destruction // construction/destruction
nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// device-level overrides virtual void write_h(offs_t offset, u8 data) override;
virtual void write_h(offs_t offset, uint8_t data) override;
}; };
@ -51,10 +50,9 @@ class nes_fs6_device : public nes_txrom_device
{ {
public: public:
// construction/destruction // construction/destruction
nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// device-level overrides virtual void write_h(offs_t offset, u8 data) override;
virtual void write_h(offs_t offset, uint8_t data) override;
}; };
@ -64,10 +62,9 @@ class nes_sbros11_device : public nes_txrom_device
{ {
public: public:
// construction/destruction // construction/destruction
nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// device-level overrides virtual void write_h(offs_t offset, u8 data) override;
virtual void write_h(offs_t offset, uint8_t data) override;
}; };
@ -77,10 +74,9 @@ class nes_malisb_device : public nes_txrom_device
{ {
public: public:
// construction/destruction // construction/destruction
nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// device-level overrides virtual void write_h(offs_t offset, u8 data) override;
virtual void write_h(offs_t offset, uint8_t data) override;
virtual void prg_cb(int start, int bank) override; virtual void prg_cb(int start, int bank) override;
virtual void chr_cb(int start, int bank, int source) override; virtual void chr_cb(int start, int bank, int source) override;
}; };
@ -332,7 +328,6 @@ public:
// construction/destruction // construction/destruction
nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_l(offs_t offset, uint8_t data) override;
virtual void write_m(offs_t offset, uint8_t data) override { write_l(offset & 0xff, data); } // offset does not really count for this mapper } virtual void write_m(offs_t offset, uint8_t data) override { write_l(offset & 0xff, data); } // offset does not really count for this mapper }
virtual void prg_cb(int start, int bank) override; virtual void prg_cb(int start, int bank) override;
@ -347,7 +342,6 @@ public:
// construction/destruction // construction/destruction
nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override;
}; };
@ -384,7 +378,6 @@ public:
// construction/destruction // construction/destruction
nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override;
protected: protected:
@ -691,6 +684,7 @@ public:
virtual void pcb_reset() override; virtual void pcb_reset() override;
protected: protected:
// device-level overrides
virtual ioport_constructor device_input_ports() const override; virtual ioport_constructor device_input_ports() const override;
private: private:
@ -720,7 +714,6 @@ public:
// construction/destruction // construction/destruction
nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
// device-level overrides
virtual void write_m(offs_t offset, u8 data) override; virtual void write_m(offs_t offset, u8 data) override;
virtual void pcb_reset() override; virtual void pcb_reset() override;
@ -738,7 +731,6 @@ public:
// construction/destruction // construction/destruction
nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override;
virtual void pcb_reset() override; virtual void pcb_reset() override;

1
src/devices/bus/nes/nxrom.h
View File

@ -178,7 +178,6 @@ public:
// construction/destruction // construction/destruction
nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual uint8_t chr_r(offs_t offset) override; virtual uint8_t chr_r(offs_t offset) override;
virtual void chr_w(offs_t offset, uint8_t data) override; virtual void chr_w(offs_t offset, uint8_t data) override;
}; };

1
src/devices/bus/nes/sachen.h
View File

@ -184,7 +184,6 @@ public:
// construction/destruction // construction/destruction
nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual uint8_t read_l(offs_t offset) override { return 0xff; } // no read_l here virtual uint8_t read_l(offs_t offset) override { return 0xff; } // no read_l here
virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_l(offs_t offset, uint8_t data) override;
}; };

2
src/devices/bus/nes/txc.h
View File

@ -40,7 +40,6 @@ public:
// construction/destruction // construction/destruction
nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override;
}; };
@ -53,7 +52,6 @@ public:
// construction/destruction // construction/destruction
nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual uint8_t read_l(offs_t offset) override; virtual uint8_t read_l(offs_t offset) override;
}; };