From 53539d0fba1de1c8a25bb4c0958c0c4e3a73b938 Mon Sep 17 00:00:00 2001 From: smf- Date: Fri, 24 Aug 2012 10:35:45 +0000 Subject: [PATCH] a little tidy up while working on other files (nw) --- src/emu/machine/ncr539x.c | 23 +++++++---------------- src/emu/machine/ncr539x.h | 3 --- src/emu/machine/wd33c93.c | 4 +--- src/mess/machine/fm_scsi.c | 4 +--- src/mess/machine/mb89352.c | 4 +--- src/mess/machine/ncr5380.c | 4 +--- src/mess/machine/ncr5380.h | 1 - src/mess/machine/scsibus.c | 3 +-- 8 files changed, 12 insertions(+), 34 deletions(-) diff --git a/src/emu/machine/ncr539x.c b/src/emu/machine/ncr539x.c index 01b591d860a..2dec30880e0 100644 --- a/src/emu/machine/ncr539x.c +++ b/src/emu/machine/ncr539x.c @@ -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( 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( 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( 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); diff --git a/src/emu/machine/ncr539x.h b/src/emu/machine/ncr539x.h index ec12338de8d..02462a8d7ee 100644 --- a/src/emu/machine/ncr539x.h +++ b/src/emu/machine/ncr539x.h @@ -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(); diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c index 5b1f641d479..76745441737 100644 --- a/src/emu/machine/wd33c93.c +++ b/src/emu/machine/wd33c93.c @@ -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( interface->scsidevs->devices[i].tag ); devices[device->GetDeviceID()] = device; diff --git a/src/mess/machine/fm_scsi.c b/src/mess/machine/fm_scsi.c index 388738e3f64..48b0b2953bb 100644 --- a/src/mess/machine/fm_scsi.c +++ b/src/mess/machine/fm_scsi.c @@ -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;xdevs_present;x++) + for(int x=0;xdevs_present;x++) { scsidev_device *device = machine().device( scsidevs->devices[x].tag ); m_SCSIdevices[device->GetDeviceID()] = device; diff --git a/src/mess/machine/mb89352.c b/src/mess/machine/mb89352.c index 6b054db62b0..11e51e02c00 100644 --- a/src/mess/machine/mb89352.c +++ b/src/mess/machine/mb89352.c @@ -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( scsidevs->devices[i].tag ); m_SCSIdevices[device->GetDeviceID()] = device; diff --git a/src/mess/machine/ncr5380.c b/src/mess/machine/ncr5380.c index dd750bf8432..8f0929528a6 100644 --- a/src/mess/machine/ncr5380.c +++ b/src/mess/machine/ncr5380.c @@ -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( scsidevs->devices[i].tag ); m_scsi_devices[device->GetDeviceID()] = device; diff --git a/src/mess/machine/ncr5380.h b/src/mess/machine/ncr5380.h index 7e1fcd96627..a73862b2adf 100644 --- a/src/mess/machine/ncr5380.h +++ b/src/mess/machine/ncr5380.h @@ -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(); diff --git a/src/mess/machine/scsibus.c b/src/mess/machine/scsibus.c index d98036f7f87..d04f3105992 100644 --- a/src/mess/machine/scsibus.c +++ b/src/mess/machine/scsibus.c @@ -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( scsidevs->devices[devno].tag );