Skip to content

Commit

Permalink
Cleanups and version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mmicko committed Jan 28, 2015
1 parent 13b862c commit 26e7a17
Show file tree
Hide file tree
Showing 224 changed files with 3,673 additions and 3,714 deletions.
4 changes: 2 additions & 2 deletions hash/lantutor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<publisher>Texas Instruments</publisher>
<part name="cart" interface="lantutor">
<dataarea name="rom" size="0x10000">
<!-- <rom name="cd2315.vsm" size="0x4000" crc="" sha1="" offset="0x0000" /> -->
<!-- <rom name="cd2316.vsm" size="0x4000" crc="" sha1="" offset="0x4000" /> -->
<!-- <rom name="cd2315.vsm" size="0x4000" crc="" sha1="" offset="0x0000" /> -->
<!-- <rom name="cd2316.vsm" size="0x4000" crc="" sha1="" offset="0x4000" /> -->
<rom name="cd2317.vsm" size="0x4000" crc="53231c0b" sha1="472117c3d0e28437fa8faa054f98088e06efc2a1" offset="0x8000" />
<rom name="cd2318.vsm" size="0x4000" crc="6c0727bc" sha1="132e39755b122f2cbec6f3e767f5d256a9c1e7ae" offset="0xc000" />
</dataarea>
Expand Down
2 changes: 1 addition & 1 deletion hash/pasogo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
<softwarelist name="pasogo" description="Koei PasoGo cartridges">

<!--
<!--
Koei PasoGo (パソ碁) undumped games
Taikyoku-kun I ~ 対局くん I [KS-1001]
Expand Down
1 change: 0 additions & 1 deletion src/emu/bus/a8sio/a8sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,3 @@ WRITE_LINE_MEMBER( device_a8sio_card_interface::motor_w )
SLOT_INTERFACE_START(a8sio_cards)
SLOT_INTERFACE("cassette", A8SIO_CASSETTE)
SLOT_INTERFACE_END

1 change: 0 additions & 1 deletion src/emu/bus/a8sio/cassette.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,3 @@ void a8sio_cassette_device::device_timer(emu_timer &timer, device_timer_id id, i
break;
}
}

18 changes: 9 additions & 9 deletions src/emu/bus/nes_ctrl/4score.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
TODO: current implementation is a HACK, due to limitations of the
TODO: current implementation is a HACK, due to limitations of the
slot system!
A real Four Score would be connected to both the controller ports of
the NES, but current core cannot emulate something like this until
devices can live their own life and being connected to other devices
at request.
In current implementation the device has to be mounted separately in
In current implementation the device has to be mounted separately in
the two ports and each enables 2 inputs (this is more or less as hacky
as the non-slot previous one, where the 4 ports were always available
to the emulated system, but it's not a great consolation :( )
Expand All @@ -22,7 +22,7 @@
since we could at best have two switches to disable the second player
inputs.
Note: Two Pads are hardcoded in inputs below, instead of acting as
Note: Two Pads are hardcoded in inputs below, instead of acting as
passthrough for 2 standard joypad devices, in order to show in the
internal UI that they belong to P1+P3 and P2+P4, otherwise they would
be listed as P1+P2 and P3+P4 respectively. This *HAS* to be changed
Expand Down Expand Up @@ -171,20 +171,20 @@ void nes_4score_p1p3_device::write(UINT8 data)
{
if (data & 0x01)
return;

// P3 & P4 inputs in NES Four Score are read serially with P1 & P2
m_latch = m_joypad1->read();
m_latch |= (m_joypad3->read() << 8); // pad 3
m_latch |= (m_joypad3->read() << 8); // pad 3
m_latch |= (0x08 << 16); // signature
}

void nes_4score_p2p4_device::write(UINT8 data)
{
if (data & 0x01)
return;

// P3 & P4 inputs in NES Four Score are read serially with P1 & P2
m_latch = m_joypad2->read();
m_latch |= (m_joypad4->read() << 8); // pad 4
m_latch |= (m_joypad4->read() << 8); // pad 4
m_latch |= (0x04 << 16); // signature
}
10 changes: 5 additions & 5 deletions src/emu/bus/nes_ctrl/4score.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ class nes_4score_p1p3_device : public nes_4score_device
public:
// construction/destruction
nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);

virtual ioport_constructor device_input_ports() const;

protected:
virtual void write(UINT8 data);

private:
required_ioport m_joypad1;
required_ioport m_joypad3;
Expand All @@ -67,10 +67,10 @@ class nes_4score_p2p4_device : public nes_4score_device
nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);

virtual ioport_constructor device_input_ports() const;

protected:
virtual void write(UINT8 data);

private:
required_ioport m_joypad2;
required_ioport m_joypad4;
Expand Down
4 changes: 2 additions & 2 deletions src/emu/bus/nes_ctrl/arkpaddle.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ UINT8 nes_vaus_device::read_bit34()
UINT8 nes_vausfc_device::read_exp(offs_t offset)
{
UINT8 ret = 0;
if (offset == 0) //$4016
if (offset == 0) //$4016
ret = m_button->read() << 1;
else //$4017
else //$4017
{
ret = (m_latch & 0x80) >> 6;
m_latch <<= 1;
Expand Down
2 changes: 1 addition & 1 deletion src/emu/bus/nes_ctrl/arkpaddle.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class nes_vausfc_device : public nes_vaus_device
public:
// construction/destruction
nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);

protected:
virtual UINT8 read_bit34() { return 0; }
virtual UINT8 read_exp(offs_t offset);
Expand Down
26 changes: 13 additions & 13 deletions src/emu/bus/nes_ctrl/bcbattle.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
TODO: this should be actually emulated as a standalone system with
a few 7segments LEDs, once we get a dump of its BIOS
At the moment we only emulated the connection with a Famicom
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
Expand Down Expand Up @@ -57,26 +57,26 @@ void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int
if (m_reader->get_byte_length() == 13)
{
for (int i = 0; i < 13; i++)
m_current_barcode[i] = m_reader->read_code() + '0';
m_current_barcode[i] = m_reader->read_code() + '0';
}
else if (m_reader->get_byte_length() == 8)
{
for (int i = 0; i < 5; i++)
m_current_barcode[i] = 0x20;
m_current_barcode[i] = 0x20;
for (int i = 5; i < 13; i++)
m_current_barcode[i] = m_reader->read_code() + '0';
m_current_barcode[i] = m_reader->read_code() + '0';
}
// read one more, to reset the internal byte counter
m_reader->read_code();

// the string "SUNSOFT" is accepted as well by Barcode World
m_current_barcode[13] = 'E';
m_current_barcode[14] = 'P';
m_current_barcode[15] = 'O';
m_current_barcode[16] = 'C';
m_current_barcode[17] = 'H';
m_current_barcode[18] = 0x0d;
m_current_barcode[19] = 0x0a;
m_current_barcode[13] = 'E';
m_current_barcode[14] = 'P';
m_current_barcode[15] = 'O';
m_current_barcode[16] = 'C';
m_current_barcode[17] = 'H';
m_current_barcode[18] = 0x0d;
m_current_barcode[19] = 0x0a;
m_pending_code = 1;
}
m_new_code = m_reader->get_pending_code();
Expand Down Expand Up @@ -110,7 +110,7 @@ void nes_bcbattle_device::device_start()
// and sending the proper serial bits, instead of our read_current_bit() function!
battler_timer = timer_alloc(TIMER_BATTLER);
battler_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1000));

save_item(NAME(m_current_barcode));
save_item(NAME(m_new_code));
save_item(NAME(m_pending_code));
Expand Down Expand Up @@ -184,7 +184,7 @@ int nes_bcbattle_device::read_current_bit()
UINT8 nes_bcbattle_device::read_exp(offs_t offset)
{
UINT8 ret = 0;
if (offset == 1) //$4017
if (offset == 1) //$4017
{
ret |= read_current_bit() << 2;
}
Expand Down
22 changes: 11 additions & 11 deletions src/emu/bus/nes_ctrl/ctrl.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**********************************************************************
Nintendo Family Computer & Entertainment System controller ports
Nintendo Family Computer & Entertainment System controller ports
and Family Computer expansion port emulation
Here we emulate in fact 3 different kind of ports, which are
Expand All @@ -9,31 +9,31 @@
corresponding address ($4016 for port1, $4017 for port2)
- FC controller ports: these are only hooked to bit 0 of the
corresponding address (so that e.g. a NES Zapper could not
be connected to a later FC AV model, because its inputs
be connected to a later FC AV model, because its inputs
would not be detected)
- FC expansion port: this is hooked to bits 0-4 of both addresses
To make things a little bit more complex, old FC models have the
controller hardwired to the unit, and the P2 controllers are
directly hooked also to one of the expansion port lines (namely,
directly hooked also to one of the expansion port lines (namely,
microphone inputs from P2 go to $4016 bit 2)
Even if the controller port and the expansion port are
Even if the controller port and the expansion port are
physically different (the FC expansion is a 15pin port, while
the controller ports are 7pin), we emulate them as variants of a
common device, exposing the following handlers:
- read_bit0: for bit0 reads, which are typically used for serial
inputs from controllers
- read_bit34: for bit3,4 reading, expected to be at the correct
offset (but we don't currently check for read_bit34 & 0xf8==0)
- read_exp: for reads going through the expansion, with a offset
- read_exp: for reads going through the expansion, with a offset
parameter to decide whether we are reading from $4016 and $4017
- write: to acknowledge writes to $4016
The driver emulation will take care to only call the correct
handlers they have hooks for: Basic usage is that the expansion
port calls read_exp, FC ctrl ports call read_bit0, and NES ctrl
ports call both read_bit0 and read_bit34. However, to cope with
the original FC microphone, we will have the second controller
The driver emulation will take care to only call the correct
handlers they have hooks for: Basic usage is that the expansion
port calls read_exp, FC ctrl ports call read_bit0, and NES ctrl
ports call both read_bit0 and read_bit34. However, to cope with
the original FC microphone, we will have the second controller
port calling read_exp too.
Copyright MESS Team.
Expand Down Expand Up @@ -168,7 +168,7 @@ SLOT_INTERFACE_START( nes_control_port1_devices )
SLOT_INTERFACE("joypad", NES_JOYPAD)
SLOT_INTERFACE("zapper", NES_ZAPPER)
SLOT_INTERFACE("4score_p1p3", NES_4SCORE_P1P3)
// SLOT_INTERFACE("miracle_piano", NES_MIRACLE)
// SLOT_INTERFACE("miracle_piano", NES_MIRACLE)
SLOT_INTERFACE_END

SLOT_INTERFACE_START( nes_control_port2_devices )
Expand Down
6 changes: 3 additions & 3 deletions src/emu/bus/nes_ctrl/ctrl.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**********************************************************************
Nintendo Family Computer & Entertainment System controller port
Nintendo Family Computer & Entertainment System controller port
emulation
Copyright MESS Team.
Expand Down Expand Up @@ -32,12 +32,12 @@ class device_nes_control_port_interface : public device_slot_card_interface
// construction/destruction
device_nes_control_port_interface(const machine_config &mconfig, device_t &device);
virtual ~device_nes_control_port_interface();

virtual UINT8 read_bit0() { return 0; };
virtual UINT8 read_bit34() { return 0; };
virtual UINT8 read_exp(offs_t offset) { return 0; };
virtual void write(UINT8 data) { };

protected:
nes_control_port_device *m_port;
};
Expand Down
Loading

1 comment on commit 26e7a17

@ramiropolla
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tag in this commit was lightweight, not annotated. As a result, git describe still refers to mame0157. Are future releases going to be annotated again, like 0156 and 0157 were?

Please sign in to comment.