Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fmtowns: oops (nw)

Browse Source
This commit is contained in:
cracyc 2018-01-28 08:54:22 -06:00
parent 1b1dc40e09
commit fe23e8d900
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mame/includes/fmtowns.h
View File

@ -17,6 +17,7 @@
#include "machine/upd71071.h" #include "machine/upd71071.h"
#include "machine/wd_fdc.h" #include "machine/wd_fdc.h"
#include "machine/i8251.h" #include "machine/i8251.h"
#include "machine/msm58321.h"
#include "sound/2612intf.h" #include "sound/2612intf.h"
#include "sound/cdda.h" #include "sound/cdda.h"
#include "sound/rf5c68.h" #include "sound/rf5c68.h"
@ -106,6 +107,7 @@ class towns_state : public driver_device
m_i8251(*this, "i8251"), m_i8251(*this, "i8251"),
m_rs232(*this, "rs232c"), m_rs232(*this, "rs232c"),
m_screen(*this, "screen"), m_screen(*this, "screen"),
m_rtc(*this, "rtc58321"),
m_nvram(*this, "nvram"), m_nvram(*this, "nvram"),
m_nvram16(*this, "nvram16"), m_nvram16(*this, "nvram16"),
m_ctrltype(*this, "ctrltype"), m_ctrltype(*this, "ctrltype"),
@ -144,6 +146,7 @@ class towns_state : public driver_device
required_device<i8251_device> m_i8251; required_device<i8251_device> m_i8251;
required_device<rs232_port_device> m_rs232; required_device<rs232_port_device> m_rs232;
required_device<screen_device> m_screen; required_device<screen_device> m_screen;
required_device<msm58321_device> m_rtc;
ram_device* m_messram; ram_device* m_messram;
cdrom_image_device* m_cdrom; cdrom_image_device* m_cdrom;
cdda_device* m_cdda; cdda_device* m_cdda;
@ -174,8 +177,6 @@ class towns_state : public driver_device
uint8_t m_towns_srom_reset; uint8_t m_towns_srom_reset;
uint8_t m_towns_rtc_select; uint8_t m_towns_rtc_select;
uint8_t m_towns_rtc_data; uint8_t m_towns_rtc_data;
uint8_t m_towns_rtc_reg[16];
emu_timer* m_towns_rtc_timer;
uint8_t m_towns_timer_mask; uint8_t m_towns_timer_mask;
uint16_t m_towns_machine_id; // default is 0x0101 uint16_t m_towns_machine_id; // default is 0x0101
uint8_t m_towns_kb_status; uint8_t m_towns_kb_status;
@ -312,11 +313,16 @@ class towns_state : public driver_device
DECLARE_READ8_MEMBER(towns_serial_r); DECLARE_READ8_MEMBER(towns_serial_r);
DECLARE_WRITE8_MEMBER(towns_serial_w); DECLARE_WRITE8_MEMBER(towns_serial_w);
DECLARE_WRITE_LINE_MEMBER(rtc_d0_w);
DECLARE_WRITE_LINE_MEMBER(rtc_d1_w);
DECLARE_WRITE_LINE_MEMBER(rtc_d2_w);
DECLARE_WRITE_LINE_MEMBER(rtc_d3_w);
DECLARE_WRITE_LINE_MEMBER(rtc_busy_w);
RF5C68_SAMPLE_END_CB_MEMBER(towns_pcm_irq); RF5C68_SAMPLE_END_CB_MEMBER(towns_pcm_irq);
void towns_update_video_banks(address_space&); void towns_update_video_banks(address_space&);
void init_serial_rom(); void init_serial_rom();
void init_rtc();
void kb_sendcode(uint8_t scancode, int release); void kb_sendcode(uint8_t scancode, int release);
uint8_t speaker_get_spk(); uint8_t speaker_get_spk();
void speaker_set_spkrdata(uint8_t data); void speaker_set_spkrdata(uint8_t data);
@ -344,7 +350,6 @@ class towns_state : public driver_device
void townshr(machine_config &config); void townshr(machine_config &config);
void townssj(machine_config &config); void townssj(machine_config &config);
private: private:
static const device_timer_id TIMER_RTC = 0;
static const device_timer_id TIMER_FREERUN = 1; static const device_timer_id TIMER_FREERUN = 1;
static const device_timer_id TIMER_INTERVAL2 = 2; static const device_timer_id TIMER_INTERVAL2 = 2;
static const device_timer_id TIMER_KEYBOARD = 3; static const device_timer_id TIMER_KEYBOARD = 3;
@ -352,7 +357,6 @@ private:
static const device_timer_id TIMER_WAIT = 5; static const device_timer_id TIMER_WAIT = 5;
static const device_timer_id TIMER_CDSTATUS = 6; static const device_timer_id TIMER_CDSTATUS = 6;
static const device_timer_id TIMER_CDDA = 7; static const device_timer_id TIMER_CDDA = 7;
void rtc_second();
void freerun_inc(); void freerun_inc();
void intervaltimer2_timeout(); void intervaltimer2_timeout();
void poll_keyboard(); void poll_keyboard();
@ -364,6 +368,9 @@ private:
void towns_cdrom_read(cdrom_image_device* device); void towns_cdrom_read(cdrom_image_device* device);
void towns_cd_status_ready(); void towns_cd_status_ready();
void towns_delay_cdda(cdrom_image_device* dev); void towns_delay_cdda(cdrom_image_device* dev);
u8 m_rtc_d;
bool m_rtc_busy;
public: public:
INTERRUPT_GEN_MEMBER(towns_vsync_irq); INTERRUPT_GEN_MEMBER(towns_vsync_irq);
TIMER_CALLBACK_MEMBER(towns_cdrom_read_byte); TIMER_CALLBACK_MEMBER(towns_cdrom_read_byte);
@ -397,8 +404,6 @@ public:
void towns_cdrom_set_irq(int line,int state); void towns_cdrom_set_irq(int line,int state);
uint8_t towns_cd_get_track(); uint8_t towns_cd_get_track();
DECLARE_READ16_MEMBER(towns_cdrom_dma_r); DECLARE_READ16_MEMBER(towns_cdrom_dma_r);
void rtc_hour();
void rtc_minute();
DECLARE_READ16_MEMBER(towns_scsi_dma_r); DECLARE_READ16_MEMBER(towns_scsi_dma_r);
DECLARE_WRITE16_MEMBER(towns_scsi_dma_w); DECLARE_WRITE16_MEMBER(towns_scsi_dma_w);
}; };