Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

spi_sdcard: Support CMD16 (SET_BLOCKLEN) for improved SDv2 compatibility. [R. Belmont]

Browse Source
This commit is contained in:
arbee 2021-09-18 13:33:35 -04:00
parent 13201c72ec
commit 8ffadea809
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/devices/machine/spi_sdcard.cpp
View File

@ -1,14 +1,17 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:R. Belmont // copyright-holders:R. Belmont
/* /*
SD Card emulation, SPI interface only currently SD Card emulation, SPI interface.
Emulation by R. Belmont Emulation by R. Belmont
This emulates an SDHC card, which means the block size is fixed at 512 bytes and makes things simpler. This emulates an SDHC card, which means the block size is fixed at 512 bytes and makes things simpler.
Adapting the code to also handle SD version 2 non-HC cards would be relatively straightforward as well; Adapting the code to also handle SD version 2 non-HC cards would be relatively straightforward as well;
the block size defaults to 1 byte in that case but can be overridden with CMD16. the block size defaults to 1 byte in that case but can be overridden with CMD16.
Adding the native 4-bit-wide SD interface is also possible The block size set with CMD16 must match the underlying CHD block size if it's not 512.
Adding the native 4-bit-wide SD interface is also possible; this should be broken up into a base
SD Card class with SPI and SD frontends in that case.
Multiple block read/write commands are not supported but would be straightforward to add. Multiple block read/write commands are not supported but would be straightforward to add.
@ -43,7 +46,7 @@ spi_sdcard_device::spi_sdcard_device(const machine_config &mconfig, device_type
m_image(*this, "image"), m_image(*this, "image"),
m_harddisk(nullptr), m_harddisk(nullptr),
m_in_latch(0), m_out_latch(0), m_cmd_ptr(0), m_state(0), m_out_ptr(0), m_out_count(0), m_ss(0), m_in_bit(0), m_in_latch(0), m_out_latch(0), m_cmd_ptr(0), m_state(0), m_out_ptr(0), m_out_count(0), m_ss(0), m_in_bit(0),
m_cur_bit(0), m_write_ptr(0), m_bACMD(false) m_cur_bit(0), m_write_ptr(0), m_blksize(512), m_bACMD(false)
{ {
} }
@ -134,7 +137,7 @@ void spi_sdcard_device::spi_clock_w(int state)
case SD_STATE_WRITE_DATA: case SD_STATE_WRITE_DATA:
m_data[m_write_ptr++] = m_in_latch; m_data[m_write_ptr++] = m_in_latch;
if (m_write_ptr == 514) if (m_write_ptr == (m_blksize + 2))
{ {
u32 blk = (m_cmd[1] << 24) | (m_cmd[2] << 16) | (m_cmd[3] << 8) | m_cmd[4]; u32 blk = (m_cmd[1] << 24) | (m_cmd[2] << 16) | (m_cmd[3] << 8) | m_cmd[4];
LOGMASKED(LOG_GENERAL, "writing LBA %x, data %02x %02x %02x %02x\n", blk, m_data[0], m_data[1], m_data[2], m_data[3]); LOGMASKED(LOG_GENERAL, "writing LBA %x, data %02x %02x %02x %02x\n", blk, m_data[0], m_data[1], m_data[2], m_data[3]);
@ -206,6 +209,23 @@ void spi_sdcard_device::do_command()
send_data(5); send_data(5);
break; break;
case 16: // CMD16 - SET_BLOCKLEN
m_blksize = (m_cmd[3] << 8) | m_cmd[4];
printf("SDCARD: set block size to %d\n", m_blksize);
if (hard_disk_set_block_size(m_harddisk, m_blksize))
{
m_data[0] = 0;
}
else
{
m_data[0] = 0xff; // indicate an error
// if false was returned, it means the hard disk is a CHD file, and we can't resize the
// blocks on CHD files.
logerror("spi_sdcard: Couldn't change block size to %d, wrong CHD file?", m_blksize);
}
send_data(1);
break;
case 17: // CMD17 - READ_SINGLE_BLOCK case 17: // CMD17 - READ_SINGLE_BLOCK
if (m_harddisk) if (m_harddisk)
{ {
@ -216,7 +236,7 @@ void spi_sdcard_device::do_command()
u32 blk = (m_cmd[1] << 24) | (m_cmd[2] << 16) | (m_cmd[3] << 8) | m_cmd[4]; u32 blk = (m_cmd[1] << 24) | (m_cmd[2] << 16) | (m_cmd[3] << 8) | m_cmd[4];
LOGMASKED(LOG_GENERAL, "reading LBA %x\n", blk); LOGMASKED(LOG_GENERAL, "reading LBA %x\n", blk);
hard_disk_read(m_harddisk, blk, &m_data[3]); hard_disk_read(m_harddisk, blk, &m_data[3]);
send_data(3 + 512 + 2); send_data(3 + m_blksize + 2);
} }
else else
{ {

2
src/devices/machine/spi_sdcard.h
View File

@ -46,7 +46,7 @@ private:
hard_disk_file *m_harddisk; hard_disk_file *m_harddisk;
u8 m_in_latch, m_out_latch; u8 m_in_latch, m_out_latch;
int m_cmd_ptr, m_state, m_out_ptr, m_out_count, m_ss, m_in_bit, m_cur_bit, m_write_ptr; int m_cmd_ptr, m_state, m_out_ptr, m_out_count, m_ss, m_in_bit, m_cur_bit, m_write_ptr, m_blksize;
bool m_bACMD; bool m_bACMD;
}; };