Previous 199869 Revisions Next

r17541 Tuesday 28th August, 2012 at 17:27:34 UTC by smf
(MESS) removed SCSIConfigTable from scsibus, scsi devices are now sub devices of the scsi bus (nw)
[src/mess/drivers]abc1600.c bullet.c rmnimbus.c v1050.c
[src/mess/includes]abc1600.h rmnimbus.h
[src/mess/machine]abc_hdc.c abc_xebec.c d9060.c e01.c lux4105.c scsibus.c scsibus.h

trunk/src/mess/machine/abc_xebec.c
r17540r17541
8181//  SCSIBus_interface sasi_intf
8282//-------------------------------------------------
8383
84static const SCSIConfigTable sasi_dev_table =
85{
86   1, /* 1 SCSI device */
87   {
88      { "harddisk0" }
89   }
90};
91
9284static const SCSIBus_interface sasi_intf =
9385{
94   &sasi_dev_table,
9586   NULL,
9687   DEVCB_NULL,
9788   DEVCB_NULL,
r17540r17541
114105   MCFG_CPU_CONFIG(daisy_chain)
115106
116107   MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
117   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
108   MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
118109MACHINE_CONFIG_END
119110
120111
trunk/src/mess/machine/scsibus.c
r17540r17541
883883   sel_timer=timer_alloc(2);
884884   dataout_timer=timer_alloc(3);
885885
886   // try to open the devices
887   for (int devno = 0; devno < scsidevs->devs_present; devno++)
886   for( device_t *device = first_subdevice(); device != NULL; device = device->next() )
888887   {
889      LOG(1,"SCSIBUS:init devno=%d \n",devno);
890      scsidev_device *scsidev = owner()->subdevice<scsidev_device>( scsidevs->devices[devno].tag );
888      scsidev_device *scsidev = downcast<scsidev_device *>(device);
891889      devices[scsidev->GetDeviceID()] = scsidev;
892890   }
893891}
trunk/src/mess/machine/scsibus.h
r17540r17541
2121typedef struct _SCSIBus_interface SCSIBus_interface;
2222struct _SCSIBus_interface
2323{
24    const SCSIConfigTable *scsidevs;      /* SCSI devices */
2524    void (*line_change_cb)(device_t *, UINT8 line, UINT8 state);
2625
2726   devcb_write_line _out_bsy_func;
trunk/src/mess/machine/lux4105.c
r17540r17541
88*********************************************************************/
99
1010#include "lux4105.h"
11#include "machine/scsihd.h"
1112
1213
1314
r17540r17541
3031//  SCSIBus_interface sasi_intf
3132//-------------------------------------------------
3233
33static const SCSIConfigTable sasi_dev_table =
34{
35   1, /* 1 SCSI device */
36   {
37      { "harddisk0" }
38   }
39};
40
4134WRITE_LINE_MEMBER( luxor_4105_device::sasi_bsy_w )
4235{
4336   if (!state)
r17540r17541
7063
7164static const SCSIBus_interface sasi_intf =
7265{
73    &sasi_dev_table,
74    NULL,
66   NULL,
7567   DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, luxor_4105_device, sasi_bsy_w),
7668   DEVCB_NULL,
7769   DEVCB_NULL,
r17540r17541
8779//-------------------------------------------------
8880
8981static MACHINE_CONFIG_FRAGMENT( luxor_4105 )
90    MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
82   MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
83   MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
9184MACHINE_CONFIG_END
9285
9386
trunk/src/mess/machine/d9060.c
r17540r17541
139139//  SCSIBus_interface sasi_intf
140140//-------------------------------------------------
141141
142static const SCSIConfigTable sasi_dev_table =
143{
144   1, /* 1 SCSI device */
145   {
146      { "harddisk0" }
147   }
148};
149
150142WRITE_LINE_MEMBER( base_d9060_device::req_w )
151143{
152144   m_via->write_ca1(!state);
r17540r17541
154146
155147static const SCSIBus_interface sasi_intf =
156148{
157    &sasi_dev_table,
158    NULL,
149   NULL,
159150   DEVCB_NULL,
160151   DEVCB_NULL,
161152   DEVCB_NULL,
r17540r17541
469460   MCFG_VIA6522_ADD(M6522_TAG, XTAL_4MHz/4, via_intf)
470461
471462   MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
472   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
463   MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
473464MACHINE_CONFIG_END
474465
475466
trunk/src/mess/machine/abc_hdc.c
r17540r17541
8888//  SCSIBus_interface sasi_intf
8989//-------------------------------------------------
9090
91static const SCSIConfigTable sasi_dev_table =
92{
93   1, /* 1 SCSI device */
94   {
95      { "harddisk0" }
96   }
97};
98
9991static const SCSIBus_interface sasi_intf =
10092{
101   &sasi_dev_table,
10293   NULL,
10394   DEVCB_NULL,
10495   DEVCB_NULL,
r17540r17541
121112   MCFG_CPU_CONFIG(daisy_chain)
122113
123114   MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
124   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
115   MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
125116MACHINE_CONFIG_END
126117
127118
trunk/src/mess/machine/e01.c
r17540r17541
262262//  SCSIBus_interface scsi_intf
263263//-------------------------------------------------
264264
265static const SCSIConfigTable scsi_dev_table =
266{
267   1, /* 1 SCSI device */
268   {
269      { "harddisk0" }
270   }
271};
272
273265WRITE_LINE_MEMBER( e01_device::scsi_bsy_w )
274266{
275267   if (!state)
r17540r17541
291283
292284static const SCSIBus_interface scsi_intf =
293285{
294    &scsi_dev_table,
295    NULL,
286   NULL,
296287   DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, scsi_bsy_w),
297288   DEVCB_NULL,
298289   DEVCB_NULL,
r17540r17541
357348   MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, e01_centronics_intf)
358349
359350   MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf)
360   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
351   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
361352
362353   // internal ram
363354   MCFG_RAM_ADD(RAM_TAG)
trunk/src/mess/includes/rmnimbus.h
r17540r17541
314314#define NO_DRIVE_SELECTED   0xFF
315315
316316/* SASI harddisk interface */
317#define HARDDISK0_TAG           "harddisk0"
318#define HARDDISK1_TAG           "harddisk1"
319#define HARDDISK2_TAG           "harddisk2"
320#define HARDDISK3_TAG           "harddisk3"
321
322317#define SCSIBUS_TAG             "scsibus"
323318
324319void nimbus_scsi_linechange(device_t *device, UINT8 line, UINT8 state);
trunk/src/mess/includes/abc1600.h
r17540r17541
1616#include "machine/e0516.h"
1717#include "machine/lux4105.h"
1818#include "machine/nmc9306.h"
19#include "machine/scsihd.h"
2019#include "machine/s1410.h"
2120#include "machine/wd17xx.h"
2221#include "machine/z80dart.h"
trunk/src/mess/drivers/v1050.c
r17540r17541
989989//  SCSIBus_interface sasi_intf
990990//-------------------------------------------------
991991
992static const SCSIConfigTable sasi_dev_table =
993{
994   1, /* 1 SCSI device */
995   {
996      { "harddisk0" }
997   }
998};
999
1000992static const SCSIBus_interface sasi_intf =
1001993{
1002    &sasi_dev_table,
1003    NULL,
994   NULL,
1004995   DEVCB_NULL,
1005996   DEVCB_NULL,
1006997   DEVCB_NULL,
r17540r17541
11201111   MCFG_TIMER_ADD(TIMER_SIO_TAG, sio_8251_tick)
11211112
11221113   // SASI bus
1123    MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
1114   MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
1115   MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
1116
11241117   MCFG_TIMER_ADD(TIMER_ACK_TAG, sasi_ack_tick)
11251118   MCFG_TIMER_ADD(TIMER_RST_TAG, sasi_rst_tick)
1126   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
11271119
11281120   // keyboard
11291121   MCFG_V1050_KEYBOARD_ADD()
trunk/src/mess/drivers/bullet.c
r17540r17541
10241024//  SCSIBus_interface scsi_intf
10251025//-------------------------------------------------
10261026
1027static const SCSIConfigTable scsi_dev_table =
1028{
1029   1, /* 1 SCSI device */
1030   {
1031      { "harddisk0" }
1032   }
1033};
1034
10351027WRITE_LINE_MEMBER( bulletf_state::req_w )
10361028{
10371029   if (state)
r17540r17541
10471039
10481040static const SCSIBus_interface scsi_intf =
10491041{
1050    &scsi_dev_table,
1051    NULL,
1042   NULL,
10521043   DEVCB_NULL,
10531044   DEVCB_NULL,
10541045   DEVCB_NULL,
r17540r17541
12141205   MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bullet_floppy_interface)
12151206   MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
12161207   MCFG_SERIAL_TERMINAL_ADD(TERMINAL_TAG, terminal_intf, 4800)
1217    MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf)
1218   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
12191208
1209   MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf)
1210   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
1211
12201212   // software lists
12211213   MCFG_SOFTWARE_LIST_ADD("flop_list", "wmbullet")
12221214
trunk/src/mess/drivers/abc1600.c
r17540r17541
19321932   MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz)
19331933   MCFG_FD1797_ADD(SAB1797_02P_TAG, fdc_intf)
19341934   MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, abc1600_floppy_interface)
1935   MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
19361935   MCFG_ABC99_ADD(abc99_intf)
19371936   MCFG_S1410_ADD()
19381937
trunk/src/mess/drivers/rmnimbus.c
r17540r17541
7878   MSM5205_S48_4B      /* 8 kHz */
7979};
8080
81static const SCSIConfigTable nimbus_scsi_dev_table =
82{
83   4, /* 4 SCSI devices */
84   {
85      { HARDDISK0_TAG },
86      { HARDDISK1_TAG },
87      { HARDDISK2_TAG },
88      { HARDDISK3_TAG },
89   }
90};
91
92
9381static const SCSIBus_interface scsibus_config =
9482{
95    &nimbus_scsi_dev_table,
96    &nimbus_scsi_linechange
83   &nimbus_scsi_linechange
9784};
9885
9986static const centronics_interface nimbus_centronics_config =
r17540r17541
334321   MCFG_WD2793_ADD(FDC_TAG, nimbus_wd17xx_interface )
335322   MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(nimbus_floppy_interface)
336323
337   MCFG_SCSIDEV_ADD(HARDDISK0_TAG, SCSIHD, SCSI_ID_0)
338   MCFG_SCSIDEV_ADD(HARDDISK1_TAG, SCSIHD, SCSI_ID_1)
339   MCFG_SCSIDEV_ADD(HARDDISK2_TAG, SCSIHD, SCSI_ID_2)
340   MCFG_SCSIDEV_ADD(HARDDISK3_TAG, SCSIHD, SCSI_ID_3)
341    MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsibus_config)
324   MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsibus_config)
325   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk0", SCSIHD, SCSI_ID_0)
326   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk1", SCSIHD, SCSI_ID_1)
327   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk2", SCSIHD, SCSI_ID_2)
328   MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":harddisk3", SCSIHD, SCSI_ID_3)
342329
343330    MCFG_RAM_ADD(RAM_TAG)
344331   MCFG_RAM_DEFAULT_SIZE("1536K")

Previous 199869 Revisions Next

© 1997-2024 The MAME Team