Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-28 19:14:55 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

skeleton/freedom220.cpp: Fix bad merge.

Browse Source
This commit is contained in:
Vas Crabb 2023-04-14 07:02:27 +10:00
parent 7d26d641d3
commit 4d969342a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/skeleton/freedom220.cpp
View File

@ -39,18 +39,19 @@
****************************************************************************/ ****************************************************************************/
#include "emu.h" #include "emu.h"
#include "bus/rs232/rs232.h" #include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h" #include "cpu/z80/z80.h"
#include "machine/i8251.h" #include "machine/i8251.h"
#include "machine/pit8253.h" #include "machine/pit8253.h"
#include "video/scn2674.h" #include "video/scn2674.h"
#include "emupal.h" #include "emupal.h"
#include "screen.h" #include "screen.h"
namespace { namespace {
//************************************************************************** //**************************************************************************
// TYPE DEFINITIONS // TYPE DEFINITIONS
//************************************************************************** //**************************************************************************
@ -104,7 +105,6 @@ private:
SCN2674_DRAW_CHARACTER_MEMBER(draw_character); SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
void nmi_control_w(uint8_t data); void nmi_control_w(uint8_t data);
void nmi_w(int state);
}; };