a little tidy up while working on other files (nw)

This commit is contained in:
smf- 2012-08-24 10:35:45 +00:00
parent b863cf56b5
commit 53539d0fba
8 changed files with 12 additions and 34 deletions

View File

@ -149,8 +149,6 @@ ncr539x_device::ncr539x_device(const machine_config &mconfig, const char *tag, d
void ncr539x_device::device_start()
{
int i;
memset(m_scsi_devices, 0, sizeof(m_scsi_devices));
// resolve line callbacks
@ -158,7 +156,7 @@ void ncr539x_device::device_start()
m_out_drq_func.resolve(m_out_drq_cb, *this);
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
for (int i = 0; i < scsidevs->devs_present; i++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
m_scsi_devices[device->GetDeviceID()] = device;
@ -192,7 +190,12 @@ void ncr539x_device::device_reset()
m_out_irq_func(CLEAR_LINE);
m_out_drq_func(CLEAR_LINE);
scan_devices();
// try to open the devices
for (int i = 0; i < scsidevs->devs_present; i++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
m_scsi_devices[device->GetDeviceID()] = device;
}
}
void ncr539x_device::dma_read_data(int bytes, UINT8 *pData)
@ -225,18 +228,6 @@ void ncr539x_device::dma_write_data(int bytes, UINT8 *pData)
}
}
void ncr539x_device::scan_devices()
{
int i;
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
m_scsi_devices[device->GetDeviceID()] = device;
}
}
void ncr539x_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr)
{
//printf("539X: device_timer expired, param = %d, m_command = %02x\n", param, m_command);

View File

@ -40,9 +40,6 @@ public:
void dma_read_data(int bytes, UINT8 *pData);
void dma_write_data(int bytes, UINT8 *pData);
void *get_scsi_device(int id);
void scan_devices();
protected:
// device-level overrides
virtual void device_start();

View File

@ -781,8 +781,6 @@ READ8_HANDLER(wd33c93_r)
void wd33c93_init( running_machine &machine, const struct WD33C93interface *interface )
{
int i;
// save interface pointer for later
intf = interface;
@ -790,7 +788,7 @@ void wd33c93_init( running_machine &machine, const struct WD33C93interface *inte
memset(devices, 0, sizeof(devices));
// try to open the devices
for (i = 0; i < interface->scsidevs->devs_present; i++)
for (int i = 0; i < interface->scsidevs->devs_present; i++)
{
scsidev_device *device = machine.device<scsidev_device>( interface->scsidevs->devices[i].tag );
devices[device->GetDeviceID()] = device;

View File

@ -60,8 +60,6 @@ fmscsi_device::fmscsi_device(const machine_config &mconfig, const char *tag, dev
void fmscsi_device::device_start()
{
int x;
m_input_lines = 0;
m_output_lines = 0;
m_data = 0;
@ -76,7 +74,7 @@ void fmscsi_device::device_start()
memset(m_SCSIdevices,0,sizeof(m_SCSIdevices));
// initialise SCSI devices, if any present
for(x=0;x<scsidevs->devs_present;x++)
for(int x=0;x<scsidevs->devs_present;x++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[x].tag );
m_SCSIdevices[device->GetDeviceID()] = device;

View File

@ -137,8 +137,6 @@ mb89352_device::mb89352_device(const machine_config &mconfig, const char *tag, d
void mb89352_device::device_start()
{
int i;
m_phase = SCSI_PHASE_BUS_FREE;
m_target = 0;
m_command_index = 0;
@ -158,7 +156,7 @@ void mb89352_device::device_start()
m_transfer_timer = timer_alloc(TIMER_TRANSFER);
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
for (int i = 0; i < scsidevs->devs_present; i++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
m_SCSIdevices[device->GetDeviceID()] = device;

View File

@ -122,10 +122,8 @@ void ncr5380_device::device_start()
save_item(NAME(m_d_limit));
save_item(NAME(m_next_req_flag));
int i;
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
for (int i = 0; i < scsidevs->devs_present; i++)
{
scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
m_scsi_devices[device->GetDeviceID()] = device;

View File

@ -56,7 +56,6 @@ public:
void ncr5380_read_data(int bytes, UINT8 *pData);
void ncr5380_write_data(int bytes, UINT8 *pData);
void *ncr5380_get_scsi_device(int id);
protected:
// device-level overrides
virtual void device_start();

View File

@ -942,10 +942,9 @@ void init_scsibus(device_t *device, int sectorbytes)
{
scsibus_t *bus = get_token(device);
const SCSIConfigTable *scsidevs = bus->interface->scsidevs;
int devno;
// try to open the devices
for (devno = 0; devno < scsidevs->devs_present; devno++)
for (int devno = 0; devno < scsidevs->devs_present; devno++)
{
LOG(1,"SCSIBUS:init devno=%d \n",devno);
scsidev_device *scsidev = device->machine().device<scsidev_device>( scsidevs->devices[devno].tag );