Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moved password fields off the ide controller (nw)

Browse Source
This commit is contained in:
smf- 2013-06-12 17:47:10 +00:00
parent 900595dd05
commit 4701b261cb
6 changed files with 42 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/machine/ataflash.c
View File

@ -36,7 +36,7 @@ void ata_flash_pccard_device::device_start()
void ata_flash_pccard_device::device_reset_after_children()
{
m_locked = 0x1ff;
m_card->ide_set_gnet_readlock(1);
m_card->ide_set_gnet_readlock(0, 1);
}
READ16_MEMBER( ata_flash_pccard_device::read_memory )
@ -113,7 +113,7 @@ WRITE16_MEMBER( ata_flash_pccard_device::write_reg )
if (!m_locked)
{
m_card->ide_set_gnet_readlock(0);
m_card->ide_set_gnet_readlock(0, 0);
}
}
}

55
src/emu/machine/idectrl.c
View File

@ -178,22 +178,22 @@ UINT8 *ide_controller_device::ide_get_features(int _drive)
return slot[_drive]->dev()->get_features();
}
void ide_controller_device::ide_set_gnet_readlock(const UINT8 onoff)
void ide_controller_device::ide_set_gnet_readlock(int _drive, const UINT8 onoff)
{
gnetreadlock = onoff;
slot[_drive]->dev()->gnetreadlock = onoff;
}
void ide_controller_device::ide_set_master_password(const UINT8 *password)
void ide_controller_device::ide_set_master_password(int _drive, const UINT8 *password)
{
master_password = password;
master_password_enable = (master_password != NULL);
slot[_drive]->dev()->master_password = password;
slot[_drive]->dev()->master_password_enable = (password != NULL);
}
void ide_controller_device::ide_set_user_password(const UINT8 *password)
void ide_controller_device::ide_set_user_password(int _drive, const UINT8 *password)
{
user_password = password;
user_password_enable = (user_password != NULL);
slot[_drive]->dev()->user_password = password;
slot[_drive]->dev()->user_password_enable = (password != NULL);
}
@ -279,7 +279,7 @@ void ide_controller_device::read_buffer_empty()
error = IDE_ERROR_DEFAULT;
set_dmarq(0);
if (master_password_enable || user_password_enable)
if (dev->master_password_enable || dev->user_password_enable)
{
security_error();
@ -302,7 +302,7 @@ void ide_controller_device::read_sector_done()
int lba = dev->lba_address(), count = 0;
/* GNET readlock check */
if (gnetreadlock) {
if (dev->gnetreadlock) {
status &= ~IDE_STATUS_ERROR;
status &= ~IDE_STATUS_BUSY;
return;
@ -453,15 +453,15 @@ void ide_controller_device::write_buffer_full()
set_dmarq(0);
if (command == IDE_COMMAND_SECURITY_UNLOCK)
{
if (user_password_enable && memcmp(dev->buffer, user_password, 2 + 32) == 0)
if (dev->user_password_enable && memcmp(dev->buffer, dev->user_password, 2 + 32) == 0)
{
LOGPRINT(("IDE Unlocked user password\n"));
user_password_enable = 0;
dev->user_password_enable = 0;
}
if (master_password_enable && memcmp(dev->buffer, master_password, 2 + 32) == 0)
if (dev->master_password_enable && memcmp(dev->buffer, dev->master_password, 2 + 32) == 0)
{
LOGPRINT(("IDE Unlocked master password\n"));
master_password_enable = 0;
dev->master_password_enable = 0;
}
if (PRINTF_IDE_PASSWORD)
{
@ -483,7 +483,7 @@ void ide_controller_device::write_buffer_full()
status &= ~IDE_STATUS_BUSY;
status &= ~IDE_STATUS_BUFFER_READY;
if (master_password_enable || user_password_enable)
if (dev->master_password_enable || dev->user_password_enable)
security_error();
else
status |= IDE_STATUS_DRIVE_READY;
@ -503,7 +503,7 @@ void ide_controller_device::write_buffer_full()
status |= IDE_STATUS_ERROR;
else {
status &= ~IDE_STATUS_ERROR;
gnetreadlock= 0;
dev->gnetreadlock= 0;
}
}
else
@ -817,7 +817,7 @@ void ide_controller_device::handle_command(UINT8 _command)
dev->read_key(key);
if ((dev->precomp_offset == key[0]) && (dev->sector_count == key[1]) && (dev->cur_sector == key[2]) && (dev->cur_cylinder == (((UINT16)key[4]<<8)|key[3])))
{
gnetreadlock= 0;
dev->gnetreadlock= 0;
}
/* update flags */
@ -1279,11 +1279,6 @@ ide_controller_device::ide_controller_device(const machine_config &mconfig, devi
verify_only(0),
config_unknown(0),
config_register_num(0),
master_password_enable(0),
user_password_enable(0),
master_password(NULL),
user_password(NULL),
gnetreadlock(0),
cur_drive(0),
m_irq_handler(*this)
{
@ -1302,11 +1297,6 @@ ide_controller_device::ide_controller_device(const machine_config &mconfig, cons
verify_only(0),
config_unknown(0),
config_register_num(0),
master_password_enable(0),
user_password_enable(0),
master_password(NULL),
user_password(NULL),
gnetreadlock(0),
cur_drive(0),
m_irq_handler(*this)
{
@ -1342,11 +1332,6 @@ void ide_controller_device::device_start()
save_item(NAME(config_unknown));
save_item(NAME(config_register));
save_item(NAME(config_register_num));
save_item(NAME(master_password_enable));
save_item(NAME(user_password_enable));
save_item(NAME(gnetreadlock));
}
//-------------------------------------------------
@ -1363,9 +1348,9 @@ void ide_controller_device::device_reset()
status = IDE_STATUS_DRIVE_READY | IDE_STATUS_SEEK_COMPLETE;
error = IDE_ERROR_DEFAULT;
dev->buffer_offset = 0;
gnetreadlock = 0;
master_password_enable = (master_password != NULL);
user_password_enable = (user_password != NULL);
dev->gnetreadlock = 0;
dev->master_password_enable = (dev->master_password != NULL);
dev->user_password_enable = (dev->user_password != NULL);
set_irq(CLEAR_LINE);
set_dmarq(0);
}

13
src/emu/machine/idectrl.h
View File

@ -83,9 +83,9 @@ public:
template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ide_controller_device &>(device).m_irq_handler.set_callback(object); }
UINT8 *ide_get_features(int drive);
void ide_set_gnet_readlock(const UINT8 onoff);
void ide_set_master_password(const UINT8 *password);
void ide_set_user_password(const UINT8 *password);
void ide_set_gnet_readlock(int drive, const UINT8 onoff);
void ide_set_master_password(int drive, const UINT8 *password);
void ide_set_user_password(int drive, const UINT8 *password);
DECLARE_READ8_MEMBER(read_via_config);
DECLARE_WRITE8_MEMBER(write_via_config);
@ -143,13 +143,6 @@ private:
emu_timer * last_status_timer;
emu_timer * reset_timer;
UINT8 master_password_enable;
UINT8 user_password_enable;
const UINT8 * master_password;
const UINT8 * user_password;
UINT8 gnetreadlock;
UINT8 cur_drive;
ide_slot_device *slot[2];

9
src/emu/machine/idehd.c
View File

@ -11,7 +11,9 @@
//-------------------------------------------------
ide_device_interface::ide_device_interface(const machine_config &mconfig, device_t &device)
: device_slot_card_interface(mconfig, device)
: device_slot_card_interface(mconfig, device),
master_password(NULL),
user_password(NULL)
{
}
@ -255,6 +257,11 @@ void ide_hdd_device::device_start()
save_item(NAME(precomp_offset));
save_item(NAME(sector_count));
save_item(NAME(master_password_enable));
save_item(NAME(user_password_enable));
save_item(NAME(gnetreadlock));
}
//-------------------------------------------------

7
src/emu/machine/idehd.h
View File

@ -35,6 +35,13 @@ public:
UINT8 precomp_offset;
UINT16 sector_count;
UINT8 master_password_enable;
UINT8 user_password_enable;
const UINT8 * master_password;
const UINT8 * user_password;
UINT8 gnetreadlock;
protected:
UINT8 m_features[IDE_DISK_SECTOR_SIZE];
UINT16 m_num_cylinders;

4
src/mame/drivers/djmain.c
View File

@ -1355,9 +1355,9 @@ static const k054539_interface k054539_config =
void djmain_state::machine_start()
{
if (m_ide_master_password != NULL)
m_ide->ide_set_master_password(m_ide_master_password);
m_ide->ide_set_master_password(0, m_ide_master_password);
if (m_ide_user_password != NULL)
m_ide->ide_set_user_password(m_ide_user_password);
m_ide->ide_set_user_password(0, m_ide_user_password);
save_item(NAME(m_sndram_bank));
save_item(NAME(m_pending_vb_int));