summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/smartmed.cpp
diff options
context:
space:
mode:
author David Haywood <28625134+DavidHaywood@users.noreply.github.com>2021-06-18 14:49:58 +0100
committer GitHub <noreply@github.com>2021-06-18 09:49:58 -0400
commitc585ae63ce3d6eabb540c092af11a50a1fb71f08 (patch)
tree4ac1457d3dcccff0ba0fc107a0800f259463d6a6 /src/devices/machine/smartmed.cpp
parent30d19a0fa35c0f7d5a2de3b44868b22a1db9027d (diff)
juicebox additions [David Haywood, Sean Riddle] (#8146)
New WORKING software list entries juicebox.xml: Teenage Mutant Ninja Turtles Volume 1 (H2692) [Sean Riddle, David Haywood] Teenage Mutant Ninja Turtles Episode 36 (H6260) [Sean Riddle, David Haywood] Juicebox Music Video - Avril Lavigne, The Calling, Avril Lavigne, Clay Aiken, Ruben Studdard (H6228) [Sean Riddle, David Haywood] Juicebox Music Video - Liz Phair, Stacie Orrico, Skye Sweetnam (H2709) [Sean Riddle, David Haywood] Juicebox Music Video - ZOEgirl, Jump5, Jump5, Baha Men, Atomic Kitten (H6232) [Sean Riddle, David Haywood] Juicebox Music Video - Baha Men, Jump 5, Jump 5, Beu Sisters, ZOEgirl (H6230A) [Sean Riddle, David Haywood] Juicebox Music Video - Ashlee Simpson, The Cure, Vanessa Carlton, fan_3, Ashlee Simpson (H6226) [Sean Riddle, David Haywood] Winx Club Volume 1 (H2686) [Sean Riddle, David Haywood] Winx Club Episode 103 (H6258) [Sean Riddle, David Haywood] Yu-Gi-Oh! Episode 175 (H8084) [Sean Riddle, David Haywood] Yu-Gi-Oh! Episode 176 (H8143) [Sean Riddle, David Haywood] Vans Pipeline Masters Volume 1 (H2690) [Sean Riddle, David Haywood] Streetball Classics Volume 1 (H7416) [Sean Riddle, David Haywood] Megas XLR Volume 1 (H2697) [Sean Riddle, David Haywood]
Diffstat (limited to 'src/devices/machine/smartmed.cpp')
-rw-r--r--src/devices/machine/smartmed.cpp109
1 files changed, 57 insertions, 52 deletions
diff --git a/src/devices/machine/smartmed.cpp b/src/devices/machine/smartmed.cpp
index 7e4153797f6..5b2fc3bb882 100644
--- a/src/devices/machine/smartmed.cpp
+++ b/src/devices/machine/smartmed.cpp
@@ -124,9 +124,8 @@ void nand_device::device_start()
image_init_result smartmedia_image_device::smartmedia_format_1()
{
SM_disk_image_header custom_header;
- int bytes_read;
- bytes_read = fread(&custom_header, sizeof(custom_header));
+ const int bytes_read = fread(&custom_header, sizeof(custom_header));
if (bytes_read != sizeof(custom_header))
{
return image_init_result::FAIL;
@@ -206,6 +205,7 @@ int smartmedia_image_device::detect_geometry( uint8_t id1, uint8_t id2)
{
switch (id2)
{
+ case 0x73 : m_page_data_size = 0x0200; m_num_pages = 0x08000; m_page_total_size = 0x0210; m_log2_pages_per_block = 5; result = true; break;
case 0x75 : m_page_data_size = 0x0200; m_num_pages = 0x10000; m_page_total_size = 0x0210; m_log2_pages_per_block = 5; result = true; break;
}
}
@@ -218,9 +218,8 @@ int smartmedia_image_device::detect_geometry( uint8_t id1, uint8_t id2)
image_init_result smartmedia_image_device::smartmedia_format_2()
{
disk_image_format_2_header custom_header;
- int bytes_read, i, j;
- bytes_read = fread(&custom_header, sizeof(custom_header));
+ const int bytes_read = fread(&custom_header, sizeof(custom_header));
if (bytes_read != sizeof(custom_header))
{
return image_init_result::FAIL;
@@ -236,7 +235,7 @@ image_init_result smartmedia_image_device::smartmedia_format_2()
return image_init_result::FAIL;
}
- m_data_ptr = auto_alloc_array(machine(), uint8_t, m_page_total_size*m_num_pages);
+ m_data_ptr = auto_alloc_array(machine(), uint8_t, m_page_total_size * m_num_pages);
m_data_uid_ptr = std::make_unique<uint8_t[]>(256 + 16);
m_mode = SM_M_INIT;
m_pointer_mode = SM_PM_A;
@@ -248,20 +247,21 @@ image_init_result smartmedia_image_device::smartmedia_format_2()
m_accumulated_status = 0;
m_pagereg = std::make_unique<uint8_t[]>(m_page_total_size);
m_id_len = 3;
- memcpy( m_id, custom_header.data1, m_id_len);
+ memcpy(m_id, custom_header.data1, m_id_len);
m_mp_opcode = 0;
m_col_address_cycles = 1;
m_row_address_cycles = (m_num_pages > 0x10000) ? 3 : 2;
m_sequential_row_read = 1;
- for (i=0;i<8;i++)
+ for (int i = 0; i < 8; i++)
{
- memcpy( m_data_uid_ptr.get() + i * 32, custom_header.data2, 16);
- for (j=0;j<16;j++) m_data_uid_ptr[i*32+16+j] = custom_header.data2[j] ^ 0xFF;
+ memcpy(m_data_uid_ptr.get() + i * 32, custom_header.data2, 16);
+ for (int j = 0; j < 16; j++)
+ m_data_uid_ptr[i * 32 + 16 + j] = custom_header.data2[j] ^ 0xFF;
}
- memcpy( m_data_uid_ptr.get() + 256, custom_header.data3, 16);
+ memcpy(m_data_uid_ptr.get() + 256, custom_header.data3, 16);
- fread(m_data_ptr, m_page_total_size*m_num_pages);
+ fread(m_data_ptr, m_page_total_size * m_num_pages);
#ifdef SMARTMEDIA_IMAGE_SAVE
m_image_format = 2;
@@ -279,9 +279,9 @@ image_init_result smartmedia_image_device::call_load()
result = smartmedia_format_1();
if (result != image_init_result::PASS)
{
- // try format 2
- fseek( position, SEEK_SET);
- result = smartmedia_format_2();
+ // try format 2
+ fseek(position, SEEK_SET);
+ result = smartmedia_format_2();
}
return result;
}
@@ -297,27 +297,26 @@ void smartmedia_image_device::call_unload()
if (m_image_format == 1)
{
SM_disk_image_header custom_header;
- int bytes_read;
- fseek( 0, SEEK_SET);
- bytes_read = fread( &custom_header, sizeof( custom_header));
- if (bytes_read == sizeof( custom_header))
+ fseek(0, SEEK_SET);
+ const int bytes_read = fread(&custom_header, sizeof(custom_header));
+ if (bytes_read == sizeof(custom_header))
{
if (custom_header.version == 0)
{
- fseek( 2 + 1, SEEK_CUR);
- fwrite( m_data_ptr, m_page_total_size * m_num_pages);
+ fseek(2 + 1, SEEK_CUR);
+ fwrite(m_data_ptr, m_page_total_size * m_num_pages);
}
else if (custom_header.version == 1)
{
- fseek( 3 + 1 + 256 + 16, SEEK_CUR);
- fwrite( m_data_ptr, m_page_total_size * m_num_pages);
+ fseek(3 + 1 + 256 + 16, SEEK_CUR);
+ fwrite(m_data_ptr, m_page_total_size * m_num_pages);
}
}
}
else if (m_image_format == 2)
{
- fseek( sizeof( disk_image_format_2_header), SEEK_SET);
- fwrite( m_data_ptr, m_page_total_size * m_num_pages);
+ fseek(sizeof(disk_image_format_2_header), SEEK_SET);
+ fwrite(m_data_ptr, m_page_total_size * m_num_pages);
}
}
#endif
@@ -335,7 +334,7 @@ void smartmedia_image_device::call_unload()
m_status = 0xC0;
m_accumulated_status = 0;
m_pagereg = std::make_unique<uint8_t[]>(m_page_total_size);
- memset( m_id, 0, sizeof( m_id));
+ memset(m_id, 0, sizeof(m_id));
m_id_len = 0;
m_mp_opcode = 0;
m_mode_3065 = 0;
@@ -388,8 +387,8 @@ void nand_device::command_w(uint8_t data)
m_mode_3065 = 0;
if (!m_write_rnb.isnull())
{
- m_write_rnb( 0);
- m_write_rnb( 1);
+ m_write_rnb(0);
+ m_write_rnb(1);
}
break;
case 0x00: // Read (1st cycle)
@@ -420,10 +419,10 @@ void nand_device::command_w(uint8_t data)
}
else
{
- m_mode = SM_M_READ;
- m_pointer_mode = SM_PM_C;
- m_page_addr = 0;
- m_addr_load_ptr = 0;
+ m_mode = SM_M_READ;
+ m_pointer_mode = SM_PM_C;
+ m_page_addr = 0;
+ m_addr_load_ptr = 0;
}
break;
case 0x80: // Page Program (1st cycle)
@@ -442,11 +441,10 @@ void nand_device::command_w(uint8_t data)
}
else
{
- int i;
m_status = (m_status & 0x80) | m_accumulated_status;
//logerror( "smartmedia: program, page_addr %08X\n", m_page_addr);
- for (i=0; i<m_page_total_size; i++)
- m_data_ptr[m_page_addr*m_page_total_size + i] &= m_pagereg[i];
+ for (int i = 0; i < m_page_total_size; i++)
+ m_data_ptr[m_page_addr * m_page_total_size + i] &= m_pagereg[i];
m_status |= 0x40;
if (data == 0x15)
m_accumulated_status = m_status & 0x1f;
@@ -455,13 +453,13 @@ void nand_device::command_w(uint8_t data)
m_mode = SM_M_INIT;
if (!m_write_rnb.isnull())
{
- m_write_rnb( 0);
- m_write_rnb( 1);
+ m_write_rnb(0);
+ m_write_rnb(1);
}
}
break;
- /*case 0x11:
- break;*/
+ //case 0x11:
+ // break;
case 0x60: // Block Erase (1st cycle)
m_mode = SM_M_ERASE;
m_page_addr = 0;
@@ -484,22 +482,22 @@ void nand_device::command_w(uint8_t data)
m_pointer_mode = SM_PM_A;
if (!m_write_rnb.isnull())
{
- m_write_rnb( 0);
- m_write_rnb( 1);
+ m_write_rnb(0);
+ m_write_rnb(1);
}
}
break;
case 0x70: // Read Status
m_mode = SM_M_READSTATUS;
break;
- /*case 0x71:
- break;*/
+ //case 0x71:
+ // break;
case 0x90: // Read ID
m_mode = SM_M_READID;
m_addr_load_ptr = 0;
break;
- /*case 0x91:
- break;*/
+ //case 0x91:
+ // break;
case 0x30: // Read (2nd cycle)
if (m_col_address_cycles == 1)
{
@@ -521,8 +519,8 @@ void nand_device::command_w(uint8_t data)
{
if (!m_write_rnb.isnull())
{
- m_write_rnb( 0);
- m_write_rnb( 1);
+ m_write_rnb(0);
+ m_write_rnb(1);
}
}
}
@@ -620,12 +618,12 @@ void nand_device::address_w(uint8_t data)
if (m_addr_load_ptr < m_col_address_cycles)
{
m_byte_addr &= ~(0xFF << (m_addr_load_ptr * 8));
- m_byte_addr |= (data << (m_addr_load_ptr * 8));
+ m_byte_addr |= (data << (m_addr_load_ptr * 8));
}
else if (m_addr_load_ptr < m_col_address_cycles + m_row_address_cycles)
{
m_page_addr &= ~(0xFF << ((m_addr_load_ptr - m_col_address_cycles) * 8));
- m_page_addr |= (data << ((m_addr_load_ptr - m_col_address_cycles) * 8));
+ m_page_addr |= (data << ((m_addr_load_ptr - m_col_address_cycles) * 8));
}
}
m_addr_load_ptr++;
@@ -634,7 +632,7 @@ void nand_device::address_w(uint8_t data)
if (m_addr_load_ptr < m_row_address_cycles)
{
m_page_addr &= ~(0xFF << (m_addr_load_ptr * 8));
- m_page_addr |= (data << (m_addr_load_ptr * 8));
+ m_page_addr |= (data << (m_addr_load_ptr * 8));
}
m_addr_load_ptr++;
break;
@@ -643,7 +641,7 @@ void nand_device::address_w(uint8_t data)
if (m_addr_load_ptr < m_col_address_cycles)
{
m_byte_addr &= ~(0xFF << (m_addr_load_ptr * 8));
- m_byte_addr |= (data << (m_addr_load_ptr * 8));
+ m_byte_addr |= (data << (m_addr_load_ptr * 8));
}
m_addr_load_ptr++;
break;
@@ -680,7 +678,10 @@ uint8_t nand_device::data_r()
{
if (m_byte_addr < m_page_total_size)
{
- reply = m_data_ptr[m_page_addr*m_page_total_size + m_byte_addr];
+ if (m_page_addr < m_num_pages)
+ reply = m_data_ptr[m_page_addr * m_page_total_size + m_byte_addr];
+ else
+ reply = 0xff;
}
else
{
@@ -689,7 +690,11 @@ uint8_t nand_device::data_r()
}
else
{
- reply = m_data_uid_ptr[m_page_addr*m_page_total_size + m_byte_addr];
+ // FIXME: this appears to be incorrect, m_data_uid_ptr is a smaller structure of 256*16
+ // this code would always result in reading past the buffer
+ uint32_t addr = m_page_addr * m_page_total_size + m_byte_addr;
+ if (addr < 256 + 16)
+ reply = m_data_uid_ptr[addr];
}
m_byte_addr++;
if ((m_byte_addr == m_page_total_size) && (m_sequential_row_read != 0))