Previous 15994 Revisions Next

r7036 Thursday 14th January, 2010 at 12:43:01 UTC by Curt Coder
[C2031] Added attention acknowledge and device number selection.
[IEEE488] Fixed data line handling.
[VIC1112] Fixed memory mapping, VIA interrupts, and added missing EOI signal.
[src/mess/machine]c1541.c ieee488.c ieee488.h vic1112.c vic1112.h

src/mess/machine/vic1112.c
r7035r7036
2727typedef struct _vic1112_t vic1112_t;
2828struct _vic1112_t
2929{
30   int via0_irq;                  /* VIA #0 interrupt request */
31   int via1_irq;                  /* VIA #1 interrupt request */
32
33   /* devices */
3034   const device_config *via0;
3135   const device_config *via1;
3236   const device_config *bus;
r7035r7036
7175    via6522_interface vic1112_via0_intf
7276-------------------------------------------------*/
7377
74static WRITE_LINE_DEVICE_HANDLER( via_irq_w )
78static WRITE_LINE_DEVICE_HANDLER( via0_irq_w )
7579{
76   cpu_set_input_line(device->machine->firstcpu, M6502_IRQ_LINE, state);
80   vic1112_t *vic1112 = get_safe_token(device->owner);
81
82   vic1112->via0_irq = state;
83
84   cpu_set_input_line(device->machine->firstcpu, M6502_IRQ_LINE, (vic1112->via0_irq | vic1112->via1_irq) ? ASSERT_LINE : CLEAR_LINE);
7785}
7886
7987static READ8_DEVICE_HANDLER( via0_pb_r )
r7035r7036
96104   vic1112_t *vic1112 = get_safe_token(device->owner);
97105   UINT8 data = 0;
98106
107   /* end or identify */
108   data |= ieee488_eoi_r(vic1112->bus) << 3;
109
99110   /* data valid in */
100111   data |= ieee488_dav_r(vic1112->bus) << 4;
101112
r7035r7036
159170   DEVCB_NULL,
160171   DEVCB_NULL,
161172
162   DEVCB_LINE(via_irq_w)
173   DEVCB_LINE(via0_irq_w)
163174};
164175
165176/*-------------------------------------------------
166177    via6522_interface vic1112_via1_intf
167178-------------------------------------------------*/
168179
169static READ8_DEVICE_HANDLER( via1_pa_r )
180static WRITE_LINE_DEVICE_HANDLER( via1_irq_w )
170181{
182   vic1112_t *vic1112 = get_safe_token(device->owner);
183
184   vic1112->via1_irq = state;
185
186   cpu_set_input_line(device->machine->firstcpu, M6502_IRQ_LINE, (vic1112->via0_irq | vic1112->via1_irq) ? ASSERT_LINE : CLEAR_LINE);
187}
188
189static WRITE8_DEVICE_HANDLER( via1_pa_w )
190{
171191   /*
172192
173193        bit     description
174194
175        PA0     DI1
176        PA1     DI2
177        PA2     DI3
178        PA3     DI4
179        PA4     DI5
180        PA5     DI6
181        PA6     DI7
182        PA7     DI8
195        PA0     DO1
196        PA1     DO2
197        PA2     DO3
198        PA3     DO4
199        PA4     DO5
200        PA5     DO6
201        PA6     DO7
202        PA7     DO8
183203
184204    */
185205
186206   vic1112_t *vic1112 = get_safe_token(device->owner);
187207
188   return ieee488_dio_r(vic1112->bus, 0);
208   ieee488_dio_w(vic1112->bus, device->owner, data);
189209}
190210
191static WRITE8_DEVICE_HANDLER( via1_pb_w )
211static READ8_DEVICE_HANDLER( via1_pb_r )
192212{
193213   /*
194214
195215        bit     description
196216
197        PB0     DO1
198        PB1     DO2
199        PB2     DO3
200        PB3     DO4
201        PB4     DO5
202        PB5     DO6
203        PB6     DO7
204        PB7     DO8
217        PB0     DI1
218        PB1     DI2
219        PB2     DI3
220        PB3     DI4
221        PB4     DI5
222        PB5     DI6
223        PB6     DI7
224        PB7     DI8
205225
206226    */
207227
208228   vic1112_t *vic1112 = get_safe_token(device->owner);
209229
210   ieee488_dio_w(vic1112->bus, 0, data);
230   return ieee488_dio_r(vic1112->bus, 0);
211231}
212232
213233static WRITE_LINE_DEVICE_HANDLER( via1_ca2_w )
r7035r7036
228248
229249static const via6522_interface vic1112_via1_intf =
230250{
231   DEVCB_HANDLER(via1_pa_r),
232251   DEVCB_NULL,
252   DEVCB_HANDLER(via1_pb_r),
233253   DEVCB_NULL,
234254   DEVCB_NULL, /* _SRQ IN */
235255   DEVCB_NULL,
236256   DEVCB_NULL,
237257
258   DEVCB_HANDLER(via1_pa_w),
238259   DEVCB_NULL,
239   DEVCB_HANDLER(via1_pb_w),
240260   DEVCB_NULL,
241261   DEVCB_NULL,
242262   DEVCB_LINE(via1_ca2_w),
243263   DEVCB_LINE(via1_cb2_w),
244264
245   DEVCB_LINE(via_irq_w)
265   DEVCB_LINE(via1_irq_w)
246266};
247267
248268/*-------------------------------------------------
r7035r7036
283303   device_set_clock(vic1112->via1, cpu_get_clock(device->machine->firstcpu));
284304
285305   /* map VIAs to memory */
286   memory_install_readwrite8_device_handler(program, vic1112->via0, 0x9200, 0x920f, 0, 0, via_r, via_w);
287   memory_install_readwrite8_device_handler(program, vic1112->via1, 0x9210, 0x921f, 0, 0, via_r, via_w);
306   memory_install_readwrite8_device_handler(program, vic1112->via0, 0x9800, 0x980f, 0, 0, via_r, via_w);
307   memory_install_readwrite8_device_handler(program, vic1112->via1, 0x9810, 0x981f, 0, 0, via_r, via_w);
288308
289309   /* map ROM to memory */
290   memory_install_rom(program, 0xb000, 0xb7ff, 0, 0, memory_region(device->machine, VIC1112_TAG));
310   memory_install_rom(program, 0xb000, 0xb7ff, 0, 0, memory_region(device->machine, "vic1112:vic1112"));
311
312   /* register for state saving */
313   state_save_register_device_item(device, 0, vic1112->via0_irq);
314   state_save_register_device_item(device, 0, vic1112->via1_irq);
291315}
292316
293317/*-------------------------------------------------
src/mess/machine/vic1112.h
r7035r7036
11/**********************************************************************
22
3    Commodore VIC-1112 IEEE-488 cartridge emulation
3    Commodore VIC-1112 IEEE-488 Interface Cartridge emulation
44
5    Copyright MESS Team.
5   SYS 45065 to start
6
7   Copyright MESS Team.
68    Visit http://mamedev.org for licensing and usage restrictions.
79
810**********************************************************************/
src/mess/machine/c1541.c
r7035r7036
198198   /* serial bus */
199199   int data_out;                  /* serial bus data output */
200200
201   /* IEEE-488 bus */
202   int nrfd_out;                  /* not ready for data */
203   int ndac_out;                  /* not data accepted */
204
201205   /* devices */
202206   const device_config *cpu;
203207   const device_config *via0;
r7035r7036
323327WRITE_LINE_DEVICE_HANDLER( c2031_ieee488_atn_w )
324328{
325329   c1541_t *c1541 = get_safe_token(device);
330   int nrfd = c1541->nrfd_out;
331   int ndac = c1541->ndac_out;
326332
327   via_ca1_w(c1541->via0, state);
333   via_ca1_w(c1541->via0, !state);
334
335   if (!state ^ c1541->atna)
336   {
337      nrfd = ndac = 0;
338   }
339
340   ieee488_nrfd_w(c1541->bus, device, nrfd);
341   ieee488_ndac_w(c1541->bus, device, ndac);
328342}
329343
330344/*-------------------------------------------------
r7035r7036
592606
593607   c1541_t *c1541 = get_safe_token(device->owner);
594608
595   ieee488_dio_w(c1541->bus, 0, data);
609   ieee488_dio_w(c1541->bus, device->owner, data);
596610}
597611
598612static READ8_DEVICE_HANDLER( c2031_via0_pb_r )
r7035r7036
613627    */
614628
615629   c1541_t *c1541 = get_safe_token(device->owner);
630
616631   UINT8 data = 0;
617632
618633   /* not ready for data */
r7035r7036
628643   data |= ieee488_dav_r(c1541->bus) << 6;
629644
630645   /* attention */
631   data |= ieee488_atn_r(c1541->bus) << 7;
646   data |= !ieee488_atn_r(c1541->bus) << 7;
632647
633648   return data;
634649}
r7035r7036
652667
653668   c1541_t *c1541 = get_safe_token(device->owner);
654669
655   /* attention acknowledge */
670   int atna = BIT(data, 0);
671   int nrfd = BIT(data, 1);
672   int ndac = BIT(data, 2);
656673
657674   /* not ready for data */
658   ieee488_nrfd_w(c1541->bus, device->owner, BIT(data, 1));
675   c1541->nrfd_out = nrfd;
659676
660677   /* not data accepted */
661   ieee488_ndac_w(c1541->bus, device->owner, BIT(data, 2));
678   c1541->ndac_out = ndac;
662679
663680   /* end or identify */
664681   ieee488_eoi_w(c1541->bus, device->owner, BIT(data, 3));
682
683   /* attention acknowledge */
684   c1541->atna = atna;
685
686   if (!ieee488_atn_r(c1541->bus) ^ atna)
687   {
688      nrfd = ndac = 0;
689   }
690
691   ieee488_nrfd_w(c1541->bus, device->owner, nrfd);
692   ieee488_ndac_w(c1541->bus, device->owner, ndac);
665693}
666694
667695static READ_LINE_DEVICE_HANDLER( c2031_via0_ca1_r )
r7035r7036
673701
674702static READ_LINE_DEVICE_HANDLER( c2031_via0_ca2_r )
675703{
704   c1541_t *c1541 = get_safe_token(device->owner);
705   int state = 0;
706
676707   /* device # selection */
677   return 0;
708   switch (c1541->address)
709   {
710   case  8: state = (c1541->atna | c1541->nrfd_out);   break;
711   case  9: state = c1541->atna;                  break;
712   case 10: state = c1541->nrfd_out;               break;
713   case 11: state = 0;                           break;
714   }
715
716   return state;
678717}
679718
680719static const via6522_interface c2031_via0_intf =
r7035r7036
11121151   state_save_register_device_item(device, 0, c1541->via0_irq);
11131152   state_save_register_device_item(device, 0, c1541->via1_irq);
11141153   state_save_register_device_item(device, 0, c1541->data_out);
1154   state_save_register_device_item(device, 0, c1541->nrfd_out);
1155   state_save_register_device_item(device, 0, c1541->ndac_out);
11151156}
11161157
11171158/*-------------------------------------------------
src/mess/machine/ieee488.c
r7035r7036
11/**********************************************************************
22
3    IEEE-488.1 bus emulation
3    IEEE-488.1 General Purpose Interface Bus emulation
4   (aka HP-IB, GPIB, CBM IEEE)
45
56    Copyright MESS Team.
67    Visit http://mamedev.org for licensing and usage restrictions.
r7035r7036
4142   ieee488_daisy_state         *next;         /* next device */
4243   const device_config         *device;      /* associated device */
4344
44   int line[SIGNAL_COUNT];                  /* serial signal states */
45   int line[SIGNAL_COUNT];                  /* control lines' state */
46   UINT8 dio;                           /* data lines' state */
4547
4648   devcb_resolved_write_line   out_line_func[SIGNAL_COUNT];
4749};
r7035r7036
5052struct _ieee488_t
5153{
5254   ieee488_daisy_state *daisy_state;
53   UINT8 dio;
5455};
5556
5657/***************************************************************************
r7035r7036
8081
8182   for ( ; daisy != NULL; daisy = daisy->next)
8283   {
83      if (!daisy->line[line])
84      {
85         state = 0;
86         break;
87      }
84      state &= daisy->line[line];
8885   }
8986
9087   return state;
9188}
9289
90INLINE int get_data(const device_config *bus)
91{
92   ieee488_t *ieee488 = get_safe_token(bus);
93   ieee488_daisy_state *daisy = ieee488->daisy_state;
94   UINT8 data = 0xff;
95
96   for ( ; daisy != NULL; daisy = daisy->next)
97   {
98      data &= daisy->dio;
99   }
100
101   return data;
102}
103
93104INLINE void set_signal(const device_config *bus, const device_config *device, int line, int state)
94105{
95106   ieee488_t *ieee488 = get_safe_token(bus);
96107   ieee488_daisy_state *daisy = ieee488->daisy_state;
97   int data = 1;
108   int new_state = 1;
98109
99110   for ( ; daisy != NULL; daisy = daisy->next)
100111   {
r7035r7036
109120      }
110121   }
111122
112   data = get_signal(bus, line);
123   new_state = get_signal(bus, line);
113124   daisy = ieee488->daisy_state;
114125
115126   for ( ; daisy != NULL; daisy = daisy->next)
116127   {
117      devcb_call_write_line(&daisy->out_line_func[line], data);
128      devcb_call_write_line(&daisy->out_line_func[line], new_state);
118129   }
119130
120131   if (LOG) logerror("IEEE-488: EOI %u DAV %u NRFD %u NDAC %u IFC %u SRQ %u ATN %u REN %u DIO %02x\n",
121132      get_signal(bus, EOI), get_signal(bus, DAV), get_signal(bus, NRFD), get_signal(bus, NDAC),
122      get_signal(bus, IFC), get_signal(bus, SRQ), get_signal(bus, ATN), get_signal(bus, REN), ieee488->dio);
133      get_signal(bus, IFC), get_signal(bus, SRQ), get_signal(bus, ATN), get_signal(bus, REN), get_data(bus));
123134}
124135
136INLINE void set_data(const device_config *bus, const device_config *device, UINT8 data)
137{
138   ieee488_t *ieee488 = get_safe_token(bus);
139   ieee488_daisy_state *daisy = ieee488->daisy_state;
140
141   for ( ; daisy != NULL; daisy = daisy->next)
142   {
143      if (!strcmp(daisy->device->tag, device->tag))
144      {
145         if (LOG) logerror("IEEE-488: '%s' DIO %02x\n", device->tag, data);
146         daisy->dio = data;
147         break;
148      }
149   }
150
151   if (LOG) logerror("IEEE-488: EOI %u DAV %u NRFD %u NDAC %u IFC %u SRQ %u ATN %u REN %u DIO %02x\n",
152      get_signal(bus, EOI), get_signal(bus, DAV), get_signal(bus, NRFD), get_signal(bus, NDAC),
153      get_signal(bus, IFC), get_signal(bus, SRQ), get_signal(bus, ATN), get_signal(bus, REN), get_data(bus));
154}
155
125156/***************************************************************************
126157    IMPLEMENTATION
127158***************************************************************************/
128159
129void ieee488_eoi_w(const device_config *ieee488, const device_config *device, int state)
160void ieee488_eoi_w(const device_config *bus, const device_config *device, int state)
130161{
131   set_signal(ieee488, device, EOI, state);
162   set_signal(bus, device, EOI, state);
132163}
133164
134165READ_LINE_DEVICE_HANDLER( ieee488_eoi_r )
r7035r7036
136167   return get_signal(device, EOI);
137168}
138169
139void ieee488_dav_w(const device_config *ieee488, const device_config *device, int state)
170void ieee488_dav_w(const device_config *bus, const device_config *device, int state)
140171{
141   set_signal(ieee488, device, DAV, state);
172   set_signal(bus, device, DAV, state);
142173}
143174
144175READ_LINE_DEVICE_HANDLER( ieee488_dav_r )
r7035r7036
146177   return get_signal(device, DAV);
147178}
148179
149void ieee488_nrfd_w(const device_config *ieee488, const device_config *device, int state)
180void ieee488_nrfd_w(const device_config *bus, const device_config *device, int state)
150181{
151   set_signal(ieee488, device, NRFD, state);
182   set_signal(bus, device, NRFD, state);
152183}
153184
154185READ_LINE_DEVICE_HANDLER( ieee488_nrfd_r )
r7035r7036
156187   return get_signal(device, NRFD);
157188}
158189
159void ieee488_ndac_w(const device_config *ieee488, const device_config *device, int state)
190void ieee488_ndac_w(const device_config *bus, const device_config *device, int state)
160191{
161   set_signal(ieee488, device, NDAC, state);
192   set_signal(bus, device, NDAC, state);
162193}
163194
164195READ_LINE_DEVICE_HANDLER( ieee488_ndac_r )
r7035r7036
166197   return get_signal(device, NDAC);
167198}
168199
169void ieee488_ifc_w(const device_config *ieee488, const device_config *device, int state)
200void ieee488_ifc_w(const device_config *bus, const device_config *device, int state)
170201{
171   set_signal(ieee488, device, IFC, state);
202   set_signal(bus, device, IFC, state);
172203}
173204
174205READ_LINE_DEVICE_HANDLER( ieee488_ifc_r )
r7035r7036
176207   return get_signal(device, IFC);
177208}
178209
179void ieee488_srq_w(const device_config *ieee488, const device_config *device, int state)
210void ieee488_srq_w(const device_config *bus, const device_config *device, int state)
180211{
181   set_signal(ieee488, device, SRQ, state);
212   set_signal(bus, device, SRQ, state);
182213}
183214
184215READ_LINE_DEVICE_HANDLER( ieee488_srq_r )
r7035r7036
186217   return get_signal(device, SRQ);
187218}
188219
189void ieee488_atn_w(const device_config *ieee488, const device_config *device, int state)
220void ieee488_atn_w(const device_config *bus, const device_config *device, int state)
190221{
191   set_signal(ieee488, device, ATN, state);
222   set_signal(bus, device, ATN, state);
192223}
193224
194225READ_LINE_DEVICE_HANDLER( ieee488_atn_r )
r7035r7036
196227   return get_signal(device, ATN);
197228}
198229
199void ieee488_ren_w(const device_config *ieee488, const device_config *device, int state)
230void ieee488_ren_w(const device_config *bus, const device_config *device, int state)
200231{
201   set_signal(ieee488, device, REN, state);
232   set_signal(bus, device, REN, state);
202233}
203234
204235READ_LINE_DEVICE_HANDLER( ieee488_ren_r )
r7035r7036
208239
209240READ8_DEVICE_HANDLER( ieee488_dio_r )
210241{
211   ieee488_t *ieee488 = get_safe_token(device);
212
213   return ieee488->dio;
242   return get_data(device);
214243}
215244
216WRITE8_DEVICE_HANDLER( ieee488_dio_w )
245void ieee488_dio_w(const device_config *bus, const device_config *device, UINT8 data)
217246{
218   ieee488_t *ieee488 = get_safe_token(device);
219
220   ieee488->dio = data;
247   set_data(bus, device, data);
221248}
222249
223250/*-------------------------------------------------
r7035r7036
239266   {
240267      *tailptr = auto_alloc(device->machine, ieee488_daisy_state);
241268
269      /* find device */
242270      (*tailptr)->next = NULL;
243271      (*tailptr)->device = devtag_get_device(device->machine, daisy->tag);
244272
r7035r7036
248276         fatalerror("Unable to locate device '%s'", daisy->tag);
249277      }
250278
251      for (i = SRQ; i < SIGNAL_COUNT; i++)
279      /* set control lines to 'false' state */
280      for (i = EOI; i < SIGNAL_COUNT; i++)
252281      {
253282         (*tailptr)->line[i] = 1;
254283      }
255284
285      /* set data lines to 'false' state */
286      (*tailptr)->dio = 0xff;
287
288      /* resolve callbacks */
256289      devcb_resolve_write_line(&(*tailptr)->out_line_func[EOI], &daisy->out_eoi_func, device);
257290      devcb_resolve_write_line(&(*tailptr)->out_line_func[DAV], &daisy->out_dav_func, device);
258291      devcb_resolve_write_line(&(*tailptr)->out_line_func[NRFD], &daisy->out_nrfd_func, device);
r7035r7036
270303   astring_free(tempstring);
271304
272305   /* register for state saving */
273   state_save_register_device_item(device, 0, ieee488->dio);
306//   state_save_register_device_item(device, 0, ieee488->);
274307}
275308
276309/*-------------------------------------------------
src/mess/machine/ieee488.h
r7035r7036
11/**********************************************************************
22
3    IEEE-488.1 bus emulation
3    IEEE-488.1 General Purpose Interface Bus emulation
4   (aka HP-IB, GPIB, CBM IEEE)
45
56    Copyright MESS Team.
67    Visit http://mamedev.org for licensing and usage restrictions.
r7035r7036
5253DEVICE_GET_INFO( ieee488 );
5354
5455/* end or identify */
55void ieee488_eoi_w(const device_config *ieee488, const device_config *device, int state);
56void ieee488_eoi_w(const device_config *bus, const device_config *device, int state);
5657READ_LINE_DEVICE_HANDLER( ieee488_eoi_r );
5758
5859/* data valid */
59void ieee488_dav_w(const device_config *ieee488, const device_config *device, int state);
60void ieee488_dav_w(const device_config *bus, const device_config *device, int state);
6061READ_LINE_DEVICE_HANDLER( ieee488_dav_r );
6162
6263/* not ready for data */
63void ieee488_nrfd_w(const device_config *ieee488, const device_config *device, int state);
64void ieee488_nrfd_w(const device_config *bus, const device_config *device, int state);
6465READ_LINE_DEVICE_HANDLER( ieee488_nrfd_r );
6566
6667/* not data accepted */
67void ieee488_ndac_w(const device_config *ieee488, const device_config *device, int state);
68void ieee488_ndac_w(const device_config *bus, const device_config *device, int state);
6869READ_LINE_DEVICE_HANDLER( ieee488_ndac_r );
6970
7071/* interface clear */
71void ieee488_ifc_w(const device_config *ieee488, const device_config *device, int state);
72void ieee488_ifc_w(const device_config *bus, const device_config *device, int state);
7273READ_LINE_DEVICE_HANDLER( ieee488_ifc_r );
7374
7475/* service request */
75void ieee488_srq_w(const device_config *ieee488, const device_config *device, int state);
76void ieee488_srq_w(const device_config *bus, const device_config *device, int state);
7677READ_LINE_DEVICE_HANDLER( ieee488_srq_r );
7778
7879/* attention */
79void ieee488_atn_w(const device_config *ieee488, const device_config *device, int state);
80void ieee488_atn_w(const device_config *bus, const device_config *device, int state);
8081READ_LINE_DEVICE_HANDLER( ieee488_atn_r );
8182
8283/* remote enable */
83void ieee488_ren_w(const device_config *ieee488, const device_config *device, int state);
84void ieee488_ren_w(const device_config *bus, const device_config *device, int state);
8485READ_LINE_DEVICE_HANDLER( ieee488_ren_r );
8586
8687/* data */
8788READ8_DEVICE_HANDLER( ieee488_dio_r );
88WRITE8_DEVICE_HANDLER( ieee488_dio_w );
89void ieee488_dio_w(const device_config *bus, const device_config *device, UINT8 data);
8990
9091#endif

Previous 15994 Revisions Next


© 1998-2018 The MESS Team