mirror of
https://github.com/holub/mame
synced 2025-04-23 08:49:55 +03:00
upd765: Move PS/2-class functionality out of base device (nw)
This commit is contained in:
AJR
parent
bb7b5fa97d
commit
ee66ef82c3
@ -192,7 +192,7 @@ void upd765_family_device::set_select_lines_connected(bool _select)
|
||||
select_connected = _select;
|
||||
}
|
||||
|
||||
void upd765_family_device::set_mode(mode_t _mode)
|
||||
void ps2_fdc_device::set_mode(mode_t _mode)
|
||||
{
|
||||
mode = _mode;
|
||||
}
|
||||
@ -208,7 +208,6 @@ void upd765_family_device::device_resolve_objects()
|
||||
|
||||
void upd765_family_device::device_start()
|
||||
{
|
||||
save_item(NAME(motorcfg));
|
||||
save_item(NAME(selected_drive));
|
||||
|
||||
for(int i=0; i != 4; i++) {
|
||||
@ -361,7 +360,7 @@ void upd765_family_device::set_floppy(floppy_image_device *flop)
|
||||
idx_cb(0);
|
||||
}
|
||||
|
||||
uint8_t upd765_family_device::sra_r()
|
||||
uint8_t ps2_fdc_device::sra_r()
|
||||
{
|
||||
uint8_t sra = 0;
|
||||
int fid = dor & 3;
|
||||
@ -384,7 +383,7 @@ uint8_t upd765_family_device::sra_r()
|
||||
return sra;
|
||||
}
|
||||
|
||||
uint8_t upd765_family_device::srb_r()
|
||||
uint8_t ps2_fdc_device::srb_r()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@ -1285,15 +1284,32 @@ int upd765_family_device::check_command()
|
||||
case 0x0d:
|
||||
return command_pos == 6 ? C_FORMAT_TRACK : C_INCOMPLETE;
|
||||
|
||||
case 0x0e:
|
||||
return C_DUMP_REG;
|
||||
|
||||
case 0x0f:
|
||||
return command_pos == 3 ? C_SEEK : C_INCOMPLETE;
|
||||
|
||||
case 0x11:
|
||||
return command_pos == 9 ? C_SCAN_EQUAL : C_INCOMPLETE;
|
||||
|
||||
case 0x19:
|
||||
return command_pos == 9 ? C_SCAN_LOW : C_INCOMPLETE;
|
||||
|
||||
case 0x1d:
|
||||
return command_pos == 9 ? C_SCAN_HIGH : C_INCOMPLETE;
|
||||
|
||||
default:
|
||||
return C_INVALID;
|
||||
}
|
||||
}
|
||||
|
||||
int ps2_fdc_device::check_command()
|
||||
{
|
||||
switch(command[0] & 0x1f) {
|
||||
case 0x0e:
|
||||
return C_DUMP_REG;
|
||||
|
||||
case 0x10:
|
||||
return C_VERSION;
|
||||
|
||||
case 0x12:
|
||||
return command_pos == 2 ? C_PERPENDICULAR : C_INCOMPLETE;
|
||||
|
||||
@ -1303,14 +1319,8 @@ int upd765_family_device::check_command()
|
||||
case 0x14:
|
||||
return C_LOCK;
|
||||
|
||||
case 0x19:
|
||||
return command_pos == 9 ? C_SCAN_LOW : C_INCOMPLETE;
|
||||
|
||||
case 0x1d:
|
||||
return command_pos == 9 ? C_SCAN_HIGH : C_INCOMPLETE;
|
||||
|
||||
default:
|
||||
return C_INVALID;
|
||||
return upd765_family_device::check_command();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1327,51 +1337,10 @@ void upd765_family_device::start_command(int cmd)
|
||||
void upd765_family_device::execute_command(int cmd)
|
||||
{
|
||||
switch(cmd) {
|
||||
case C_CONFIGURE:
|
||||
LOGCOMMAND("command configure %02x %02x %02x\n",
|
||||
command[1], command[2], command[3]);
|
||||
// byte 1 is ignored, byte 3 is precompensation-related
|
||||
motorcfg = command[1];
|
||||
fifocfg = command[2];
|
||||
precomp = command[3];
|
||||
main_phase = PHASE_CMD;
|
||||
break;
|
||||
|
||||
case C_DUMP_REG:
|
||||
LOGCOMMAND("command dump regs\n");
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = flopi[0].pcn;
|
||||
result[1] = flopi[1].pcn;
|
||||
result[2] = flopi[2].pcn;
|
||||
result[3] = flopi[3].pcn;
|
||||
result[4] = (spec & 0xff00) >> 8;
|
||||
result[5] = (spec & 0x00ff);
|
||||
result[6] = sector_size;
|
||||
result[7] = locked ? 0x80 : 0x00;
|
||||
result[7] |= (perpmode & 0x30);
|
||||
result[8] = fifocfg;
|
||||
result[9] = precomp;
|
||||
result_pos = 10;
|
||||
break;
|
||||
|
||||
case C_FORMAT_TRACK:
|
||||
format_track_start(flopi[command[1] & 3]);
|
||||
break;
|
||||
|
||||
case C_LOCK:
|
||||
locked = command[0] & 0x80;
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = locked ? 0x10 : 0x00;
|
||||
result_pos = 1;
|
||||
LOGCOMMAND("command lock (%s)\n", locked ? "on" : "off");
|
||||
break;
|
||||
|
||||
case C_PERPENDICULAR:
|
||||
LOGCOMMAND("command perpendicular\n");
|
||||
perpmode = command[1];
|
||||
main_phase = PHASE_CMD;
|
||||
break;
|
||||
|
||||
case C_READ_DATA:
|
||||
read_data_start(flopi[command[1] & 3]);
|
||||
break;
|
||||
@ -1469,6 +1438,65 @@ void upd765_family_device::execute_command(int cmd)
|
||||
}
|
||||
}
|
||||
|
||||
void ps2_fdc_device::execute_command(int cmd)
|
||||
{
|
||||
switch(cmd) {
|
||||
case C_CONFIGURE:
|
||||
LOGCOMMAND("command configure %02x %02x %02x\n",
|
||||
command[1], command[2], command[3]);
|
||||
// byte 1 is ignored, byte 3 is precompensation-related
|
||||
fifocfg = command[2];
|
||||
precomp = command[3];
|
||||
main_phase = PHASE_CMD;
|
||||
break;
|
||||
|
||||
case C_DUMP_REG:
|
||||
LOGCOMMAND("command dump regs\n");
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = flopi[0].pcn;
|
||||
result[1] = flopi[1].pcn;
|
||||
result[2] = flopi[2].pcn;
|
||||
result[3] = flopi[3].pcn;
|
||||
result[4] = (spec & 0xff00) >> 8;
|
||||
result[5] = (spec & 0x00ff);
|
||||
result[6] = sector_size;
|
||||
result[7] = locked ? 0x80 : 0x00;
|
||||
result[7] |= (perpmode & 0x3f);
|
||||
result[8] = fifocfg;
|
||||
result[9] = precomp;
|
||||
result_pos = 10;
|
||||
break;
|
||||
|
||||
case C_VERSION:
|
||||
LOGCOMMAND("command version\n");
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = 0x90;
|
||||
result_pos = 1;
|
||||
break;
|
||||
|
||||
case C_LOCK:
|
||||
locked = command[0] & 0x80;
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = locked ? 0x10 : 0x00;
|
||||
result_pos = 1;
|
||||
LOGCOMMAND("command lock (%s)\n", locked ? "on" : "off");
|
||||
break;
|
||||
|
||||
case C_PERPENDICULAR:
|
||||
LOGCOMMAND("command perpendicular\n");
|
||||
if(BIT(command[1], 7))
|
||||
perpmode = command[1] & 0x3f;
|
||||
else
|
||||
perpmode = (perpmode & 0x3c) | (command[1] & 3);
|
||||
main_phase = PHASE_CMD;
|
||||
break;
|
||||
|
||||
default:
|
||||
upd765_family_device::execute_command(cmd);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void upd765_family_device::command_end(floppy_info &fi, bool data_completion)
|
||||
{
|
||||
LOGDONE("command done (%s) - %s\n", data_completion ? "data" : "seek", results());
|
||||
@ -2689,6 +2717,7 @@ void i82072_device::device_start()
|
||||
{
|
||||
upd765_family_device::device_start();
|
||||
|
||||
save_item(NAME(motorcfg));
|
||||
save_item(NAME(motor_off_counter));
|
||||
save_item(NAME(motor_on_counter));
|
||||
save_item(NAME(drive_busy));
|
||||
@ -2801,11 +2830,30 @@ void i82072_device::start_command(int cmd)
|
||||
void i82072_device::execute_command(int cmd)
|
||||
{
|
||||
switch(cmd) {
|
||||
case C_DUMP_REG:
|
||||
upd765_family_device::execute_command(cmd);
|
||||
case C_CONFIGURE:
|
||||
LOGCOMMAND("command configure %02x %02x %02x\n",
|
||||
command[1], command[2], command[3]);
|
||||
motorcfg = command[1];
|
||||
fifocfg = command[2];
|
||||
precomp = command[3];
|
||||
main_phase = PHASE_CMD;
|
||||
break;
|
||||
|
||||
case C_DUMP_REG:
|
||||
LOGCOMMAND("command dump regs\n");
|
||||
main_phase = PHASE_RESULT;
|
||||
result[0] = flopi[0].pcn;
|
||||
result[1] = flopi[1].pcn;
|
||||
result[2] = flopi[2].pcn;
|
||||
result[3] = flopi[3].pcn;
|
||||
result[4] = (spec & 0xff00) >> 8;
|
||||
result[5] = (spec & 0x00ff);
|
||||
result[6] = sector_size;
|
||||
// i82072 dumps motor configuration at offset 7
|
||||
result[7] = motorcfg;
|
||||
result[8] = fifocfg;
|
||||
result[9] = precomp;
|
||||
result_pos = 10;
|
||||
break;
|
||||
|
||||
case C_MOTOR_ONOFF: {
|
||||
@ -2944,7 +2992,32 @@ void i82072_device::index_callback(floppy_image_device *floppy, int state)
|
||||
upd765_family_device::index_callback(floppy, state);
|
||||
}
|
||||
|
||||
smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd765_family_device(mconfig, SMC37C78, tag, owner, clock)
|
||||
ps2_fdc_device::ps2_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : upd765_family_device(mconfig, type, tag, owner, clock)
|
||||
{
|
||||
}
|
||||
|
||||
void ps2_fdc_device::device_start()
|
||||
{
|
||||
upd765_family_device::device_start();
|
||||
|
||||
save_item(NAME(perpmode));
|
||||
}
|
||||
|
||||
void ps2_fdc_device::device_reset()
|
||||
{
|
||||
upd765_family_device::device_reset();
|
||||
|
||||
perpmode = 0;
|
||||
}
|
||||
|
||||
void ps2_fdc_device::soft_reset()
|
||||
{
|
||||
upd765_family_device::soft_reset();
|
||||
|
||||
perpmode &= 0x3c;
|
||||
}
|
||||
|
||||
smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ps2_fdc_device(mconfig, SMC37C78, tag, owner, clock)
|
||||
{
|
||||
ready_connected = false;
|
||||
select_connected = true;
|
||||
@ -2952,7 +3025,7 @@ smc37c78_device::smc37c78_device(const machine_config &mconfig, const char *tag,
|
||||
recalibrate_steps = 80;
|
||||
}
|
||||
|
||||
n82077aa_device::n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd765_family_device(mconfig, N82077AA, tag, owner, clock)
|
||||
n82077aa_device::n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ps2_fdc_device(mconfig, N82077AA, tag, owner, clock)
|
||||
{
|
||||
ready_connected = false;
|
||||
select_connected = true;
|
||||
@ -2975,7 +3048,7 @@ dp8473_device::dp8473_device(const machine_config &mconfig, const char *tag, dev
|
||||
select_multiplexed = false;
|
||||
}
|
||||
|
||||
pc8477a_device::pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : upd765_family_device(mconfig, PC8477A, tag, owner, clock)
|
||||
pc8477a_device::pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : ps2_fdc_device(mconfig, PC8477A, tag, owner, clock)
|
||||
{
|
||||
ready_polled = true;
|
||||
ready_connected = false;
|
||||
|
||||
@ -27,8 +27,6 @@ public:
|
||||
|
||||
virtual void map(address_map &map) = 0;
|
||||
|
||||
uint8_t sra_r();
|
||||
uint8_t srb_r();
|
||||
uint8_t dor_r();
|
||||
void dor_w(uint8_t data);
|
||||
uint8_t tdr_r();
|
||||
@ -54,7 +52,6 @@ public:
|
||||
|
||||
void set_rate(int rate); // rate in bps, to be used when the fdc is externally frequency-controlled
|
||||
|
||||
void set_mode(mode_t mode);
|
||||
void set_ready_line_connected(bool ready);
|
||||
void set_select_lines_connected(bool select);
|
||||
void set_floppy(floppy_image_device *image);
|
||||
@ -253,8 +250,8 @@ protected:
|
||||
bool fifo_write;
|
||||
uint8_t dor, dsr, msr, fifo[16], command[16], result[16];
|
||||
uint8_t st1, st2, st3;
|
||||
uint8_t fifocfg, motorcfg, dor_reset;
|
||||
uint8_t precomp, perpmode;
|
||||
uint8_t fifocfg, dor_reset;
|
||||
uint8_t precomp;
|
||||
uint16_t spec;
|
||||
int sector_size;
|
||||
int cur_rate;
|
||||
@ -285,6 +282,7 @@ protected:
|
||||
C_SCAN_LOW,
|
||||
C_SCAN_HIGH,
|
||||
C_MOTOR_ONOFF,
|
||||
C_VERSION,
|
||||
|
||||
C_INVALID,
|
||||
C_INCOMPLETE
|
||||
@ -425,13 +423,33 @@ protected:
|
||||
void motor_control(int fid, bool start_motor);
|
||||
|
||||
private:
|
||||
u8 motorcfg;
|
||||
u8 motor_off_counter;
|
||||
u8 motor_on_counter;
|
||||
u8 drive_busy;
|
||||
int delayed_command;
|
||||
};
|
||||
|
||||
class smc37c78_device : public upd765_family_device {
|
||||
class ps2_fdc_device : public upd765_family_device {
|
||||
public:
|
||||
void set_mode(mode_t mode);
|
||||
|
||||
uint8_t sra_r();
|
||||
uint8_t srb_r();
|
||||
|
||||
protected:
|
||||
ps2_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
virtual void device_start() override;
|
||||
virtual void device_reset() override;
|
||||
virtual void soft_reset() override;
|
||||
virtual int check_command() override;
|
||||
virtual void execute_command(int cmd) override;
|
||||
|
||||
uint8_t perpmode;
|
||||
};
|
||||
|
||||
class smc37c78_device : public ps2_fdc_device {
|
||||
public:
|
||||
smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
@ -468,10 +486,10 @@ public:
|
||||
upd72069_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
};
|
||||
|
||||
class n82077aa_device : public upd765_family_device {
|
||||
class n82077aa_device : public ps2_fdc_device {
|
||||
public:
|
||||
n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, mode_t mode)
|
||||
: n82077aa_device(mconfig, tag, owner, 0U)
|
||||
n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, mode_t mode)
|
||||
: n82077aa_device(mconfig, tag, owner, clock)
|
||||
{
|
||||
set_mode(mode);
|
||||
}
|
||||
@ -494,8 +512,13 @@ public:
|
||||
virtual void map(address_map &map) override;
|
||||
};
|
||||
|
||||
class pc8477a_device : public upd765_family_device {
|
||||
class pc8477a_device : public ps2_fdc_device {
|
||||
public:
|
||||
pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, mode_t mode)
|
||||
: pc8477a_device(mconfig, tag, owner, clock)
|
||||
{
|
||||
set_mode(mode);
|
||||
}
|
||||
pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
|
||||
|
||||
virtual void map(address_map &map) override;
|
||||
|
||||
@ -1003,8 +1003,7 @@ void sapphire_state::sapphire(machine_config &config)
|
||||
INTERPRO_FMCC(config, m_mcga, 0);
|
||||
|
||||
// floppy controller
|
||||
N82077AA(config, m_fdc, 24_MHz_XTAL);
|
||||
m_fdc->set_mode(n82077aa_device::mode_t::PS2);
|
||||
N82077AA(config, m_fdc, 24_MHz_XTAL, n82077aa_device::mode_t::PS2);
|
||||
m_fdc->intrq_wr_callback().set(m_ioga, FUNC(interpro_ioga_device::ir1_w));
|
||||
m_fdc->drq_wr_callback().set(m_ioga, FUNC(interpro_ioga_device::drq_floppy));
|
||||
|
||||
|
||||
@ -1057,7 +1057,7 @@ void next_state::next_fdc_base(machine_config &config)
|
||||
{
|
||||
next_base(config);
|
||||
|
||||
N82077AA(config, fdc, n82077aa_device::mode_t::PS2);
|
||||
N82077AA(config, fdc, 24'000'000, n82077aa_device::mode_t::PS2);
|
||||
fdc->intrq_wr_callback().set(FUNC(next_state::fdc_irq));
|
||||
fdc->drq_wr_callback().set(FUNC(next_state::fdc_drq));
|
||||
FLOPPY_CONNECTOR(config, "fdc:0", next_floppies, "35ed", next_state::floppy_formats);
|
||||
|
||||
@ -625,7 +625,7 @@ void sun3x_state::sun3_80(machine_config &config)
|
||||
|
||||
NCR539X(config, ESP_TAG, 20000000/2).set_scsi_port("scsi");
|
||||
|
||||
N82077AA(config, m_fdc, n82077aa_device::mode_t::PS2);
|
||||
N82077AA(config, m_fdc, 24000000, n82077aa_device::mode_t::PS2);
|
||||
FLOPPY_CONNECTOR(config, "fdc:0", sun_floppies, "35hd", sun3x_state::floppy_formats);
|
||||
|
||||
// the timekeeper has no interrupt output, so 3/80 includes a dedicated timer circuit
|
||||
|
||||
Loading…
Reference in New Issue
Block a user