Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-25 15:25:33 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved enum into class, machine_type_t conflicts with apple2.h but that is much harder to fix (nw)

Browse Source
This commit is contained in:
smf- 2017-12-11 21:37:48 +00:00
parent 58ecdb8203
commit 3070c7e386
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mame/includes/bbc.h
View File

@ -43,23 +43,6 @@
#define RS232_TAG "rs232" #define RS232_TAG "rs232"
enum machine_type_t
{
MODELA,
MODELB,
BPLUS,
MASTER,
COMPACT
};
enum monitor_type_t
{
COLOUR = 0,
BLACKWHITE = 1,
GREEN = 2,
AMBER = 3
};
class bbc_state : public driver_device class bbc_state : public driver_device
{ {
public: public:
@ -111,6 +94,23 @@ public:
m_bbcconfig(*this, "BBCCONFIG") m_bbcconfig(*this, "BBCCONFIG")
{ } { }
enum machine_type_t
{
MODELA,
MODELB,
BPLUS,
MASTER,
COMPACT
};
enum monitor_type_t
{
COLOUR = 0,
BLACKWHITE = 1,
GREEN = 2,
AMBER = 3
};
DECLARE_FLOPPY_FORMATS(floppy_formats_bbc); DECLARE_FLOPPY_FORMATS(floppy_formats_bbc);
DECLARE_FLOPPY_FORMATS(floppy_formats_bbcm); DECLARE_FLOPPY_FORMATS(floppy_formats_bbcm);
DECLARE_FLOPPY_FORMATS(floppy_formats_bbcmc); DECLARE_FLOPPY_FORMATS(floppy_formats_bbcmc);