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

move ULA struct out of global namespace (nw)

Browse Source
This commit is contained in:
smf- 2017-12-11 18:34:33 +00:00
parent 869185e70b
commit 84c968e516
2 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/mame/drivers/accomm.cpp
View File

@ -39,35 +39,6 @@
#define INT_SET 0x100 #define INT_SET 0x100
#define INT_CLEAR 0x200 #define INT_CLEAR 0x200
/* ULA context */
struct ULA
{
uint8_t interrupt_status;
uint8_t interrupt_control;
uint8_t rompage;
uint16_t screen_start;
uint16_t screen_base;
int screen_size;
uint16_t screen_addr;
uint8_t *vram;
int current_pal[16];
int communication_mode;
int screen_mode;
int shiftlock_mode;
int capslock_mode;
// int scanline;
/* tape reading related */
uint32_t tape_value;
int tape_steps;
int bit_count;
int high_tone_set;
int start_bit;
int stop_bit;
int tape_running;
uint8_t tape_byte;
};
class accomm_state : public driver_device class accomm_state : public driver_device
{ {
public: public:
@ -125,6 +96,37 @@ protected:
private: private:
bool m_ch00rom_enabled; bool m_ch00rom_enabled;
/* ULA context */
struct ULA
{
uint8_t interrupt_status;
uint8_t interrupt_control;
uint8_t rompage;
uint16_t screen_start;
uint16_t screen_base;
int screen_size;
uint16_t screen_addr;
uint8_t *vram;
int current_pal[16];
int communication_mode;
int screen_mode;
int shiftlock_mode;
int capslock_mode;
// int scanline;
/* tape reading related */
uint32_t tape_value;
int tape_steps;
int bit_count;
int high_tone_set;
int start_bit;
int stop_bit;
int tape_running;
uint8_t tape_byte;
};
ULA m_ula; ULA m_ula;
int m_map4[256]; int m_map4[256];
int m_map16[256]; int m_map16[256];

41
src/mame/includes/electron.h
View File

@ -30,6 +30,26 @@
#define INT_SET 0x100 #define INT_SET 0x100
#define INT_CLEAR 0x200 #define INT_CLEAR 0x200
class electron_state : public driver_device
{
public:
enum
{
TIMER_TAPE_HANDLER,
TIMER_SETUP_BEEP,
TIMER_SCANLINE_INTERRUPT
};
electron_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette"),
m_beeper(*this, "beeper"),
m_keybd(*this, "LINE.%u", 0),
m_exp(*this, "exp"),
m_ram(*this, RAM_TAG)
{ }
/* ULA context */ /* ULA context */
struct ULA struct ULA
@ -59,27 +79,6 @@ struct ULA
uint8_t tape_byte; uint8_t tape_byte;
}; };
class electron_state : public driver_device
{
public:
enum
{
TIMER_TAPE_HANDLER,
TIMER_SETUP_BEEP,
TIMER_SCANLINE_INTERRUPT
};
electron_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette"),
m_beeper(*this, "beeper"),
m_keybd(*this, "LINE.%u", 0),
m_exp(*this, "exp"),
m_ram(*this, RAM_TAG)
{ }
ULA m_ula; ULA m_ula;
emu_timer *m_tape_timer; emu_timer *m_tape_timer;
int m_map4[256]; int m_map4[256];