Previous 15994 Revisions Next

r4828 Monday 25th May, 2009 at 10:54:22 UTC by Fabio Priuli
[CBM] Converted Commodore IEEE Bus (Parallel Bus) to be a device. The rest of the implementation has not been changed. More work is definitely needed (see comments in machine/cbmieeeb.c)
[src/mess/drivers]cbmb.c pet.c vc20.c
[src/mess/includes]cbmieeeb.h
[src/mess/machine]cbmb.c cbmdrive.c cbmieeeb.c pet.c vc20.c

src/mess/includes/cbmieeeb.h
r4827r4828
1010
1111/*----------- defined in machine/cbmieeeb.c -----------*/
1212
13/***************************************************************************
14    MACROS / CONSTANTS
15***************************************************************************/
16
17#define CBM_IEEEBUS      DEVICE_GET_INFO_NAME(cbm_ieee_bus)
18
19#define MDRV_CBM_IEEEBUS_ADD(_tag) \
20   MDRV_DEVICE_ADD(_tag, CBM_IEEEBUS, 0)
21
22#define MDRV_CBM_IEEEBUS_REMOVE(_tag) \
23   MDRV_DEVICE_REMOVE(_tag)
24
25/***************************************************************************
26    PROTOTYPES
27***************************************************************************/
28
29DEVICE_GET_INFO( cbm_ieee_bus );
30
1331void cbm_ieee_open(void);
1432
15void cbm_ieee_dav_w(running_machine *machine, int device, int data);
16void cbm_ieee_nrfd_w(running_machine *machine, int device, int data);
17void cbm_ieee_ndac_w(running_machine *machine, int device, int data);
18void cbm_ieee_atn_w(running_machine *machine, int device, int data);
19void cbm_ieee_eoi_w(running_machine *machine, int device, int data);
20void cbm_ieee_data_w(running_machine *machine, int device, int data);
33void cbm_ieee_dav_w(const device_config *ieeedev, int device, int data);
34void cbm_ieee_nrfd_w(const device_config *ieeedev, int device, int data);
35void cbm_ieee_ndac_w(const device_config *ieeedev, int device, int data);
36void cbm_ieee_atn_w(const device_config *ieeedev, int device, int data);
37void cbm_ieee_eoi_w(const device_config *ieeedev, int device, int data);
38void cbm_ieee_data_w(const device_config *ieeedev, int device, int data);
2139
22int cbm_ieee_srq_r(running_machine *machine);
23int cbm_ieee_dav_r(running_machine *machine);
24int cbm_ieee_nrfd_r(running_machine *machine);
25int cbm_ieee_ndac_r(running_machine *machine);
26int cbm_ieee_atn_r(running_machine *machine);
27int cbm_ieee_eoi_r(running_machine *machine);
28int cbm_ieee_data_r(running_machine *machine);
40WRITE8_DEVICE_HANDLER( cbm_ieee_dav_write );
41WRITE8_DEVICE_HANDLER( cbm_ieee_nrfd_write );
42WRITE8_DEVICE_HANDLER( cbm_ieee_ndac_write );
43WRITE8_DEVICE_HANDLER( cbm_ieee_atn_write );
44WRITE8_DEVICE_HANDLER( cbm_ieee_eoi_write );
45WRITE8_DEVICE_HANDLER( cbm_ieee_data_write );
2946
47READ8_DEVICE_HANDLER( cbm_ieee_srq_r );
48READ8_DEVICE_HANDLER( cbm_ieee_dav_r );
49READ8_DEVICE_HANDLER( cbm_ieee_nrfd_r );
50READ8_DEVICE_HANDLER( cbm_ieee_ndac_r );
51READ8_DEVICE_HANDLER( cbm_ieee_atn_r );
52READ8_DEVICE_HANDLER( cbm_ieee_eoi_r );
53READ8_DEVICE_HANDLER( cbm_ieee_data_r );
54
3055/* for debugging  */
31READ8_HANDLER(cbm_ieee_state);
56READ8_DEVICE_HANDLER( cbm_ieee_state );
3257
3358
3459#endif /* CBMIEEEB_H_ */
src/mess/machine/cbmb.c
r4827r4828
7070 */
7171READ8_DEVICE_HANDLER( cbmb_tpi0_port_a_r )
7272{
73   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
7374   int data = 0;
7475
75   if (cbm_ieee_nrfd_r(device->machine)) data |= 0x80;
76   if (cbm_ieee_ndac_r(device->machine)) data |= 0x40;
77   if (cbm_ieee_eoi_r(device->machine)) data |= 0x20;
78   if (cbm_ieee_dav_r(device->machine)) data |= 0x10;
79   if (cbm_ieee_atn_r(device->machine)) data |= 0x08;
80/*  if (cbm_ieee_ren_r(device->machine)) data |= 0x04; */
76   if (cbm_ieee_nrfd_r(ieeebus, 0))
77      data |= 0x80;
8178
79   if (cbm_ieee_ndac_r(ieeebus, 0))
80      data |= 0x40;
81
82   if (cbm_ieee_eoi_r(ieeebus, 0))
83      data |= 0x20;
84
85   if (cbm_ieee_dav_r(ieeebus, 0))
86      data |= 0x10;
87
88   if (cbm_ieee_atn_r(ieeebus, 0))
89      data |= 0x08;
90
91/*  if (cbm_ieee_ren_r(ieeebus, 0))
92      data |= 0x04; */
93
8294   return data;
8395}
8496
8597WRITE8_DEVICE_HANDLER( cbmb_tpi0_port_a_w )
8698{
87   cbm_ieee_nrfd_w(device->machine, 0, data & 0x80);
88   cbm_ieee_ndac_w(device->machine, 0, data & 0x40);
89   cbm_ieee_eoi_w(device->machine, 0, data & 0x20);
90   cbm_ieee_dav_w(device->machine, 0, data & 0x10);
91   cbm_ieee_atn_w(device->machine, 0, data & 0x08);
92/*  cbm_ieee_ren_w(device->machine, 0, data & 0x04); */
99   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
100
101   cbm_ieee_nrfd_write(ieeebus, 0, data & 0x80);
102   cbm_ieee_ndac_write(ieeebus, 0, data & 0x40);
103   cbm_ieee_eoi_write(ieeebus, 0, data & 0x20);
104   cbm_ieee_dav_write(ieeebus, 0, data & 0x10);
105   cbm_ieee_atn_write(ieeebus, 0, data & 0x08);
106/*  cbm_ieee_ren_write(ieeebus, 0, data & 0x04); */
93107   logerror("cbm ieee %d %d\n", data & 0x02, data & 0x01);
94108}
95109
r4827r4828
231245 */
232246static READ8_DEVICE_HANDLER( cbmb_cia_port_a_r )
233247{
234   return cbm_ieee_data_r(device->machine);
248   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
249   return cbm_ieee_data_r(ieeebus, 0);
235250}
236251
237252static WRITE8_DEVICE_HANDLER( cbmb_cia_port_a_w )
238253{
239   cbm_ieee_data_w(device->machine, 0, data);
254   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
255   cbm_ieee_data_write(ieeebus, 0, data);
240256}
241257
242258const cia6526_interface cbmb_cia =
r4827r4828
284300
285301   state->p500 = 0;
286302   state->cbm700 = 0;
287   cbm_ieee_open();
288303}
289304
290305DRIVER_INIT( cbm600 )
src/mess/machine/pet.c
r4827r4828
7676*/
7777static READ8_DEVICE_HANDLER ( pet_pia0_port_a_read )
7878{
79   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
7980   int data = 0xf0 | pet_keyline_select;
8081
8182   if ((cassette_get_state(devtag_get_device(device->machine, "cassette1")) & CASSETTE_MASK_UISTATE) != CASSETTE_STOPPED)
r4827r4828
8485   if ((cassette_get_state(devtag_get_device(device->machine, "cassette2")) & CASSETTE_MASK_UISTATE) != CASSETTE_STOPPED)
8586      data &= ~0x20;
8687
87   if (!cbm_ieee_eoi_r(device->machine))
88   if (!cbm_ieee_eoi_r(ieeebus, 0))
8889      data &= ~0x40;
8990
9091   return data;
r4827r4828
150151
151152static WRITE8_DEVICE_HANDLER( pet_pia0_ca2_out )
152153{
153   cbm_ieee_eoi_w(device->machine, 0, data);
154   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
155   cbm_ieee_eoi_write(ieeebus, 0, data);
154156}
155157
156158static WRITE8_DEVICE_HANDLER( pet_pia0_cb2_out )
r4827r4828
194196 */
195197static READ8_DEVICE_HANDLER ( pet_pia1_port_a_read )
196198{
197   return cbm_ieee_data_r(device->machine);
199   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
200   return cbm_ieee_data_r(ieeebus, 0);
198201}
199202
200203static WRITE8_DEVICE_HANDLER ( pet_pia1_port_b_write )
201204{
202   cbm_ieee_data_w(device->machine, 0, data);
205   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
206   cbm_ieee_data_write(ieeebus, 0, data);
203207}
204208
205209static READ8_DEVICE_HANDLER ( pet_pia1_ca1_read )
206210{
207   return cbm_ieee_atn_r(device->machine);
211   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
212   return cbm_ieee_atn_r(ieeebus,0 );
208213}
209214
210215static WRITE8_DEVICE_HANDLER ( pet_pia1_ca2_write )
211216{
212   cbm_ieee_ndac_w(device->machine, 0, data);
217   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
218   cbm_ieee_ndac_write(ieeebus, 0, data);
213219}
214220
215221static WRITE8_DEVICE_HANDLER ( pet_pia1_cb2_write )
216222{
217   cbm_ieee_dav_w(device->machine, 0, data);
223   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
224   cbm_ieee_dav_write(ieeebus, 0, data);
218225}
219226
220227static READ8_DEVICE_HANDLER ( pet_pia1_cb1_read )
221228{
222   return cbm_ieee_srq_r(device->machine);
229   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
230   return cbm_ieee_srq_r(ieeebus, 0);
223231}
224232
225233const pia6821_interface pet_pia0 =
r4827r4828
297305 */
298306static READ8_DEVICE_HANDLER( pet_via_port_b_r )
299307{
308   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
300309   UINT8 data = 0;
301310
302   if (cbm_ieee_ndac_r(device->machine)) data |= 0x01;
311   if (cbm_ieee_ndac_r(ieeebus, 0))
312      data |= 0x01;
303313
304314   //  data & 0x08 -> cassette write (it seems to BOTH cassettes from schematics)
305315
r4827r4828
314324      timer_reset(datasette2_timer, attotime_never);
315325   }
316326
317   if (cbm_ieee_nrfd_r(device->machine)) data |= 0x40;
327   if (cbm_ieee_nrfd_r(ieeebus, 0))
328      data |= 0x40;
318329
319   if (cbm_ieee_dav_r(device->machine)) data |= 0x80;
330   if (cbm_ieee_dav_r(ieeebus, 0))
331      data |= 0x80;
320332
321333   return data;
322334}
r4827r4828
331343
332344static WRITE8_DEVICE_HANDLER( pet_via_port_b_w )
333345{
334   cbm_ieee_nrfd_w(device->machine, 0, data & 2);
335   cbm_ieee_atn_w(device->machine, 0, data & 4);
346   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
347   cbm_ieee_nrfd_write(ieeebus, 0, data & 2);
348   cbm_ieee_atn_write(ieeebus, 0, data & 4);
336349}
337350
338351
r4827r4828
617630   /* datasette */
618631   datasette1_timer = timer_alloc(machine, pet_tape1_timer, NULL);
619632   datasette2_timer = timer_alloc(machine, pet_tape2_timer, NULL);
620
621   cbm_ieee_open();
622633}
623634
624635
src/mess/machine/cbmdrive.c
r4827r4828
13201320
13211321void c2031_state(running_machine *machine, CBM_Drive *drive)
13221322{
1323   const device_config *ieeebus = devtag_get_device(machine, "ieee_bus");
13231324   int oldstate = drive->i.ieee.state;
13241325   int data;
13251326
13261327   switch (drive->i.ieee.state)
13271328   {
13281329   case 0:
1329      if (!cbm_ieee_dav_r(machine))
1330      if (!cbm_ieee_dav_r(ieeebus, 0))
13301331      {
13311332         drive->i.ieee.state = 10;
13321333      }
1333      else if (!cbm_ieee_atn_r(machine))
1334      else if (!cbm_ieee_atn_r(ieeebus, 0))
13341335      {
13351336         drive->i.ieee.state = 11;
1336         cbm_ieee_ndac_w(machine, 1, 0);
1337         cbm_ieee_ndac_w(ieeebus, 1, 0);
13371338         logerror("arsch\n");
13381339      }
13391340      break;
13401341   case 1:
13411342      break;
13421343   case 10:
1343      if (cbm_ieee_dav_r(machine))
1344      if (cbm_ieee_dav_r(ieeebus, 0))
13441345      {
13451346         drive->i.ieee.state++;
1346         cbm_ieee_nrfd_w(machine, 1, 1);
1347         cbm_ieee_ndac_w(machine, 1, 0);
1347         cbm_ieee_nrfd_w(ieeebus, 1, 1);
1348         cbm_ieee_ndac_w(ieeebus, 1, 0);
13481349      }
13491350      break;
13501351   case 11:
1351      if (!cbm_ieee_dav_r(machine))
1352      if (!cbm_ieee_dav_r(ieeebus, 0))
13521353      {
1353         cbm_ieee_nrfd_w(machine, 1, 0);
1354         data = cbm_ieee_data_r(machine) ^ 0xff;
1355         cbm_ieee_ndac_w(machine, 1, 1);
1354         cbm_ieee_nrfd_w(ieeebus, 1, 0);
1355         data = cbm_ieee_data_r(ieeebus, 0) ^ 0xff;
1356         cbm_ieee_ndac_w(ieeebus, 1, 1);
13561357         logerror("byte received %.2x\n",data);
1357         if (!cbm_ieee_atn_r(machine) && ((data & 0x0f) == drive->i.ieee.device))
1358         if (!cbm_ieee_atn_r(ieeebus, 0) && ((data & 0x0f) == drive->i.ieee.device))
13581359         {
13591360            if ((data & 0xf0) == 0x40)
13601361               drive->i.ieee.state = 30;
r4827r4828
13751376      break;
13761377      /* wait until atn is released */
13771378   case 12:
1378      if (cbm_ieee_atn_r(machine))
1379      if (cbm_ieee_atn_r(ieeebus, 0))
13791380      {
13801381         drive->i.ieee.state++;
1381         cbm_ieee_nrfd_w(machine, 1, 0);
1382         cbm_ieee_nrfd_w(ieeebus, 1, 0);
13821383      }
13831384      break;
13841385   case 13:
1385      if (!cbm_ieee_atn_r(machine))
1386      if (!cbm_ieee_atn_r(ieeebus, 0))
13861387      {
13871388         drive->i.ieee.state = 10;
1388/*         cbm_ieee_nrfd_w(machine, 1, 0); */
1389/*         cbm_ieee_nrfd_w(ieeebus, 1, 0); */
13891390      }
13901391      break;
13911392
13921393      /* receiving rest of command */
13931394   case 20:
1394      if (cbm_ieee_dav_r(machine))
1395      if (cbm_ieee_dav_r(ieeebus, 0))
13951396      {
13961397         drive->i.ieee.state++;
1397         cbm_ieee_nrfd_w(machine, 1, 1);
1398         cbm_ieee_ndac_w(machine, 1, 0);
1398         cbm_ieee_nrfd_w(ieeebus, 1, 1);
1399         cbm_ieee_ndac_w(ieeebus, 1, 0);
13991400      }
14001401      break;
14011402   case 21:
1402      if (!cbm_ieee_dav_r(machine))
1403      if (!cbm_ieee_dav_r(ieeebus, 0))
14031404      {
1404         cbm_ieee_nrfd_w(machine, 1, 0);
1405         data = cbm_ieee_data_r(machine) ^ 0xff;
1405         cbm_ieee_nrfd_w(ieeebus, 1, 0);
1406         data = cbm_ieee_data_r(ieeebus, 0) ^ 0xff;
14061407         logerror("byte received %.2x\n",data);
14071408         if (drive->cmdpos < sizeof (drive->cmdbuffer))
14081409            drive->cmdbuffer[drive->cmdpos++] = data;
1409         if (!cbm_ieee_atn_r(machine) && ((data & 0xf) == 0xf))
1410         if (!cbm_ieee_atn_r(ieeebus, 0) && ((data & 0xf) == 0xf))
14101411         {
14111412            cbm_command(machine, drive);
14121413            drive->i.ieee.state = 10;
r4827r4828
14141415         else
14151416            drive->i.ieee.state = 20;
14161417
1417         cbm_ieee_ndac_w(machine, 1, 1);
1418         cbm_ieee_ndac_w(ieeebus, 1, 1);
14181419      }
14191420      break;
14201421
14211422      /* read command */
14221423   case 30:
1423      if (cbm_ieee_dav_r(machine))
1424      if (cbm_ieee_dav_r(ieeebus, 0))
14241425      {
14251426         drive->i.ieee.state++;
1426         cbm_ieee_nrfd_w(machine, 1, 1);
1427         cbm_ieee_ndac_w(machine, 1, 0);
1427         cbm_ieee_nrfd_w(ieeebus, 1, 1);
1428         cbm_ieee_ndac_w(ieeebus, 1, 0);
14281429      }
14291430      break;
14301431   case 31:
1431      if (!cbm_ieee_dav_r(machine))
1432      if (!cbm_ieee_dav_r(ieeebus, 0))
14321433      {
1433         cbm_ieee_nrfd_w(machine, 1, 0);
1434         data = cbm_ieee_data_r(machine) ^ 0xff;
1434         cbm_ieee_nrfd_w(ieeebus, 1, 0);
1435         data = cbm_ieee_data_r(ieeebus, 0) ^ 0xff;
14351436         logerror("byte received %.2x\n", data);
14361437         if (drive->cmdpos < sizeof (drive->cmdbuffer))
14371438            drive->cmdbuffer[drive->cmdpos++] = data;
r4827r4828
14401441            drive->i.ieee.state++;
14411442         else
14421443            drive->i.ieee.state = 10;
1443         cbm_ieee_ndac_w(machine, 1, 1);
1444         cbm_ieee_ndac_w(ieeebus, 1, 1);
14441445      }
14451446      break;
14461447   case 32:
1447      if (cbm_ieee_dav_r(machine))
1448      if (cbm_ieee_dav_r(ieeebus, 0))
14481449      {
1449         cbm_ieee_nrfd_w(machine, 1, 1);
1450         cbm_ieee_nrfd_w(ieeebus, 1, 1);
14501451         drive->i.ieee.state = 40;
14511452      }
14521453      break;
14531454   case 40:
1454      if (!cbm_ieee_ndac_r(machine))
1455      if (!cbm_ieee_ndac_r(ieeebus, 0))
14551456      {
1456         cbm_ieee_data_w(machine, 1, drive->buffer[drive->pos++] ^ 0xff);
1457         cbm_ieee_data_w(ieeebus, 1, drive->buffer[drive->pos++] ^ 0xff);
14571458         if (drive->pos >= drive->size)
1458            cbm_ieee_eoi_w(machine, 1, 0);
1459         cbm_ieee_dav_w(machine, 1, 0);
1459            cbm_ieee_eoi_w(ieeebus, 1, 0);
1460         cbm_ieee_dav_w(ieeebus, 1, 0);
14601461         drive->i.ieee.state++;
14611462      }
14621463      break;
14631464   case 41:
1464      if (!cbm_ieee_nrfd_r(machine))
1465      if (!cbm_ieee_nrfd_r(ieeebus, 0))
14651466      {
14661467         drive->i.ieee.state++;
14671468      }
14681469      break;
14691470   case 42:
1470      if (cbm_ieee_ndac_r(machine))
1471      if (cbm_ieee_ndac_r(ieeebus, 0))
14711472      {
1472         if (cbm_ieee_eoi_r(machine))
1473         if (cbm_ieee_eoi_r(ieeebus, 0))
14731474            drive->i.ieee.state = 40;
14741475
14751476         else
14761477         {
1477            cbm_ieee_data_w(machine, 1, 0xff);
1478            cbm_ieee_ndac_w(machine, 1, 0);
1479            cbm_ieee_nrfd_w(machine, 1, 0);
1480            cbm_ieee_eoi_w(machine, 1, 1);
1478            cbm_ieee_data_w(ieeebus, 1, 0xff);
1479            cbm_ieee_ndac_w(ieeebus, 1, 0);
1480            cbm_ieee_nrfd_w(ieeebus, 1, 0);
1481            cbm_ieee_eoi_w(ieeebus, 1, 1);
14811482            drive->i.ieee.state = 10;
14821483         }
1483         cbm_ieee_dav_w(machine, 1, 1);
1484         cbm_ieee_dav_w(ieeebus, 1, 1);
14841485      }
14851486      break;
14861487   }
src/mess/machine/cbmieeeb.c
r4827r4828
1/*
2 commodore ieee 488 (parallel) bus
3*/
1/***************************************************************************
42
3    Commodore IEEE 488 (Parallel) Bus
4
5
6
7    2009-05 FP: Changed the implementation to be a MAME device. However,
8    the main code has been kept the same as before (to reduce the risk of
9    regressions, at this early stage). More work will be eventually done
10    to improve emulation and to allow more devices (possibly of different
11    kinds) to be connected to the bus like in the real thing.
12    Notice that write handlers which are passed to the drivers, are always
13    calling functions with the "device" parameter as 0. In turn, this calls
14    c2031_state from machine/cbmdrive.c which calls again the functions with
15    "device" parameter = 1! This forces the current code to export both the
16    DEVICE_HANDLERs and the functions called by them.
17    Eventually, proper emulation will remove the need of c2031_state (multiple
18    devices would be identified by their tags) and it will allow to only export
19    the DEVICE_HANDLERs, as it would be preferable.
20
21    As I have written in cbmserb.c, you should not use this driver as an
22    example of the right way to implement parallel devices in MAME/MESS!
23
24***************************************************************************/
25
26/*     Documentation:       */
527/*
628
729                                 IEEE-488
r4827r4828
298320      My Commodore Site: http://www.worldaccess.nl/~rbaltiss/cbm.htm
299321 */
300322
323
301324#include "driver.h"
302325
326#include "includes/cbmieeeb.h"
327
328/***************************************************************************
329    TYPE DEFINITIONS
330***************************************************************************/
331
332typedef struct _cbm_ieee_bus_t cbm_ieee_bus_t;
333struct _cbm_ieee_bus_t
334{
335   struct {
336      UINT8 data;
337/*      int fic; */
338      int dav, nrfd, ndac, atn, eoi, ren;
339      int srq;
340   } bus[2];
341};
342
343/***************************************************************************
344    INLINE FUNCTIONS
345***************************************************************************/
346
347INLINE cbm_ieee_bus_t *get_safe_token(const device_config *device)
348{
349   assert(device != NULL);
350   assert(device->token != NULL);
351   assert(device->type == CBM_IEEEBUS);
352   return (cbm_ieee_bus_t *)device->token;
353}
354
355/***************************************************************************
356    IMPLEMENTATION
357***************************************************************************/
358
359/* This is needed for c2031_state - It will eventually disappear */
303360#include "includes/cbmdrive.h"
304#include "includes/cbmserb.h"
305361
306#include "includes/cbmieeeb.h"
307362
308363#define VERBOSE_LEVEL 0
309#define DBG_LOG(N,M,A) \
364#define DBG_LOG( N, M, A ) \
310365   do { \
311366      if(VERBOSE_LEVEL >= N) \
312367      { \
r4827r4828
335390 srq serial request master input, other output
336391 */
337392
338static struct {
339   struct {
340      UINT8 data;
341/*      int fic; */
342      int dav, nrfd, ndac, atn, eoi, ren;
343      int srq;
344   } bus[2];
345} cbmieee= { { { 0 } } };
393/* TODO - These functions are used in the write handlers but also in c2031_state, hence
394cannot be static. However, it would be better if only the WRITE8_DEVICE_HANDLER would be
395made available to the rest of the source. */
346396
347void cbm_ieee_open(void)
397void cbm_ieee_dav_w( const device_config *ieeedev, int device, int data )
348398{
349   int i;
350   for (i=0; i<2; i++) {
351      cbmieee.bus[i].dav=1;
352      cbmieee.bus[i].nrfd=1;
353      cbmieee.bus[i].ndac=1;
354      cbmieee.bus[i].atn=1;
355      cbmieee.bus[i].eoi=1;
356      cbmieee.bus[i].srq=1;
399   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
357400
358      cbmieee.bus[i].data=0xff;
359   }
401//   DBG_LOG(1, "cbm ieee dav", ("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
402   ieeebus->bus[device].dav = data;
403   if (device == 0)
404      c2031_state(ieeedev->machine, cbm_drive);
360405}
361406
362void cbm_ieee_dav_w(running_machine *machine, int device, int data)
407WRITE8_DEVICE_HANDLER( cbm_ieee_dav_write )
363408{
364//   DBG_LOG(1,"cbm ieee dav",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
365   cbmieee.bus[device].dav=data;
366   if (device==0) c2031_state(machine, cbm_drive);
409   cbm_ieee_dav_w(device, 0, data );
367410}
368411
369void cbm_ieee_nrfd_w(running_machine *machine, int device, int data)
412void cbm_ieee_nrfd_w( const device_config *ieeedev, int device, int data )
370413{
371//   DBG_LOG(1,"cbm ieee nrfd",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
372   cbmieee.bus[device].nrfd=data;
373   if (device==0) c2031_state(machine, cbm_drive);
414   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
415
416//   DBG_LOG(1, "cbm ieee nrfd", ("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
417   ieeebus->bus[device].nrfd = data;
418   if (device == 0)
419      c2031_state(ieeedev->machine, cbm_drive);
374420}
375421
376void cbm_ieee_ndac_w(running_machine *machine, int device, int data)
422WRITE8_DEVICE_HANDLER( cbm_ieee_nrfd_write )
377423{
378//   DBG_LOG(1,"cbm ieee ndac",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
379   cbmieee.bus[device].ndac=data;
380   if (device==0) c2031_state(machine, cbm_drive);
424   cbm_ieee_nrfd_w(device, 0, data );   
381425}
382426
383void cbm_ieee_atn_w(running_machine *machine, int device, int data)
427void cbm_ieee_ndac_w( const device_config *ieeedev, int device, int data )
384428{
385//   DBG_LOG(1,"cbm ieee atn",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
386   cbmieee.bus[device].atn=data;
387   if (device==0) c2031_state(machine, cbm_drive);
429   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
430
431//   DBG_LOG(1, "cbm ieee ndac",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
432   ieeebus->bus[device].ndac = data;
433   if (device == 0)
434      c2031_state(ieeedev->machine, cbm_drive);
388435}
389436
390void cbm_ieee_eoi_w(running_machine *machine, int device, int data)
437WRITE8_DEVICE_HANDLER( cbm_ieee_ndac_write )
391438{
392//   DBG_LOG(1,"cbm ieee eoi",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
393   cbmieee.bus[device].eoi=data;
394   if (device==0) c2031_state(machine, cbm_drive);
439   cbm_ieee_ndac_w(device, 0, data );   
395440}
396441
397void cbm_ieee_data_w(running_machine *machine, int device, int data)
442void cbm_ieee_atn_w( const device_config *ieeedev, int device, int data )
398443{
399//   DBG_LOG(1,"cbm ieee data",("%.4x dev:%d %.2x\n", activecpu_get_pc(), device, data));
400   cbmieee.bus[device].data=data;
401   if (device==0) c2031_state(machine, cbm_drive);
444   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
445
446//   DBG_LOG(1, "cbm ieee atn",("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
447   ieeebus->bus[device].atn = data;
448   if (device == 0)
449      c2031_state(ieeedev->machine, cbm_drive);
402450}
403451
404int cbm_ieee_srq_r(running_machine *machine)
452WRITE8_DEVICE_HANDLER( cbm_ieee_atn_write )
405453{
406   int data=cbmieee.bus[1].srq;
407   DBG_LOG(1,"cbm ieee srq",("read %d\n", data));
454   cbm_ieee_atn_w(device, 0, data );   
455}
456
457void cbm_ieee_eoi_w( const device_config *ieeedev, int device, int data )
458{
459   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
460
461//   DBG_LOG(1, "cbm ieee eoi", ("%.4x dev:%d %d\n", activecpu_get_pc(), device, data));
462   ieeebus->bus[device].eoi = data;
463   if (device == 0)
464      c2031_state(ieeedev->machine, cbm_drive);
465}
466
467WRITE8_DEVICE_HANDLER( cbm_ieee_eoi_write )
468{
469   cbm_ieee_eoi_w(device, 0, data );   
470}
471
472void cbm_ieee_data_w( const device_config *ieeedev, int device, int data )
473{
474   cbm_ieee_bus_t *ieeebus = get_safe_token(ieeedev);
475
476//   DBG_LOG(1, "cbm ieee data", ("%.4x dev:%d %.2x\n", activecpu_get_pc(), device, data));
477   ieeebus->bus[device].data = data;
478   if (device == 0)
479      c2031_state(ieeedev->machine, cbm_drive);
480}
481
482WRITE8_DEVICE_HANDLER( cbm_ieee_data_write )
483{
484   cbm_ieee_data_w(device, 0, data );   
485}
486
487
488READ8_DEVICE_HANDLER( cbm_ieee_srq_r )
489{
490   running_machine *machine = device->machine;
491   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
492   int data = ieeebus->bus[1].srq;
493
494   DBG_LOG(1, "cbm ieee srq", ("read %d\n", data));
408495   return data;
409496}
410497
411int cbm_ieee_dav_r(running_machine *machine)
498READ8_DEVICE_HANDLER( cbm_ieee_dav_r )
412499{
413   int data=cbmieee.bus[0].dav&&cbmieee.bus[1].dav;
414   DBG_LOG(1,"cbm ieee dav",("read %d\n", data));
500   running_machine *machine = device->machine;
501   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
502   int data = ieeebus->bus[0].dav && ieeebus->bus[1].dav;
503
504   DBG_LOG(1, "cbm ieee dav", ("read %d\n", data));
415505   return data;
416506}
417507
418int cbm_ieee_nrfd_r(running_machine *machine)
508READ8_DEVICE_HANDLER( cbm_ieee_nrfd_r )
419509{
420   int data=cbmieee.bus[0].nrfd && cbmieee.bus[1].nrfd;
421   DBG_LOG(1,"cbm ieee nrfd",("read %d\n", data));
510   running_machine *machine = device->machine;
511   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
512   int data = ieeebus->bus[0].nrfd && ieeebus->bus[1].nrfd;
513
514   DBG_LOG(1, "cbm ieee nrfd", ("read %d\n", data));
422515   return data;
423516}
424517
425int cbm_ieee_ndac_r(running_machine *machine)
518READ8_DEVICE_HANDLER( cbm_ieee_ndac_r )
426519{
427   int data=cbmieee.bus[0].ndac&&cbmieee.bus[1].ndac;
428   DBG_LOG(1,"cbm ieee ndac",("read %d\n", data));
520   running_machine *machine = device->machine;
521   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
522   int data = ieeebus->bus[0].ndac && ieeebus->bus[1].ndac;
523
524   DBG_LOG(1,"cbm ieee ndac", ("read %d\n", data));
429525   return data;
430526}
431527
432int cbm_ieee_atn_r(running_machine *machine)
528READ8_DEVICE_HANDLER( cbm_ieee_atn_r )
433529{
434   int data=cbmieee.bus[0].atn&&cbmieee.bus[1].atn;
435   DBG_LOG(1,"cbm ieee atn",("read %d\n", data));
530   running_machine *machine = device->machine;
531   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
532   int data = ieeebus->bus[0].atn && ieeebus->bus[1].atn;
533
534   DBG_LOG(1,"cbm ieee atn", ("read %d\n", data));
436535   return data;
437536}
438537
439int cbm_ieee_eoi_r(running_machine *machine)
538READ8_DEVICE_HANDLER( cbm_ieee_eoi_r )
440539{
441   int data=cbmieee.bus[0].eoi&&cbmieee.bus[1].eoi;
442/*   DBG_LOG(1,"cbm ieee eoi",("read %d\n", data)); */
540//   running_machine *machine = device->machine;
541   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
542   int data = ieeebus->bus[0].eoi && ieeebus->bus[1].eoi;
543
544/*   DBG_LOG(1, "cbm ieee eoi", ("read %d\n", data)); */
443545   return data;
444546}
445547
446int cbm_ieee_data_r(running_machine *machine)
548READ8_DEVICE_HANDLER( cbm_ieee_data_r )
447549{
448   int data=cbmieee.bus[0].data&cbmieee.bus[1].data;
449   DBG_LOG(1,"cbm ieee data",("read %.2x\n", data));
550   running_machine *machine = device->machine;
551   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
552   int data = ieeebus->bus[0].data & ieeebus->bus[1].data;
553
554   DBG_LOG(1, "cbm ieee data", ("read %.2x\n", data));
450555   return data;
451556}
452557
453558
454READ8_HANDLER(cbm_ieee_state)
559READ8_DEVICE_HANDLER( cbm_ieee_state )
455560{
456   switch (offset) {
457   case 0: return cbmieee.bus[0].data;
458   case 1: return cbmieee.bus[0].atn;
459   case 2: return cbmieee.bus[0].dav;
460   case 3: return cbmieee.bus[0].ndac;
461   case 4: return cbmieee.bus[0].nrfd;
462   case 5: return cbmieee.bus[0].eoi;
463   case 6: return cbmieee.bus[0].ren;
464   case 7: return cbmieee.bus[0].srq;
561   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
465562
466   case 0x10: return cbmieee.bus[1].data;
467   case 0x11: return cbmieee.bus[1].atn;
468   case 0x12: return cbmieee.bus[1].dav;
469   case 0x13: return cbmieee.bus[1].ndac;
470   case 0x14: return cbmieee.bus[1].nrfd;
471   case 0x15: return cbmieee.bus[1].eoi;
472   case 0x16: return cbmieee.bus[1].ren;
473   case 0x17: return cbmieee.bus[1].srq;
563   switch (offset)
564   {
565      case 0: return ieeebus->bus[0].data;
566      case 1: return ieeebus->bus[0].atn;
567      case 2: return ieeebus->bus[0].dav;
568      case 3: return ieeebus->bus[0].ndac;
569      case 4: return ieeebus->bus[0].nrfd;
570      case 5: return ieeebus->bus[0].eoi;
571      case 6: return ieeebus->bus[0].ren;
572      case 7: return ieeebus->bus[0].srq;
573
574      case 0x10: return ieeebus->bus[1].data;
575      case 0x11: return ieeebus->bus[1].atn;
576      case 0x12: return ieeebus->bus[1].dav;
577      case 0x13: return ieeebus->bus[1].ndac;
578      case 0x14: return ieeebus->bus[1].nrfd;
579      case 0x15: return ieeebus->bus[1].eoi;
580      case 0x16: return ieeebus->bus[1].ren;
581      case 0x17: return ieeebus->bus[1].srq;
474582   }
583
475584   return 0;
476585}
586
587/*-------------------------------------------------
588    DEVICE_START( cbm_ieee_bus )
589-------------------------------------------------*/
590
591static DEVICE_START( cbm_ieee_bus )
592{
593   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
594
595   memset(ieeebus, 0, sizeof(*ieeebus));
596
597   /* register for state saving */
598   // We need to save here ieeebus->bus[i]!
599}
600
601/*-------------------------------------------------
602    DEVICE_RESET( cbm_ieee_bus )
603-------------------------------------------------*/
604
605static DEVICE_RESET( cbm_ieee_bus )
606{
607   cbm_ieee_bus_t *ieeebus = get_safe_token(device);
608   int i;
609
610   for (i = 0; i < 2; i++)
611   {
612      ieeebus->bus[i].dav = 1;
613      ieeebus->bus[i].nrfd = 1;
614      ieeebus->bus[i].ndac = 1;
615      ieeebus->bus[i].atn = 1;
616      ieeebus->bus[i].eoi = 1;
617      ieeebus->bus[i].srq = 1;
618
619      ieeebus->bus[i].data = 0xff;
620   }
621}
622
623/*-------------------------------------------------
624    DEVICE_GET_INFO( cbm_ieee_bus )
625-------------------------------------------------*/
626
627DEVICE_GET_INFO( cbm_ieee_bus )
628{
629   switch (state)
630   {
631      /* --- the following bits of info are returned as 64-bit signed integers --- */
632      case DEVINFO_INT_TOKEN_BYTES:               info->i = sizeof(cbm_ieee_bus_t);         break;
633      case DEVINFO_INT_INLINE_CONFIG_BYTES:         info->i = 0;                        break;
634      case DEVINFO_INT_CLASS:                     info->i = DEVICE_CLASS_PERIPHERAL;         break;
635
636      /* --- the following bits of info are returned as pointers to data or functions --- */
637      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(cbm_ieee_bus);   break;
638      case DEVINFO_FCT_STOP:                     /* Nothing */                           break;
639      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(cbm_ieee_bus);   break;
640
641      /* --- the following bits of info are returned as NULL-terminated strings --- */
642      case DEVINFO_STR_NAME:                     strcpy(info->s, "Commodore IEEE Bus");      break;
643      case DEVINFO_STR_FAMILY:                  strcpy(info->s, "Commodore IEEE Bus");      break;
644      case DEVINFO_STR_VERSION:                  strcpy(info->s, "1.0");                  break;
645      case DEVINFO_STR_SOURCE_FILE:               strcpy(info->s, __FILE__);               break;
646      case DEVINFO_STR_CREDITS:                  /* Nothing */                        break;
647   }
648}
src/mess/machine/vc20.c
r4827r4828
361361 */
362362static READ8_DEVICE_HANDLER( vc20_via2_read_portb )
363363{
364   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
364365   UINT8 data = 0;
365   if (cbm_ieee_eoi_r(device->machine)) data |= 0x08;
366   if (cbm_ieee_dav_r(device->machine)) data |= 0x10;
367   if (cbm_ieee_nrfd_r(device->machine)) data |= 0x20;
368   if (cbm_ieee_ndac_r(device->machine)) data |= 0x40;
369   if (cbm_ieee_atn_r(device->machine)) data |= 0x80;
366
367   if (cbm_ieee_eoi_r(ieeebus, 0))
368      data |= 0x08;
369
370   if (cbm_ieee_dav_r(ieeebus, 0))
371      data |= 0x10;
372
373   if (cbm_ieee_nrfd_r(ieeebus, 0))
374      data |= 0x20;
375
376   if (cbm_ieee_ndac_r(ieeebus, 0))
377      data |= 0x40;
378
379   if (cbm_ieee_atn_r(ieeebus, 0))
380      data |= 0x80;
381
370382   return data;
371383}
372384
373385static WRITE8_DEVICE_HANDLER( vc20_via2_write_portb )
374386{
375   cbm_ieee_dav_w(device->machine, 0, data & 0x01);
376   cbm_ieee_nrfd_w(device->machine, 0, data & 0x02);
377   cbm_ieee_ndac_w(device->machine, 0, data & 0x04);
387   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
388
389   cbm_ieee_dav_write(ieeebus, 0, data & 0x01);
390   cbm_ieee_nrfd_write(ieeebus, 0, data & 0x02);
391   cbm_ieee_ndac_write(ieeebus, 0, data & 0x04);
378392}
379393
380394/* ieee 6522 number 2 (via5)
r4827r4828
386400*/
387401static WRITE8_DEVICE_HANDLER( vc20_via3_write_porta )
388402{
389   cbm_ieee_data_w(device->machine, 0, data);
403   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
404   cbm_ieee_data_write(ieeebus, 0, data);
390405}
391406
392407static READ8_DEVICE_HANDLER( vc20_via3_read_portb )
393408{
394   return cbm_ieee_data_r(device->machine);
409   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
410   return cbm_ieee_data_r(ieeebus, 0);
395411}
396412
397413static WRITE8_DEVICE_HANDLER( vc20_via3_write_ca2 )
398414{
399   cbm_ieee_atn_w(device->machine, 0, data);
415   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
416   cbm_ieee_atn_write(ieeebus, 0, data);
400417}
401418
402419static READ8_DEVICE_HANDLER( vc20_via3_read_cb1 )
403420{
404   return cbm_ieee_srq_r(device->machine);
421   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
422   return cbm_ieee_srq_r(ieeebus, 0);
405423}
406424
407425static WRITE8_DEVICE_HANDLER( vc20_via3_write_cb2 )
408426{
409   cbm_ieee_eoi_w(device->machine, 0, data);
427   const device_config *ieeebus = devtag_get_device(device->machine, "ieee_bus");
428   cbm_ieee_eoi_write(ieeebus, 0, data);
410429}
411430
412431const via6522_interface vc20_via0 =
r4827r4828
620639   ieee = 1;
621640   vc20_common_driver_init(machine);
622641   vic6560_init(vic6560_dma_read, vic6560_dma_read_color);
623   cbm_ieee_open();
624642}
625643
626644MACHINE_RESET( vic20 )
src/mess/drivers/cbmb.c
r4827r4828
104104
105105#include "includes/cbm.h"
106106#include "includes/cbmb.h"
107#include "includes/cbmieeeb.h"
107108#include "machine/cbmipt.h"
108109#include "video/vic6567.h"
109110#include "video/mc6845.h"
r4827r4828
378379   MDRV_TPI6525_ADD("tpi6525_0", cbmb_tpi_0_intf)
379380   MDRV_TPI6525_ADD("tpi6525_1", cbmb_tpi_1_intf)
380381
382   /* IEEE bus */
383   MDRV_CBM_IEEEBUS_ADD("ieee_bus")
384
381385   MDRV_IMPORT_FROM(cbmb_cartslot)
382386MACHINE_DRIVER_END
383387
r4827r4828
447451   MDRV_TPI6525_ADD("tpi6525_0", cbmb_tpi_0_intf)
448452   MDRV_TPI6525_ADD("tpi6525_1", cbmb_tpi_1_intf)
449453
454   /* IEEE bus */
455   MDRV_CBM_IEEEBUS_ADD("ieee_bus")
456
450457   MDRV_IMPORT_FROM(cbmb_cartslot)
451458MACHINE_DRIVER_END
452459
src/mess/drivers/pet.c
r4827r4828
389389#include "includes/pet.h"
390390#include "machine/cbmipt.h"
391391#include "video/mc6845.h"
392#include "includes/cbmieeeb.h"
393392
394393/* devices config */
395394#include "includes/cbm.h"
396395#include "includes/cbmdrive.h"
396#include "includes/cbmieeeb.h"
397397
398398
399399/*************************************
r4827r4828
408408   AM_RANGE(0xe810, 0xe813) AM_DEVREADWRITE("pia_0", pia6821_r, pia6821_w)
409409   AM_RANGE(0xe820, 0xe823) AM_DEVREADWRITE("pia_1", pia6821_r, pia6821_w)
410410   AM_RANGE(0xe840, 0xe84f) AM_DEVREADWRITE("via6522_0", via_r, via_w)
411/*  AM_RANGE(0xe900, 0xe91f) AM_READ(cbm_ieee_state)    // for debugging */
411/*  AM_RANGE(0xe900, 0xe91f) AM_DEVREAD("ieee_bus", cbm_ieee_state)    // for debugging */
412412   AM_RANGE(0xf000, 0xffff) AM_ROM
413413ADDRESS_MAP_END
414414
r4827r4828
680680   /* pias */
681681   MDRV_PIA6821_ADD( "pia_0", pet_pia0)
682682   MDRV_PIA6821_ADD( "pia_1", pet_pia1)
683
684   /* IEEE bus */
685   MDRV_CBM_IEEEBUS_ADD("ieee_bus")
683686MACHINE_DRIVER_END
684687
685688
src/mess/drivers/vc20.c
r4827r4828
9595#include "includes/cbmserb.h"   // needed for MDRV_CBM_SERBUS_REMOVE
9696#include "includes/cbmdrive.h"
9797#include "includes/vc1541.h"
98#include "includes/cbmieeeb.h"
9899
99100#include "includes/vc20.h"
100101
r4827r4828
291292   /* floppy from serial bus */
292293   MDRV_IMPORT_FROM(simulated_drive)
293294
295   /* IEEE bus */
296   MDRV_CBM_IEEEBUS_ADD("ieee_bus")
297
294298   /* via */
295299   MDRV_VIA6522_ADD("via6522_0", 0, vc20_via0)
296300   MDRV_VIA6522_ADD("via6522_1", 0, vc20_via1)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team