Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

fmtowns: reduced tagmap usage (memory banks still to look at) (no whatsnew)

Browse Source
This commit is contained in:
mahlemiut 2014-02-25 22:59:27 +00:00
parent 9e8a7f19b1
commit 13b36398f9
3 changed files with 74 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/mess/drivers/fmtowns.c
View File

@ -218,7 +218,7 @@ void towns_state::init_serial_rom(running_machine &machine)
// TODO: init serial ROM contents // TODO: init serial ROM contents
int x; int x;
static const UINT8 code[8] = { 0x04,0x65,0x54,0xA4,0x95,0x45,0x35,0x5F }; static const UINT8 code[8] = { 0x04,0x65,0x54,0xA4,0x95,0x45,0x35,0x5F };
UINT8* srom = machine.root_device().memregion("serial")->base(); UINT8* srom = m_serial->base();
memset(m_towns_serial_rom,0,256/8); memset(m_towns_serial_rom,0,256/8);
@ -646,21 +646,21 @@ void towns_state::kb_sendcode(UINT8 scancode, int release)
case 0: // key press case 0: // key press
m_towns_kb_output = 0x80; m_towns_kb_output = 0x80;
m_towns_kb_extend = scancode & 0x7f; m_towns_kb_extend = scancode & 0x7f;
if(ioport("key3")->read() & 0x00080000) if(m_key3->read() & 0x00080000)
m_towns_kb_output |= 0x04; m_towns_kb_output |= 0x04;
if(ioport("key3")->read() & 0x00040000) if(m_key3->read() & 0x00040000)
m_towns_kb_output |= 0x08; m_towns_kb_output |= 0x08;
if(ioport("key3")->read() & 0x06400000) if(m_key3->read() & 0x06400000)
m_towns_kb_output |= 0x20; m_towns_kb_output |= 0x20;
break; break;
case 1: // key release case 1: // key release
m_towns_kb_output = 0x90; m_towns_kb_output = 0x90;
m_towns_kb_extend = scancode & 0x7f; m_towns_kb_extend = scancode & 0x7f;
if(ioport("key3")->read() & 0x00080000) if(m_key3->read() & 0x00080000)
m_towns_kb_output |= 0x04; m_towns_kb_output |= 0x04;
if(ioport("key3")->read() & 0x00040000) if(m_key3->read() & 0x00040000)
m_towns_kb_output |= 0x08; m_towns_kb_output |= 0x08;
if(ioport("key3")->read() & 0x06400000) if(m_key3->read() & 0x06400000)
m_towns_kb_output |= 0x20; m_towns_kb_output |= 0x20;
break; break;
case 2: // extended byte case 2: // extended byte
@ -679,7 +679,7 @@ void towns_state::kb_sendcode(UINT8 scancode, int release)
void towns_state::poll_keyboard() void towns_state::poll_keyboard()
{ {
static const char *const kb_ports[4] = { "key1", "key2", "key3", "key4" }; ioport_port* kb_ports[4] = { m_key1, m_key2, m_key3, m_key4 };
int port,bit; int port,bit;
UINT8 scan; UINT8 scan;
UINT32 portval; UINT32 portval;
@ -687,7 +687,7 @@ void towns_state::poll_keyboard()
scan = 0; scan = 0;
for(port=0;port<4;port++) for(port=0;port<4;port++)
{ {
portval = ioport(kb_ports[port])->read(); portval = kb_ports[port]->read();
for(bit=0;bit<32;bit++) for(bit=0;bit<32;bit++)
{ {
if(((portval & (1<<bit))) != ((m_kb_prev[port] & (1<<bit)))) if(((portval & (1<<bit))) != ((m_kb_prev[port] & (1<<bit))))
@ -885,7 +885,7 @@ void towns_state::mouse_timeout()
READ8_MEMBER(towns_state::towns_padport_r) READ8_MEMBER(towns_state::towns_padport_r)
{ {
UINT8 ret = 0x00; UINT8 ret = 0x00;
UINT32 porttype = ioport("ctrltype")->read(); UINT32 porttype = m_ctrltype->read();
UINT8 extra1; UINT8 extra1;
UINT8 extra2; UINT8 extra2;
UINT32 state; UINT32 state;
@ -894,12 +894,12 @@ READ8_MEMBER(towns_state::towns_padport_r)
{ {
if((porttype & 0x0f) == 0x01) if((porttype & 0x0f) == 0x01)
{ {
extra1 = ioport("joy1_ex")->read(); extra1 = m_joy1_ex->read();
if(m_towns_pad_mask & 0x10) if(m_towns_pad_mask & 0x10)
ret |= (ioport("joy1")->read() & 0x3f) | 0x40; ret |= (m_joy1->read() & 0x3f) | 0x40;
else else
ret |= (ioport("joy1")->read() & 0x0f) | 0x30; ret |= (m_joy1->read() & 0x0f) | 0x30;
if(extra1 & 0x01) // Run button = left+right if(extra1 & 0x01) // Run button = left+right
ret &= ~0x0c; ret &= ~0x0c;
@ -913,12 +913,12 @@ READ8_MEMBER(towns_state::towns_padport_r)
} }
if((porttype & 0x0f) == 0x04) // 6-button joystick if((porttype & 0x0f) == 0x04) // 6-button joystick
{ {
extra1 = ioport("6b_joy1_ex")->read(); extra1 = m_6b_joy1_ex->read();
if(m_towns_pad_mask & 0x10) if(m_towns_pad_mask & 0x10)
ret |= 0x7f; ret |= 0x7f;
else else
ret |= (ioport("6b_joy1")->read() & 0x0f) | 0x70; ret |= (m_6b_joy1->read() & 0x0f) | 0x70;
if(!(m_towns_pad_mask & 0x10)) if(!(m_towns_pad_mask & 0x10))
{ {
@ -967,7 +967,7 @@ READ8_MEMBER(towns_state::towns_padport_r)
} }
// button states are always visible // button states are always visible
state = ioport("mouse1")->read(); state = m_mouse1->read();
if(!(state & 0x01)) if(!(state & 0x01))
ret |= 0x10; ret |= 0x10;
if(!(state & 0x02)) if(!(state & 0x02))
@ -981,12 +981,12 @@ READ8_MEMBER(towns_state::towns_padport_r)
{ {
if((porttype & 0xf0) == 0x10) if((porttype & 0xf0) == 0x10)
{ {
extra2 = ioport("joy2_ex")->read(); extra2 = m_joy2_ex->read();
if(m_towns_pad_mask & 0x20) if(m_towns_pad_mask & 0x20)
ret |= ((ioport("joy2")->read() & 0x3f)) | 0x40; ret |= ((m_joy2->read() & 0x3f)) | 0x40;
else else
ret |= ((ioport("joy2")->read() & 0x0f)) | 0x30; ret |= ((m_joy2->read() & 0x0f)) | 0x30;
if(extra2 & 0x01) if(extra2 & 0x01)
ret &= ~0x0c; ret &= ~0x0c;
@ -1000,12 +1000,12 @@ READ8_MEMBER(towns_state::towns_padport_r)
} }
if((porttype & 0xf0) == 0x40) // 6-button joystick if((porttype & 0xf0) == 0x40) // 6-button joystick
{ {
extra2 = ioport("6b_joy2_ex")->read(); extra2 = m_6b_joy2_ex->read();
if(m_towns_pad_mask & 0x20) if(m_towns_pad_mask & 0x20)
ret |= 0x7f; ret |= 0x7f;
else else
ret |= ((ioport("6b_joy2")->read() & 0x0f)) | 0x70; ret |= ((m_6b_joy2->read() & 0x0f)) | 0x70;
if(!(m_towns_pad_mask & 0x10)) if(!(m_towns_pad_mask & 0x10))
{ {
@ -1054,7 +1054,7 @@ READ8_MEMBER(towns_state::towns_padport_r)
} }
// button states are always visible // button states are always visible
state = ioport("mouse1")->read(); state = m_mouse1->read();
if(!(state & 0x01)) if(!(state & 0x01))
ret |= 0x10; ret |= 0x10;
if(!(state & 0x02)) if(!(state & 0x02))
@ -1070,7 +1070,7 @@ READ8_MEMBER(towns_state::towns_padport_r)
WRITE8_MEMBER(towns_state::towns_pad_mask_w) WRITE8_MEMBER(towns_state::towns_pad_mask_w)
{ {
UINT8 current_x,current_y; UINT8 current_x,current_y;
UINT32 type = ioport("ctrltype")->read(); UINT32 type = m_ctrltype->read();
m_towns_pad_mask = (data & 0xff); m_towns_pad_mask = (data & 0xff);
if((type & 0x0f) == 0x02) // mouse if((type & 0x0f) == 0x02) // mouse
@ -1080,8 +1080,8 @@ WRITE8_MEMBER(towns_state::towns_pad_mask_w)
if(m_towns_mouse_output == MOUSE_START) if(m_towns_mouse_output == MOUSE_START)
{ {
m_towns_mouse_output = MOUSE_X_HIGH; m_towns_mouse_output = MOUSE_X_HIGH;
current_x = ioport("mouse2")->read(); current_x = m_mouse2->read();
current_y = ioport("mouse3")->read(); current_y = m_mouse3->read();
m_towns_mouse_x = m_prev_x - current_x; m_towns_mouse_x = m_prev_x - current_x;
m_towns_mouse_y = m_prev_y - current_y; m_towns_mouse_y = m_prev_y - current_y;
m_prev_x = current_x; m_prev_x = current_x;
@ -1096,8 +1096,8 @@ WRITE8_MEMBER(towns_state::towns_pad_mask_w)
if(m_towns_mouse_output == MOUSE_START) if(m_towns_mouse_output == MOUSE_START)
{ {
m_towns_mouse_output = MOUSE_SYNC; m_towns_mouse_output = MOUSE_SYNC;
current_x = ioport("mouse2")->read(); current_x = m_mouse2->read();
current_y = ioport("mouse3")->read(); current_y = m_mouse3->read();
m_towns_mouse_x = m_prev_x - current_x; m_towns_mouse_x = m_prev_x - current_x;
m_towns_mouse_y = m_prev_y - current_y; m_towns_mouse_y = m_prev_y - current_y;
m_prev_x = current_x; m_prev_x = current_x;
@ -1116,8 +1116,8 @@ WRITE8_MEMBER(towns_state::towns_pad_mask_w)
if(m_towns_mouse_output == MOUSE_START) if(m_towns_mouse_output == MOUSE_START)
{ {
m_towns_mouse_output = MOUSE_X_HIGH; m_towns_mouse_output = MOUSE_X_HIGH;
current_x = ioport("mouse2")->read(); current_x = m_mouse2->read();
current_y = ioport("mouse3")->read(); current_y = m_mouse3->read();
m_towns_mouse_x = m_prev_x - current_x; m_towns_mouse_x = m_prev_x - current_x;
m_towns_mouse_y = m_prev_y - current_y; m_towns_mouse_y = m_prev_y - current_y;
m_prev_x = current_x; m_prev_x = current_x;
@ -1132,8 +1132,8 @@ WRITE8_MEMBER(towns_state::towns_pad_mask_w)
if(m_towns_mouse_output == MOUSE_START) if(m_towns_mouse_output == MOUSE_START)
{ {
m_towns_mouse_output = MOUSE_SYNC; m_towns_mouse_output = MOUSE_SYNC;
current_x = ioport("mouse2")->read(); current_x = m_mouse2->read();
current_y = ioport("mouse3")->read(); current_y = m_mouse3->read();
m_towns_mouse_x = m_prev_x - current_x; m_towns_mouse_x = m_prev_x - current_x;
m_towns_mouse_y = m_prev_y - current_y; m_towns_mouse_y = m_prev_y - current_y;
m_prev_x = current_x; m_prev_x = current_x;
@ -1192,7 +1192,7 @@ void towns_state::towns_update_video_banks(address_space& space)
if(m_towns_mainmem_enable != 0) // first MB is RAM if(m_towns_mainmem_enable != 0) // first MB is RAM
{ {
ROM = state->memregion("user")->base(); ROM = m_user->base();
// state->membank(1)->set_base(m_messram->pointer()+0xc0000); // state->membank(1)->set_base(m_messram->pointer()+0xc0000);
// state->membank(2)->set_base(m_messram->pointer()+0xc8000); // state->membank(2)->set_base(m_messram->pointer()+0xc8000);
@ -1211,7 +1211,7 @@ void towns_state::towns_update_video_banks(address_space& space)
} }
else // enable I/O ports and VRAM else // enable I/O ports and VRAM
{ {
ROM = state->memregion("user")->base(); ROM = m_user->base();
// state->membank(1)->set_base(towns_gfxvram+(towns_vram_rplane*0x8000)); // state->membank(1)->set_base(towns_gfxvram+(towns_vram_rplane*0x8000));
// state->membank(2)->set_base(towns_txtvram); // state->membank(2)->set_base(towns_txtvram);

39
src/mess/includes/fmtowns.h
View File

@ -87,7 +87,25 @@ class towns_state : public driver_device
m_dma_2(*this, "dma_2"), m_dma_2(*this, "dma_2"),
m_ram(*this, RAM_TAG), m_ram(*this, RAM_TAG),
m_nvram(*this, "nvram"), m_nvram(*this, "nvram"),
m_nvram16(*this, "nvram16") m_nvram16(*this, "nvram16"),
m_ctrltype(*this, "ctrltype"),
m_key1(*this, "key1"),
m_key2(*this, "key2"),
m_key3(*this, "key3"),
m_key4(*this, "key4"),
m_joy1(*this, "joy1"),
m_joy2(*this, "joy2"),
m_joy1_ex(*this, "joy1_ex"),
m_joy2_ex(*this, "joy2_ex"),
m_6b_joy1(*this, "6b_joy1"),
m_6b_joy2(*this, "6b_joy2"),
m_6b_joy1_ex(*this, "6b_joy1_ex"),
m_6b_joy2_ex(*this, "6b_joy2_ex"),
m_mouse1(*this, "mouse1"),
m_mouse2(*this, "mouse2"),
m_mouse3(*this, "mouse3"),
m_user(*this,"user"),
m_serial(*this,"serial")
{ } { }
/* devices */ /* devices */
@ -255,6 +273,25 @@ class towns_state : public driver_device
void speaker_set_input(UINT8 data); void speaker_set_input(UINT8 data);
UINT8 towns_cdrom_read_byte_software(); UINT8 towns_cdrom_read_byte_software();
required_ioport m_ctrltype;
required_ioport m_key1;
required_ioport m_key2;
required_ioport m_key3;
required_ioport m_key4;
required_ioport m_joy1;
required_ioport m_joy2;
required_ioport m_joy1_ex;
required_ioport m_joy2_ex;
required_ioport m_6b_joy1;
required_ioport m_6b_joy2;
required_ioport m_6b_joy1_ex;
required_ioport m_6b_joy2_ex;
required_ioport m_mouse1;
required_ioport m_mouse2;
required_ioport m_mouse3;
required_memory_region m_user;
optional_memory_region m_serial;
private: private:
static const device_timer_id TIMER_RTC = 0; static const device_timer_id TIMER_RTC = 0;
static const device_timer_id TIMER_FREERUN = 1; static const device_timer_id TIMER_FREERUN = 1;

6
src/mess/video/fmtowns.c
View File

@ -245,7 +245,7 @@ void towns_state::towns_update_kanji_offset()
READ8_MEMBER( towns_state::towns_video_cff80_r ) READ8_MEMBER( towns_state::towns_video_cff80_r )
{ {
UINT8* ROM = memregion("user")->base(); UINT8* ROM = m_user->base();
switch(offset) switch(offset)
{ {
@ -588,7 +588,7 @@ READ8_MEMBER(towns_state::towns_video_unknown_r)
READ8_MEMBER(towns_state::towns_spriteram_low_r) READ8_MEMBER(towns_state::towns_spriteram_low_r)
{ {
UINT8* RAM = m_messram->pointer(); UINT8* RAM = m_messram->pointer();
UINT8* ROM = memregion("user")->base(); UINT8* ROM = m_user->base();
if(offset < 0x1000) if(offset < 0x1000)
{ // 0xc8000-0xc8fff { // 0xc8000-0xc8fff
@ -1651,7 +1651,7 @@ void towns_state::render_text_char(UINT8 x, UINT8 y, UINT8 ascii, UINT16 jis, UI
UINT8 colour; UINT8 colour;
UINT8 data; UINT8 data;
UINT8 temp; UINT8 temp;
UINT8* font_rom = memregion("user")->base(); UINT8* font_rom = m_user->base();
int a,b; int a,b;
// all characters are 16 pixels high // all characters are 16 pixels high