Previous 15994 Revisions Next

r7627 Tuesday 23rd March, 2010 at 14:04:57 UTC by Curt Coder
Refactored the Luxor ABC bus into a device.
[docs]messnew.txt
[src/mess/drivers]abc80.c abc80x.c
[src/mess/includes]abc80.h abc80x.h
[src/mess/machine]abcbus.c abcbus.h conkort.c conkort.h

src/mess/includes/abc80.h
r7626r7627
4848#define Z80_TAG         "ab67"
4949#define Z80PIO_TAG      "cd67"
5050#define SN76477_TAG      "g8"
51#define ABCBUS_TAG      "abcbus"
5152#define CASSETTE_TAG   "cassette"
5253
5354class abc80_state
src/mess/includes/abc80x.h
r7626r7627
3131#define Z80CTC_TAG      "z80ctc"
3232#define Z80SIO_TAG      "z80sio"
3333#define Z80DART_TAG      "z80dart"
34#define ABCBUS_TAG      "abcbus"
3435#define CASSETTE_TAG   "cassette"
3536
3637#define ABC800_CHAR_WIDTH   6
src/mess/machine/conkort.c
r7626r7627
9393#include "machine/wd17xx.h"
9494#include "machine/abcbus.h"
9595#include "devices/flopdrv.h"
96#include "formats/flopimg.h"
97#include "formats/basicdsk.h"
9698
97
9899/***************************************************************************
99100    PARAMETERS
100101***************************************************************************/
r7626r7627
113114typedef struct _slow_t slow_t;
114115struct _slow_t
115116{
117   int cs;               /* card selected */
116118   UINT8 status;         /* ABC BUS status */
117119   UINT8 data;            /* ABC BUS data */
118120   int fdc_irq;         /* floppy interrupt */
r7626r7627
130132typedef struct _fast_t fast_t;
131133struct _fast_t
132134{
135   int cs;               /* card selected */
133136   UINT8 status;         /* ABC BUS status */
134137   UINT8 data;            /* ABC BUS data */
135138   int fdc_irq;         /* FDC interrupt */
r7626r7627
150153{
151154   assert(device != NULL);
152155   assert(device->token != NULL);
156   assert(device->type == LUXOR_55_10828);
153157   return (slow_t *)device->token;
154158}
155159
r7626r7627
157161{
158162   assert(device != NULL);
159163   assert(device->token != NULL);
164   assert(device->type == LUXOR_55_21046);
160165   return (fast_t *)device->token;
161166}
162167
163INLINE slow_t *get_safe_token_machine_slow(running_machine *machine)
164{
165   running_device *device = devtag_get_device(machine, CONKORT_TAG);
166   return get_safe_token_slow(device);
167}
168
169INLINE fast_t *get_safe_token_machine_fast(running_machine *machine)
170{
171   running_device *device = devtag_get_device(machine, CONKORT_TAG);
172   return get_safe_token_fast(device);
173}
174
175168/***************************************************************************
176169    IMPLEMENTATION
177170***************************************************************************/
178171
179172/* Slow Controller */
180173
181static READ8_HANDLER( slow_bus_data_r )
174WRITE8_DEVICE_HANDLER( luxor_55_10828_cs_w )
182175{
183   slow_t *conkort = get_safe_token_machine_slow(space->machine);
176   slow_t *conkort = get_safe_token_slow(device);
184177
178   conkort->cs = (data == 0x2d); // TODO: bit 0 of this is configurable with S1
179}
180
181READ8_DEVICE_HANDLER( luxor_55_10828_inp_r )
182{
183   slow_t *conkort = get_safe_token_slow(device);
185184   UINT8 data = 0xff;
186185
187   if (!BIT(conkort->status, 6))
186   if (conkort->cs)
188187   {
189      data = conkort->data;
188      if (!BIT(conkort->status, 6))
189      {
190         data = conkort->data;
191      }
192
193      z80pio_astb_w(conkort->z80pio, 0);
194      z80pio_astb_w(conkort->z80pio, 1);
190195   }
191196
192   logerror("INP\n");
193
194   z80pio_astb_w(conkort->z80pio, 0);
195   z80pio_astb_w(conkort->z80pio, 1);
196
197197   return data;
198198}
199199
200static WRITE8_HANDLER( slow_bus_data_w )
200WRITE8_DEVICE_HANDLER( luxor_55_10828_utp_w )
201201{
202   slow_t *conkort = get_safe_token_machine_slow(space->machine);
202   slow_t *conkort = get_safe_token_slow(device);
203203
204   if (!conkort->cs) return;
205
204206   if (BIT(conkort->status, 6))
205207   {
206208      conkort->data = data;
207209   }
208210
209   logerror("UTP %02x\n", data);
210
211211   z80pio_astb_w(conkort->z80pio, 0);
212212   z80pio_astb_w(conkort->z80pio, 1);
213213}
214214
215static READ8_HANDLER( slow_bus_stat_r )
215READ8_DEVICE_HANDLER( luxor_55_10828_stat_r )
216216{
217   slow_t *conkort = get_safe_token_machine_slow(space->machine);
217   slow_t *conkort = get_safe_token_slow(device);
218   UINT8 data = 0xff;
218219
219   logerror("STAT\n");
220   if (conkort->cs)
221   {
222      data = (conkort->status & 0xfe) | z80pio_ardy_r(conkort->z80pio);
223   }
220224
221   return (conkort->status & 0xfe) | z80pio_ardy_r(conkort->z80pio);
225   return data;
222226}
223227
224static WRITE8_HANDLER( slow_bus_c1_w )
228WRITE8_DEVICE_HANDLER( luxor_55_10828_c1_w )
225229{
226   slow_t *conkort = get_safe_token_machine_slow(space->machine);
230   slow_t *conkort = get_safe_token_slow(device);
227231
228   logerror("C1 %02x\n", data);
229
230   cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, ASSERT_LINE);
231   cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, CLEAR_LINE);
232   if (conkort->cs)
233   {
234      cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, ASSERT_LINE);
235      cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, CLEAR_LINE);
236   }
232237}
233238
234static WRITE8_HANDLER( slow_bus_c3_w )
239WRITE8_DEVICE_HANDLER( luxor_55_10828_c3_w )
235240{
236   slow_t *conkort = get_safe_token_machine_slow(space->machine);
241   slow_t *conkort = get_safe_token_slow(device);
237242
238   logerror("C3 %02x\n", data);
239
240   cpu_set_input_line(conkort->cpu, INPUT_LINE_RESET, PULSE_LINE);
243   if (conkort->cs)
244   {
245      cpu_set_input_line(conkort->cpu, INPUT_LINE_RESET, PULSE_LINE);
246   }
241247}
242248
243static ABCBUS_CARD_SELECT( luxor_55_10828 )
249WRITE_LINE_DEVICE_HANDLER( luxor_55_10828_rst_w )
244250{
245   logerror("CS %02x\n", data);
246
247   if (data == 0x2d) // TODO: bit 0 of this is configurable with S1
251   if (!state)
248252   {
249      const address_space *io = cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_IO);
250
251      memory_install_readwrite8_handler(io, ABCBUS_INP, ABCBUS_OUT, 0x18, 0, slow_bus_data_r, slow_bus_data_w);
252      memory_install_read8_handler(io, ABCBUS_STAT, ABCBUS_STAT, 0x18, 0, slow_bus_stat_r);
253      memory_install_write8_handler(io, ABCBUS_C1, ABCBUS_C1, 0x18, 0, slow_bus_c1_w);
254      memory_nop_write(io, ABCBUS_C2, ABCBUS_C2, 0x18, 0);
255      memory_install_write8_handler(io, ABCBUS_C3, ABCBUS_C3, 0x18, 0, slow_bus_c3_w);
256      memory_nop_write(io, ABCBUS_C4, ABCBUS_C4, 0x18, 0);
253      device->reset();
257254   }
258255}
259256
260static WRITE8_HANDLER( slow_ctrl_w )
257static WRITE8_DEVICE_HANDLER( slow_ctrl_w )
261258{
262259   /*
263260
264261        bit     signal         description
265262
266        0       _SEL 0
267        1       _SEL 1
268        2       _SEL 2
269        3       _MOT ON
263        0       SEL 0
264        1       SEL 1
265        2       SEL 2
266        3       MOT ON
270267        4       SIDE
271268        5       _PRECOMP ON
272269        6       _WAIT ENABLE
r7626r7627
274271
275272    */
276273
277   slow_t *conkort = get_safe_token_machine_slow(space->machine);
274   slow_t *conkort = get_safe_token_slow(device->owner);
278275
279276   /* drive selection */
280   if (BIT(data, 0)) wd17xx_set_drive(conkort->fd1791, 0);
281   if (BIT(data, 1)) wd17xx_set_drive(conkort->fd1791, 1);
282//  if (BIT(data, 2)) wd17xx_set_drive(conkort->fd1791, 2);
277   if (BIT(data, 0)) wd17xx_set_drive(device, 0);
278   if (BIT(data, 1)) wd17xx_set_drive(device, 1);
279//  if (BIT(data, 2)) wd17xx_set_drive(device, 2);
283280
284281   /* motor enable */
285282   floppy_mon_w(conkort->image0, !BIT(data, 3));
r7626r7627
288285   floppy_drive_set_ready_state(conkort->image1, 1, 1);
289286
290287   /* disk side selection */
291   wd17xx_set_side(conkort->fd1791, BIT(data, 4));
288   wd17xx_set_side(device, BIT(data, 4));
292289
293290   /* wait enable */
294291   conkort->wait_enable = BIT(data, 6);
295292
296293   /* FDC master reset */
297   wd17xx_mr_w(conkort->fd1791, BIT(data, 7));
294   wd17xx_mr_w(device, BIT(data, 7));
295
296   logerror("CTRL %02x\n", data);
298297}
299298
300static WRITE8_HANDLER( slow_status_w )
299static WRITE8_DEVICE_HANDLER( slow_status_w )
301300{
302301   /*
303302
r7626r7627
314313
315314    */
316315
317   slow_t *conkort = get_safe_token_machine_slow(space->machine);
316   slow_t *conkort = get_safe_token_slow(device->owner);
318317
319318   conkort->status = data;
320
321   /* interrupt to main CPU */
322   cpu_set_input_line(conkort->cpu, INPUT_LINE_IRQ0, BIT(data, 7) ? ASSERT_LINE : CLEAR_LINE);
323319}
324320
325321static READ8_DEVICE_HANDLER( slow_fdc_r )
326322{
327   slow_t *conkort = get_safe_token_machine_slow(device->machine);
323   slow_t *conkort = get_safe_token_slow(device->owner);
328324   UINT8 data = 0;
329325
330326   switch (offset & 0x03)
r7626r7627
347343
348344static WRITE8_DEVICE_HANDLER( slow_fdc_w )
349345{
350   slow_t *conkort = get_safe_token_machine_slow(device->machine);
346   slow_t *conkort = get_safe_token_slow(device->owner);
351347
352348   switch (offset & 0x03)
353349   {
r7626r7627
367363
368364/* Fast Controller */
369365
370static READ8_HANDLER( fast_bus_data_r )
366WRITE8_DEVICE_HANDLER( luxor_55_21046_cs_w )
371367{
372   fast_t *conkort = get_safe_token_machine_fast(space->machine);
368   fast_t *conkort = get_safe_token_fast(device);
373369
370   conkort->cs = (data == input_port_read(device->machine, "SW3"));
371}
372
373READ8_DEVICE_HANDLER( luxor_55_21046_stat_r )
374{
375   fast_t *conkort = get_safe_token_fast(device);
376
374377   UINT8 data = 0xff;
375378
376   if (!BIT(conkort->status, 6))
379   if (conkort->cs)
377380   {
378      data = conkort->data;
381      data = conkort->status;
379382   }
380383
381384   return data;
382385}
383386
384static WRITE8_HANDLER( fast_bus_data_w )
387READ8_DEVICE_HANDLER( luxor_55_21046_inp_r )
385388{
386   fast_t *conkort = get_safe_token_machine_fast(space->machine);
389   fast_t *conkort = get_safe_token_fast(device);
387390
388   if (BIT(conkort->status, 6))
391   UINT8 data = 0xff;
392
393   if (conkort->cs && !BIT(conkort->status, 6))
389394   {
390      conkort->data = data;
395      data = conkort->data;
391396   }
397
398   return data;
392399}
393400
394static READ8_HANDLER( fast_bus_stat_r )
401WRITE8_DEVICE_HANDLER( luxor_55_21046_utp_w )
395402{
396   fast_t *conkort = get_safe_token_machine_fast(space->machine);
403   fast_t *conkort = get_safe_token_fast(device);
397404
398   return conkort->status;
405   if (conkort->cs && BIT(conkort->status, 6))
406   {
407      conkort->data = data;
408   }
399409}
400410
401static WRITE8_HANDLER( fast_bus_c1_w )
411WRITE8_DEVICE_HANDLER( luxor_55_21046_c1_w )
402412{
403   fast_t *conkort = get_safe_token_machine_fast(space->machine);
413   fast_t *conkort = get_safe_token_fast(device);
404414
405   cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, ASSERT_LINE);
406   cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, CLEAR_LINE);
415   if (conkort->cs)
416   {
417      cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, ASSERT_LINE);
418      cpu_set_input_line(conkort->cpu, INPUT_LINE_NMI, CLEAR_LINE);
419   }
407420}
408421
409static WRITE8_HANDLER( fast_bus_c3_w )
422WRITE8_DEVICE_HANDLER( luxor_55_21046_c3_w )
410423{
411   fast_t *conkort = get_safe_token_machine_fast(space->machine);
424   fast_t *conkort = get_safe_token_fast(device);
412425
413   cpu_set_input_line(conkort->cpu, INPUT_LINE_RESET, PULSE_LINE);
426   if (conkort->cs)
427   {
428      cpu_set_input_line(conkort->cpu, INPUT_LINE_RESET, PULSE_LINE);
429   }
414430}
415431
416static ABCBUS_CARD_SELECT( luxor_55_21046 )
432WRITE_LINE_DEVICE_HANDLER( luxor_55_21046_rst_w )
417433{
418   fast_t *conkort = get_safe_token_fast(device);
419
420   if (data == input_port_read(device->machine, "SW3"))
434   if (!state)
421435   {
422      const address_space *io = cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_IO);
423
424      memory_install_readwrite8_handler(io, ABCBUS_INP, ABCBUS_OUT, 0x18, 0, fast_bus_data_r, fast_bus_data_w);
425      memory_install_read8_handler(io, ABCBUS_STAT, ABCBUS_STAT, 0x18, 0, fast_bus_stat_r);
426      memory_install_write8_handler(io, ABCBUS_C1, ABCBUS_C1, 0x18, 0, fast_bus_c1_w);
427      memory_nop_write(io, ABCBUS_C2, ABCBUS_C2, 0x18, 0);
428      memory_install_write8_handler(io, ABCBUS_C3, ABCBUS_C3, 0x18, 0, fast_bus_c3_w);
429      memory_nop_write(io, ABCBUS_C4, ABCBUS_C4, 0x18, 0);
436      device->reset();
430437   }
431
432   cpu_set_input_line(conkort->cpu, INPUT_LINE_RESET, PULSE_LINE);
433438}
434439
435static READ8_HANDLER( fast_ctrl_r )
440static READ8_DEVICE_HANDLER( fast_ctrl_r )
436441{
437442   /*
438443
r7626r7627
452457   return 0x08;
453458}
454459
455static READ8_HANDLER( fast_data_r )
460static READ8_DEVICE_HANDLER( fast_data_r )
456461{
457   fast_t *conkort = get_safe_token_machine_fast(space->machine);
462   fast_t *conkort = get_safe_token_fast(device->owner);
458463
459464   return conkort->data;
460465}
461466
462static WRITE8_HANDLER( fast_data_w )
467static WRITE8_DEVICE_HANDLER( fast_data_w )
463468{
464   fast_t *conkort = get_safe_token_machine_fast(space->machine);
469   fast_t *conkort = get_safe_token_fast(device->owner);
465470
466471   conkort->data = data;
467472}
468473
469static WRITE8_HANDLER( fast_status_w )
474static WRITE8_DEVICE_HANDLER( fast_status_w )
470475{
471   fast_t *conkort = get_safe_token_machine_fast(space->machine);
476   fast_t *conkort = get_safe_token_fast(device->owner);
472477
473478   conkort->status = data;
474479}
r7626r7627
487492   ADDRESS_MAP_GLOBAL_MASK(0xff)
488493   AM_RANGE(0x70, 0x73) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
489494   AM_RANGE(0xb0, 0xb3) AM_MIRROR(0x0c) AM_DEVREADWRITE(FD1791_TAG, slow_fdc_r, slow_fdc_w)
490   AM_RANGE(0xd0, 0xd0) AM_MIRROR(0x0f) AM_WRITE(slow_status_w)
491   AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x0f) AM_WRITE(slow_ctrl_w)
495   AM_RANGE(0xd0, 0xd0) AM_MIRROR(0x0f) AM_DEVWRITE(FD1791_TAG, slow_status_w)
496   AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x0f) AM_DEVWRITE(FD1791_TAG, slow_ctrl_w)
492497ADDRESS_MAP_END
493498
494499// Fast Controller
r7626r7627
500505
501506static ADDRESS_MAP_START( fast_io_map, ADDRESS_SPACE_IO, 8 )
502507   ADDRESS_MAP_GLOBAL_MASK(0xff)
503   AM_RANGE(0x00, 0x00) AM_MIRROR(0x0f) AM_READ(fast_data_r)
504   AM_RANGE(0x10, 0x10) AM_MIRROR(0x0f) AM_WRITE(fast_data_w)
505   AM_RANGE(0x20, 0x20) AM_MIRROR(0x0f) AM_WRITE(fast_status_w)
506//  AM_RANGE(0x30, 0x30) AM_MIRROR(0x0f) AM_WRITE()
507//  AM_RANGE(0x40, 0x40) AM_MIRROR(0x0f) AM_WRITE()
508   AM_RANGE(0x50, 0x50) AM_MIRROR(0x0f) AM_READ(fast_ctrl_r)
508   AM_RANGE(0x00, 0x00) AM_MIRROR(0x0f) AM_DEVREAD(SAB1793_TAG, fast_data_r)
509   AM_RANGE(0x10, 0x10) AM_MIRROR(0x0f) AM_DEVWRITE(SAB1793_TAG, fast_data_w)
510   AM_RANGE(0x20, 0x20) AM_MIRROR(0x0f) AM_DEVWRITE(SAB1793_TAG, fast_status_w)
511//  AM_RANGE(0x30, 0x30) AM_MIRROR(0x0f) AM_DEVWRITE()
512//  AM_RANGE(0x40, 0x40) AM_MIRROR(0x0f) AM_DEVWRITE()
513   AM_RANGE(0x50, 0x50) AM_MIRROR(0x0f) AM_DEVREAD(SAB1793_TAG, fast_ctrl_r)
509514   AM_RANGE(0x60, 0x63) AM_MIRROR(0x0c) AM_DEVREAD(SAB1793_TAG, wd17xx_r)
510515   AM_RANGE(0x70, 0x73) AM_MIRROR(0x0c) AM_DEVWRITE(SAB1793_TAG, wd17xx_w)
511516   AM_RANGE(0x80, 0x80) AM_MIRROR(0x0f) AM_DEVREADWRITE(Z80DMA_TAG, z80dma_r, z80dma_w)
r7626r7627
566571
567572static READ8_DEVICE_HANDLER( conkort_pio_port_a_r )
568573{
569   slow_t *conkort = get_safe_token_machine_slow(device->machine);
574   slow_t *conkort = get_safe_token_slow(device->owner);
570575
571576   return conkort->data;
572577}
573578
574579static WRITE8_DEVICE_HANDLER( conkort_pio_port_a_w )
575580{
576   slow_t *conkort = get_safe_token_machine_slow(device->machine);
581   slow_t *conkort = get_safe_token_slow(device->owner);
577582
578583   conkort->data = data;
579584}
r7626r7627
595600
596601    */
597602
598   slow_t *conkort = get_safe_token_machine_slow(device->machine);
603   slow_t *conkort = get_safe_token_slow(device->owner);
599604
600605   UINT8 data = 0;
601606
r7626r7627
609614   data |= 0x10;
610615
611616   /* head load */
612//   data |= wd17xx_hdld_r(conkort->fd1791) << 6;
617//   data |= wd17xx_hdld_r(device) << 6;
613618
614619   /* FDC interrupt request */
615620   data |= conkort->fdc_irq << 7;
r7626r7627
634639
635640    */
636641
637   slow_t *conkort = get_safe_token_machine_slow(device->machine);
642   slow_t *conkort = get_safe_token_slow(device->owner);
638643
639644   /* double density enable */
640645   wd17xx_dden_w(conkort->fd1791, BIT(data, 3));
r7626r7627
728733
729734static WRITE_LINE_DEVICE_HANDLER( slow_fd1791_intrq_w )
730735{
731   slow_t *conkort = get_safe_token_machine_slow(device->machine);
736   slow_t *conkort = get_safe_token_slow(device->owner);
732737
733738   conkort->fdc_irq = state;
734739
r7626r7627
741746
742747static WRITE_LINE_DEVICE_HANDLER( slow_fd1791_drq_w )
743748{
744   slow_t *conkort = get_safe_token_machine_slow(device->machine);
749   slow_t *conkort = get_safe_token_slow(device->owner);
745750
746751   conkort->fdc_drq = state;
747752
r7626r7627
861866
862867static DEVICE_START( luxor_55_10828 )
863868{
864   slow_t *conkort = (slow_t *)device->token;
869   slow_t *conkort = get_safe_token_slow(device);
865870
866871   /* find our CPU */
867872   conkort->cpu = device->subdevice(Z80_TAG);
r7626r7627
873878   conkort->image1 = device->subdevice(FLOPPY_1);
874879
875880   /* register for state saving */
881   state_save_register_device_item(device, 0, conkort->cs);
876882   state_save_register_device_item(device, 0, conkort->status);
877883   state_save_register_device_item(device, 0, conkort->data);
878884   state_save_register_device_item(device, 0, conkort->fdc_irq);
r7626r7627
886892
887893static DEVICE_RESET( luxor_55_10828 )
888894{
895   slow_t *conkort = get_safe_token_slow(device);
889896
897   conkort->cpu->reset();
898   
899   conkort->cs = 0;
890900}
891901
892902/*-------------------------------------------------
r7626r7627
910920      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(luxor_55_10828);         break;
911921      case DEVINFO_FCT_STOP:                     /* Nothing */                                    break;
912922      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(luxor_55_10828);         break;
913      case DEVINFO_FCT_ABCBUS_CARD_SELECT:         info->f = (genf *)ABCBUS_CARD_SELECT_NAME(luxor_55_10828);   break;
914923
915924      /* --- the following bits of info are returned as NULL-terminated strings --- */
916925      case DEVINFO_STR_NAME:                     strcpy(info->s, "Luxor 55 10828-01");                  break;
r7626r7627
927936
928937static DEVICE_START( luxor_55_21046 )
929938{
930   fast_t *conkort = (fast_t *)device->token;
939   fast_t *conkort = get_safe_token_fast(device);
931940
932941   /* find our CPU */
933942   conkort->cpu = device->subdevice(Z80_TAG);
r7626r7627
939948   conkort->image1 = device->subdevice(FLOPPY_1);
940949
941950   /* register for state saving */
951   state_save_register_device_item(device, 0, conkort->cs);
942952   state_save_register_device_item(device, 0, conkort->status);
943953   state_save_register_device_item(device, 0, conkort->data);
944954   state_save_register_device_item(device, 0, conkort->fdc_irq);
r7626r7627
950960
951961static DEVICE_RESET( luxor_55_21046 )
952962{
953   fast_t *conkort = (fast_t *)device->token;
963   fast_t *conkort = get_safe_token_fast(device);
954964
955   floppy_mon_w(conkort->image0, CLEAR_LINE);
956   floppy_mon_w(conkort->image1, CLEAR_LINE);
965   conkort->cpu->reset();
966
967   conkort->cs = 0;
968
969   floppy_mon_w(conkort->image0, ASSERT_LINE);
970   floppy_mon_w(conkort->image1, ASSERT_LINE);
957971   floppy_drive_set_ready_state(conkort->image0, 1, 1);
958972   floppy_drive_set_ready_state(conkort->image1, 1, 1);
959973}
r7626r7627
979993      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(luxor_55_21046);         break;
980994      case DEVINFO_FCT_STOP:                     /* Nothing */                                    break;
981995      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(luxor_55_21046);         break;
982      case DEVINFO_FCT_ABCBUS_CARD_SELECT:         info->f = (genf *)ABCBUS_CARD_SELECT_NAME(luxor_55_21046);   break;
983996
984997      /* --- the following bits of info are returned as NULL-terminated strings --- */
985998      case DEVINFO_STR_NAME:                     strcpy(info->s, "Luxor Conkort 55 21046-xx");            break;
r7626r7627
9891002      case DEVINFO_STR_CREDITS:                  strcpy(info->s, "Copyright the MESS Team");             break;
9901003   }
9911004}
1005
1006FLOPPY_OPTIONS_START(abc80)
1007   FLOPPY_OPTION(abc80, "dsk", "Scandia Metric FD2", basicdsk_identify_default, basicdsk_construct_default,
1008      HEADS([1])
1009      TRACKS([40])
1010      SECTORS([8])
1011      SECTOR_LENGTH([256])
1012      FIRST_SECTOR_ID([0]))
1013   FLOPPY_OPTION(abc80, "dsk", "ABC 830", basicdsk_identify_default, basicdsk_construct_default,
1014      HEADS([1])
1015      TRACKS([40])
1016      SECTORS([16])
1017      SECTOR_LENGTH([256])
1018      FIRST_SECTOR_ID([0]))
1019   FLOPPY_OPTION(abc80, "dsk", "ABC 832/834", basicdsk_identify_default, basicdsk_construct_default,
1020      HEADS([2])
1021      TRACKS([80])
1022      SECTORS([16])
1023      SECTOR_LENGTH([256])
1024      FIRST_SECTOR_ID([0]))
1025   FLOPPY_OPTION(abc80, "dsk", "ABC 838", basicdsk_identify_default, basicdsk_construct_default,
1026      HEADS([2])
1027      TRACKS([77])
1028      SECTORS([26])
1029      SECTOR_LENGTH([256])
1030      FIRST_SECTOR_ID([0]))
1031FLOPPY_OPTIONS_END
src/mess/machine/conkort.h
r7626r7627
22#define __CONKORT__
33
44#include "emu.h"
5#include "formats/flopimg.h"
56
67/***************************************************************************
78    MACROS / CONSTANTS
89***************************************************************************/
910
10#define CONKORT_TAG   "conkort"
11
1211#define LUXOR_55_10828 DEVICE_GET_INFO_NAME( luxor_55_10828 )
1312#define LUXOR_55_21046 DEVICE_GET_INFO_NAME( luxor_55_21046 )
1413
15#define MDRV_LUXOR_55_10828_ADD \
16   MDRV_DEVICE_ADD(CONKORT_TAG, LUXOR_55_10828, 0)
14#define MDRV_LUXOR_55_10828_ADD(_tag) \
15   MDRV_DEVICE_ADD(_tag, LUXOR_55_10828, 0)
1716
18#define MDRV_LUXOR_55_21046_ADD \
19   MDRV_DEVICE_ADD(CONKORT_TAG, LUXOR_55_21046, 0)
17#define MDRV_LUXOR_55_21046_ADD(_tag) \
18   MDRV_DEVICE_ADD(_tag, LUXOR_55_21046, 0)
2019
20#define LUXOR_55_10828_ABCBUS(_tag) \
21   _tag, DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_cs_w), DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_stat_r), \
22   DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_inp_r), DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_utp_w), DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_c1_w), \
23   DEVCB_DEVICE_HANDLER(_tag, luxor_55_10828_c3_w), DEVCB_DEVICE_LINE(_tag, luxor_55_10828_rst_w)
24
25#define LUXOR_55_21046_ABCBUS(_tag) \
26   _tag, DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_cs_w), DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_stat_r), \
27   DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_inp_r), DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_utp_w), DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_c1_w), \
28   DEVCB_DEVICE_HANDLER(_tag, luxor_55_21046_c3_w), DEVCB_DEVICE_LINE(_tag, luxor_55_21046_rst_w)
29
2130/***************************************************************************
2231    PROTOTYPES
2332***************************************************************************/
r7626r7627
2938/* configuration dips */
3039INPUT_PORTS_EXTERN( luxor_55_21046 );
3140
41/* floppy options */
42FLOPPY_OPTIONS_EXTERN( abc80 );
43
44/* ABC bus interface */
45WRITE8_DEVICE_HANDLER( luxor_55_10828_cs_w );
46WRITE_LINE_DEVICE_HANDLER( luxor_55_10828_rst_w );
47READ8_DEVICE_HANDLER( luxor_55_10828_stat_r );
48READ8_DEVICE_HANDLER( luxor_55_10828_inp_r );
49WRITE8_DEVICE_HANDLER( luxor_55_10828_utp_w );
50WRITE8_DEVICE_HANDLER( luxor_55_10828_c1_w );
51WRITE8_DEVICE_HANDLER( luxor_55_10828_c3_w );
52
53WRITE8_DEVICE_HANDLER( luxor_55_21046_cs_w );
54WRITE_LINE_DEVICE_HANDLER( luxor_55_21046_rst_w );
55READ8_DEVICE_HANDLER( luxor_55_21046_stat_r );
56READ8_DEVICE_HANDLER( luxor_55_21046_inp_r );
57WRITE8_DEVICE_HANDLER( luxor_55_21046_utp_w );
58WRITE8_DEVICE_HANDLER( luxor_55_21046_c1_w );
59WRITE8_DEVICE_HANDLER( luxor_55_21046_c3_w );
60
3261#endif
src/mess/machine/abcbus.c
r7626r7627
1/**********************************************************************
2
3    Luxor ABC-bus emulation
4
5    Copyright MESS Team.
6    Visit http://mamedev.org for licensing and usage restrictions.
7
8**********************************************************************/
9
110#include "emu.h"
211#include "abcbus.h"
312
4#include "formats/basicdsk.h"
13/***************************************************************************
14    PARAMETERS
15***************************************************************************/
516
17#define LOG 1
18
19/***************************************************************************
20    TYPE DEFINITIONS
21***************************************************************************/
22
623typedef struct _abcbus_daisy_state abcbus_daisy_state;
724struct _abcbus_daisy_state
825{
9   abcbus_daisy_state *   next;         /* next device */
10   running_device *   device;         /* associated device */
11   abcbus_card_select      card_select;   /* card select callback */
26   abcbus_daisy_state         *next;         /* next device */
27   running_device            *device;      /* associated device */
28
29   devcb_resolved_write8      out_cs_func;
30
31   devcb_resolved_read8      in_stat_func;
32
33   devcb_resolved_read8      in_inp_func;
34   devcb_resolved_write8      out_utp_func;
35
36   devcb_resolved_write8      out_c_func[4];
37
38   devcb_resolved_write_line   out_rst_func;
1239};
1340
14static abcbus_daisy_state *daisy_state;
41typedef struct _abcbus_t abcbus_t;
42struct _abcbus_t
43{
44   abcbus_daisy_state *daisy_state;
45};
1546
16void abcbus_init(running_machine *machine, const char *cputag, const abcbus_daisy_chain *daisy)
47/***************************************************************************
48    INLINE FUNCTIONS
49***************************************************************************/
50
51INLINE abcbus_t *get_safe_token(running_device *device)
1752{
18   astring tempstring;
53   assert(device != NULL);
54   assert(device->token != NULL);
55   assert(device->type == ABCBUS);
56   return (abcbus_t *)device->token;
57}
58
59INLINE const abcbus_daisy_chain *get_interface(running_device *device)
60{
61   assert(device != NULL);
62   assert(device->type == ABCBUS);
63   return (const abcbus_daisy_chain *) device->baseconfig().static_config;
64}
65
66/***************************************************************************
67    IMPLEMENTATION
68***************************************************************************/
69
70WRITE8_DEVICE_HANDLER( abcbus_cs_w )
71{
72   abcbus_t *abcbus = get_safe_token(device);
73   abcbus_daisy_state *daisy = abcbus->daisy_state;
74
75   if (LOG) logerror("ABCBUS: '%s' CS %02x\n", device->tag(), data);
76
77   for ( ; daisy != NULL; daisy = daisy->next)
78   {
79      devcb_call_write8(&daisy->out_cs_func, 0, data);
80   }
81}
82
83READ8_DEVICE_HANDLER( abcbus_rst_r )
84{
85   abcbus_t *abcbus = get_safe_token(device);
86   abcbus_daisy_state *daisy = abcbus->daisy_state;
87
88   for ( ; daisy != NULL; daisy = daisy->next)
89   {
90      devcb_call_write_line(&daisy->out_rst_func, 0);
91      devcb_call_write_line(&daisy->out_rst_func, 1);
92   }
93
94   return 0xff;
95}
96
97READ8_DEVICE_HANDLER( abcbus_inp_r )
98{
99   abcbus_t *abcbus = get_safe_token(device);
100   abcbus_daisy_state *daisy = abcbus->daisy_state;
101   UINT8 data = 0xff;
102
103   for ( ; daisy != NULL; daisy = daisy->next)
104   {
105      data &= devcb_call_read8(&daisy->in_inp_func, 0);
106   }
107
108   if (LOG) logerror("ABCBUS: '%s' INP %02x\n", device->tag(), data);
109
110   return data;
111}
112
113WRITE8_DEVICE_HANDLER( abcbus_utp_w )
114{
115   abcbus_t *abcbus = get_safe_token(device);
116   abcbus_daisy_state *daisy = abcbus->daisy_state;
117
118   if (LOG) logerror("ABCBUS: '%s' UTP %02x\n", device->tag(), data);
119
120   for ( ; daisy != NULL; daisy = daisy->next)
121   {
122      devcb_call_write8(&daisy->out_utp_func, 0, data);
123   }
124}
125
126READ8_DEVICE_HANDLER( abcbus_stat_r )
127{
128   abcbus_t *abcbus = get_safe_token(device);
129   abcbus_daisy_state *daisy = abcbus->daisy_state;
130   UINT8 data = 0xff;
131
132   for ( ; daisy != NULL; daisy = daisy->next)
133   {
134      data &= devcb_call_read8(&daisy->in_stat_func, 0);
135   }
136
137   if (LOG) logerror("ABCBUS: '%s' STAT %02x\n", device->tag(), data);
138
139   return data;
140}
141
142static void command_w(running_device *device, int index, UINT8 data)
143{
144   abcbus_t *abcbus = get_safe_token(device);
145   abcbus_daisy_state *daisy = abcbus->daisy_state;
146
147   if (LOG) logerror("ABCBUS: '%s' C%u %02x\n", device->tag(), index + 1, data);
148
149   for ( ; daisy != NULL; daisy = daisy->next)
150   {
151      devcb_call_write8(&daisy->out_c_func[index], 0, data);
152   }
153}
154
155WRITE8_DEVICE_HANDLER( abcbus_c1_w ) { command_w(device, 0, data); }
156WRITE8_DEVICE_HANDLER( abcbus_c2_w ) { command_w(device, 1, data); }
157WRITE8_DEVICE_HANDLER( abcbus_c3_w ) { command_w(device, 2, data); }
158WRITE8_DEVICE_HANDLER( abcbus_c4_w ) { command_w(device, 3, data); }
159
160/*-------------------------------------------------
161    DEVICE_START( abcbus )
162-------------------------------------------------*/
163
164static DEVICE_START( abcbus )
165{
166   abcbus_t *abcbus = get_safe_token(device);
167   const abcbus_daisy_chain *daisy = get_interface(device);
168
19169   abcbus_daisy_state *head = NULL;
20170   abcbus_daisy_state **tailptr = &head;
21171
22172   /* create a linked list of devices */
23173   for ( ; daisy->tag != NULL; daisy++)
24174   {
25      *tailptr = auto_alloc(machine, abcbus_daisy_state);
175      *tailptr = auto_alloc(device->machine, abcbus_daisy_state);
176
177      /* find device */
26178      (*tailptr)->next = NULL;
27      (*tailptr)->device = devtag_get_device(machine,  machine->device(cputag)->siblingtag(tempstring, daisy->tag));
179      (*tailptr)->device = devtag_get_device(device->machine, daisy->tag);
180
28181      if ((*tailptr)->device == NULL)
29182      {
30183         fatalerror("Unable to locate device '%s'", daisy->tag);
31184      }
32      (*tailptr)->card_select = (abcbus_card_select)(*tailptr)->device->get_config_fct(DEVINFO_FCT_ABCBUS_CARD_SELECT);
185
186      /* resolve callbacks */
187      devcb_resolve_write8(&(*tailptr)->out_cs_func, &daisy->out_cs_func, device);
188      devcb_resolve_read8(&(*tailptr)->in_stat_func, &daisy->in_stat_func, device);
189      devcb_resolve_read8(&(*tailptr)->in_inp_func, &daisy->in_inp_func, device);
190      devcb_resolve_write8(&(*tailptr)->out_utp_func, &daisy->out_utp_func, device);
191      devcb_resolve_write8(&(*tailptr)->out_c_func[0], &daisy->out_c1_func, device);
192      devcb_resolve_write8(&(*tailptr)->out_c_func[1], &daisy->out_c2_func, device);
193      devcb_resolve_write8(&(*tailptr)->out_c_func[2], &daisy->out_c3_func, device);
194      devcb_resolve_write8(&(*tailptr)->out_c_func[3], &daisy->out_c4_func, device);
195      devcb_resolve_write_line(&(*tailptr)->out_rst_func, &daisy->out_rst_func, device);
196
33197      tailptr = &(*tailptr)->next;
34198   }
35199
36   daisy_state = head;
200   abcbus->daisy_state = head;
37201}
38202
39WRITE8_HANDLER( abcbus_channel_w )
40{
41   abcbus_daisy_state *daisy = daisy_state;
203/*-------------------------------------------------
204    DEVICE_GET_INFO( abcbus )
205-------------------------------------------------*/
42206
43   /* loop over all devices and call their card select function */
44   for ( ; daisy != NULL; daisy = daisy_state->next)
45      (*daisy->card_select)(daisy->device, data);
46}
47
48READ8_HANDLER( abcbus_reset_r )
207DEVICE_GET_INFO( abcbus )
49208{
50   abcbus_daisy_state *daisy = daisy_state;
209   switch (state)
210   {
211      /* --- the following bits of info are returned as 64-bit signed integers --- */
212      case DEVINFO_INT_TOKEN_BYTES:               info->i = sizeof(abcbus_t);                           break;
213      case DEVINFO_INT_INLINE_CONFIG_BYTES:         info->i = 0;                                    break;
214      case DEVINFO_INT_CLASS:                     info->i = DEVICE_CLASS_PERIPHERAL;                     break;
51215
52   /* loop over all devices and call their reset function */
53   for ( ; daisy != NULL; daisy = daisy->next)
54      daisy->device->reset();
216      /* --- the following bits of info are returned as pointers to data or functions --- */
217      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(abcbus);               break;
218      case DEVINFO_FCT_STOP:                     /* Nothing */                                    break;
219      case DEVINFO_FCT_RESET:                     /* Nothing */                                    break;
55220
56   /* uninstall I/O handlers */
57   memory_nop_readwrite(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_INP, ABCBUS_OUT, 0x18, 0);
58   memory_nop_read(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_STAT, ABCBUS_STAT, 0x18, 0);
59   memory_nop_write(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_C1, ABCBUS_C1, 0x18, 0);
60   memory_nop_write(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_C2, ABCBUS_C2, 0x18, 0);
61   memory_nop_write(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_C3, ABCBUS_C3, 0x18, 0);
62   memory_nop_write(cpu_get_address_space(space->machine->firstcpu, ADDRESS_SPACE_IO), ABCBUS_C4, ABCBUS_C4, 0x18, 0);
63
64   return 0xff;
221      /* --- the following bits of info are returned as NULL-terminated strings --- */
222      case DEVINFO_STR_NAME:                     strcpy(info->s, "ABC bus");                           break;
223      case DEVINFO_STR_FAMILY:                  strcpy(info->s, "ABC-80");                           break;
224      case DEVINFO_STR_VERSION:                  strcpy(info->s, "1.0");                              break;
225      case DEVINFO_STR_SOURCE_FILE:               strcpy(info->s, __FILE__);                           break;
226      case DEVINFO_STR_CREDITS:                  strcpy(info->s, "Copyright the MESS Team");             break;
227   }
65228}
66
67FLOPPY_OPTIONS_START(abc80)
68   FLOPPY_OPTION(abc80, "dsk", "Scandia Metric FD2", basicdsk_identify_default, basicdsk_construct_default,
69      HEADS([1])
70      TRACKS([40])
71      SECTORS([8])
72      SECTOR_LENGTH([256])
73      FIRST_SECTOR_ID([0]))
74   FLOPPY_OPTION(abc80, "dsk", "ABC 830", basicdsk_identify_default, basicdsk_construct_default,
75      HEADS([1])
76      TRACKS([40])
77      SECTORS([16])
78      SECTOR_LENGTH([256])
79      FIRST_SECTOR_ID([0]))
80   FLOPPY_OPTION(abc80, "dsk", "ABC 832/834", basicdsk_identify_default, basicdsk_construct_default,
81      HEADS([2])
82      TRACKS([80])
83      SECTORS([16])
84      SECTOR_LENGTH([256])
85      FIRST_SECTOR_ID([0]))
86   FLOPPY_OPTION(abc80, "dsk", "ABC 838", basicdsk_identify_default, basicdsk_construct_default,
87      HEADS([2])
88      TRACKS([77])
89      SECTORS([26])
90      SECTOR_LENGTH([256])
91      FIRST_SECTOR_ID([0]))
92FLOPPY_OPTIONS_END
src/mess/machine/abcbus.h
r7626r7627
1/**********************************************************************
2
3    Luxor ABC-bus emulation
4
5    Copyright MESS Team.
6    Visit http://mamedev.org for licensing and usage restrictions.
7
8**********************************************************************/
9
110/*
211
312                      a     b
r7626r7627
8089#ifndef __ABCBUS__
8190#define __ABCBUS__
8291
83#include "formats/flopimg.h"
92/***************************************************************************
93    MACROS / CONSTANTS
94***************************************************************************/
8495
85#define DEVINFO_FCT_ABCBUS_CARD_SELECT   DEVINFO_FCT_DEVICE_SPECIFIC
96#define ABCBUS DEVICE_GET_INFO_NAME( abcbus )
8697
87enum
88{
89   ABCBUS_OUT = 0,
90   ABCBUS_INP = 0,
91   ABCBUS_CS = 1,
92   ABCBUS_STAT = 1,
93   ABCBUS_C1,
94   ABCBUS_C2,
95   ABCBUS_C3,
96   ABCBUS_C4,
97   ABCBUS_RST = 7
98};
98#define MDRV_ABCBUS_ADD(_tag, _daisy_chain) \
99   MDRV_DEVICE_ADD(_tag, ABCBUS, 0) \
100   MDRV_DEVICE_CONFIG(_daisy_chain)
99101
100/* macros */
101#define ABCBUS_CARD_SELECT_NAME(name)   abcbus_card_select_##name
102#define ABCBUS_CARD_SELECT(name)      void ABCBUS_CARD_SELECT_NAME(name)(running_device *device, UINT8 data)
102#define ABCBUS_DAISY(_name) \
103   const abcbus_daisy_chain (_name)[] =
103104
104/* per-device callback functions */
105typedef void (*abcbus_card_select)(running_device *device, UINT8 data);
105/***************************************************************************
106    TYPE DEFINITIONS
107***************************************************************************/
106108
107/* daisy chain structure */
108109typedef struct _abcbus_daisy_chain abcbus_daisy_chain;
109110struct _abcbus_daisy_chain
110111{
111   const char      *tag;   /* device tag */
112   const char *tag;   /* device tag */
113
114   devcb_write8      out_cs_func;
115
116   devcb_read8         in_stat_func;
117
118   devcb_read8         in_inp_func;
119   devcb_write8      out_utp_func;
120
121   devcb_write8      out_c1_func;
122   devcb_write8      out_c2_func;
123   devcb_write8      out_c3_func;
124   devcb_write8      out_c4_func;
125
126   devcb_write_line   out_rst_func;
112127};
113#define ABCBUS_CONFIG(name) const abcbus_daisy_chain (name)[] =
114128
115void abcbus_init(running_machine *machine, const char *cputag, const abcbus_daisy_chain *daisy);
129/***************************************************************************
130    PROTOTYPES
131***************************************************************************/
116132
117WRITE8_HANDLER( abcbus_channel_w );
118READ8_HANDLER( abcbus_reset_r );
133/* device interface */
134DEVICE_GET_INFO( abcbus );
119135
120FLOPPY_OPTIONS_EXTERN(abc80);
136/* card select */
137WRITE8_DEVICE_HANDLER( abcbus_cs_w );
121138
139/* reset */
140READ8_DEVICE_HANDLER( abcbus_rst_r );
141
142/* data */
143READ8_DEVICE_HANDLER( abcbus_inp_r );
144WRITE8_DEVICE_HANDLER( abcbus_utp_w );
145
146/* status */
147READ8_DEVICE_HANDLER( abcbus_stat_r );
148
149/* commands */
150WRITE8_DEVICE_HANDLER( abcbus_c1_w );
151WRITE8_DEVICE_HANDLER( abcbus_c2_w );
152WRITE8_DEVICE_HANDLER( abcbus_c3_w );
153WRITE8_DEVICE_HANDLER( abcbus_c4_w );
154
122155#endif
src/mess/drivers/abc80.c
r7626r7627
251251static ADDRESS_MAP_START( abc80_io_map, ADDRESS_SPACE_IO, 8 )
252252   ADDRESS_MAP_UNMAP_HIGH
253253   ADDRESS_MAP_GLOBAL_MASK(0x17)
254   AM_RANGE(0x01, 0x01) AM_WRITE(abcbus_channel_w)
254   AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_inp_r, abcbus_utp_w)
255   AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_stat_r, abcbus_cs_w)
256   AM_RANGE(0x02, 0x02) AM_DEVWRITE(ABCBUS_TAG, abcbus_c1_w)
257   AM_RANGE(0x03, 0x03) AM_DEVWRITE(ABCBUS_TAG, abcbus_c2_w)
258   AM_RANGE(0x04, 0x04) AM_DEVWRITE(ABCBUS_TAG, abcbus_c3_w)
259   AM_RANGE(0x05, 0x05) AM_DEVWRITE(ABCBUS_TAG, abcbus_c4_w)
255260   AM_RANGE(0x06, 0x06) AM_DEVWRITE(SN76477_TAG, abc80_sound_w)
256   AM_RANGE(0x07, 0x07) AM_READ(abcbus_reset_r)
261   AM_RANGE(0x07, 0x07) AM_DEVREAD(ABCBUS_TAG, abcbus_rst_r)
257262   AM_RANGE(0x10, 0x13) AM_MIRROR(0x04) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_ba_cd_r, z80pio_ba_cd_w)
258263ADDRESS_MAP_END
259264
r7626r7627
476481
477482/* ABC BUS */
478483
479static ABCBUS_CONFIG( abcbus_config )
484static ABCBUS_DAISY( abcbus_daisy )
480485{
481   { CONKORT_TAG },
486   { LUXOR_55_10828_ABCBUS("abc830") },
482487   { NULL }
483488};
484489
r7626r7627
507512   state->z80pio = devtag_get_device(machine, Z80PIO_TAG);
508513   state->cassette = devtag_get_device(machine, CASSETTE_TAG);
509514
510   /* initialize the ABC BUS */
511   abcbus_init(machine, Z80_TAG, abcbus_config);
512
513515   /* register for state saving */
514516   state_save_register_global(machine, state->key_data);
515517   state_save_register_global(machine, state->key_strobe);
r7626r7627
538540   MDRV_Z80PIO_ADD(Z80PIO_TAG, ABC80_XTAL/2/2, abc80_pio_intf)
539541
540542   /* Luxor Conkort 55-10828 */
541   MDRV_LUXOR_55_10828_ADD
543   MDRV_ABCBUS_ADD(ABCBUS_TAG, abcbus_daisy)
544   MDRV_LUXOR_55_10828_ADD("abc830")
542545
543546   /* video hardware */
544547   MDRV_IMPORT_FROM(abc80_video)
src/mess/drivers/abc80x.c
r7626r7627
451451static ADDRESS_MAP_START( abc800m_io_map, ADDRESS_SPACE_IO, 8 )
452452   ADDRESS_MAP_UNMAP_HIGH
453453   ADDRESS_MAP_GLOBAL_MASK(0xff)
454   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_WRITE(abcbus_channel_w)
454   AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_inp_r, abcbus_utp_w)
455   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_stat_r, abcbus_cs_w)
456   AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c1_w)
457   AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c2_w)
458   AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c3_w)
459   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c4_w)
455460   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_READ(abc800_pling_r)
456461   AM_RANGE(0x06, 0x06) AM_MIRROR(0x18) AM_WRITE(abc800_hrs_w)
457   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_READWRITE(abcbus_reset_r, abc800_hrc_w)
462   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_rst_r) AM_WRITE(abc800_hrc_w)
458463   AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_ba_cd_r, z80dart_ba_cd_w)
459464   AM_RANGE(0x31, 0x31) AM_MIRROR(0x06) AM_DEVREAD(MC6845_TAG, mc6845_register_r)
460465   AM_RANGE(0x38, 0x38) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_address_w)
r7626r7627
476481static ADDRESS_MAP_START( abc800c_io_map, ADDRESS_SPACE_IO, 8 )
477482   ADDRESS_MAP_UNMAP_HIGH
478483   ADDRESS_MAP_GLOBAL_MASK(0xff)
479   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_WRITE(abcbus_channel_w)
484   AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_inp_r, abcbus_utp_w)
485   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_stat_r, abcbus_cs_w)
486   AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c1_w)
487   AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c2_w)
488   AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c3_w)
489   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c4_w)
480490   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_READ(abc800_pling_r)
481491   AM_RANGE(0x06, 0x06) AM_MIRROR(0x18) AM_WRITE(abc800_hrs_w)
482   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_READWRITE(abcbus_reset_r, abc800_hrc_w)
492   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_rst_r) AM_WRITE(abc800_hrc_w)
483493   AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_ba_cd_r, z80dart_ba_cd_w)
484494   AM_RANGE(0x40, 0x43) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80SIO_TAG, z80sio_ba_cd_r, z80sio_ba_cd_w)
485495   AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_r, z80ctc_w)
r7626r7627
496506static ADDRESS_MAP_START( abc802_io_map, ADDRESS_SPACE_IO, 8 )
497507   ADDRESS_MAP_UNMAP_HIGH
498508   ADDRESS_MAP_GLOBAL_MASK(0xff)
499   AM_RANGE(0x01, 0x01) AM_MIRROR(0x08) AM_WRITE(abcbus_channel_w)
509   AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_inp_r, abcbus_utp_w)
510   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_stat_r, abcbus_cs_w)
511   AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c1_w)
512   AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c2_w)
513   AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c3_w)
514   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c4_w)
500515   AM_RANGE(0x05, 0x05) AM_MIRROR(0x08) AM_READ(abc802_pling_r)
501   AM_RANGE(0x07, 0x07) AM_MIRROR(0x08) AM_READ(abcbus_reset_r)
516   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_rst_r)
502517   AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_ba_cd_r, z80dart_ba_cd_w)
503518   AM_RANGE(0x31, 0x31) AM_MIRROR(0x06) AM_DEVREAD(MC6845_TAG, mc6845_register_r)
504519   AM_RANGE(0x38, 0x38) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_address_w)
r7626r7627
531546
532547static ADDRESS_MAP_START( abc806_io_map, ADDRESS_SPACE_IO, 8 )
533548   ADDRESS_MAP_UNMAP_HIGH
534   AM_RANGE(0x01, 0x01) AM_MIRROR(0xff18) AM_WRITE(abcbus_channel_w)
549   AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_inp_r, abcbus_utp_w)
550   AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_stat_r, abcbus_cs_w)
551   AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c1_w)
552   AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c2_w)
553   AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c3_w)
554   AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_c4_w)
535555   AM_RANGE(0x06, 0x06) AM_MIRROR(0xff18) AM_WRITE(abc806_hrs_w)
536   AM_RANGE(0x07, 0x07) AM_MIRROR(0xff18) AM_MASK(0xff00) AM_READWRITE(abcbus_reset_r, abc806_hrc_w)
556   AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_rst_r) AM_WRITE(abc806_hrc_w)
537557   AM_RANGE(0x20, 0x23) AM_MIRROR(0xff0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_ba_cd_r, z80dart_ba_cd_w)
538558   AM_RANGE(0x31, 0x31) AM_MIRROR(0xff06) AM_DEVREAD(MC6845_TAG, mc6845_register_r)
539559   AM_RANGE(0x34, 0x34) AM_MIRROR(0xff00) AM_MASK(0xff00) AM_READWRITE(abc806_mai_r, abc806_mao_w)
r7626r7627
908928
909929/* ABC BUS */
910930
911static ABCBUS_CONFIG( abcbus_config )
931static ABCBUS_DAISY( abcbus_daisy )
912932{
913   { CONKORT_TAG },
933   { LUXOR_55_21046_ABCBUS("abc830") },
914934   { NULL }
915935};
916936
917static ABCBUS_CONFIG( abc802_abcbus_config )
937static ABCBUS_DAISY( abc802_abcbus_daisy )
918938{
919//  { CONKORT_TAG }, won't boot with this enabled
939//   { LUXOR_55_21046_ABCBUS("abc830") }, won't boot with this enabled
920940   { NULL }
921941};
922942
r7626r7627
933953   state->abc77 = devtag_get_device(machine, ABC77_TAG);
934954   state->cassette = devtag_get_device(machine, CASSETTE_TAG);
935955
936   /* initialize the ABC BUS */
937   abcbus_init(machine, Z80_TAG, abcbus_config);
938
939956   /* register for state saving */
940957   state_save_register_global(machine, state->fetch_charram);
941958   state_save_register_global(machine, state->pling);
r7626r7627
960977   state->abc77 = devtag_get_device(machine, ABC77_TAG);
961978   state->cassette = devtag_get_device(machine, CASSETTE_TAG);
962979
963   /* initialize the ABC BUS */
964   abcbus_init(machine, Z80_TAG, abc802_abcbus_config); // TODO: enable floppy
965
966980   /* configure memory */
967981   memory_configure_bank(machine, "bank1", 0, 1, messram_get_ptr(devtag_get_device(machine, "messram")), 0);
968982   memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, Z80_TAG), 0);
r7626r7627
10111025   state->abc77 = devtag_get_device(machine, ABC77_TAG);
10121026   state->cassette = devtag_get_device(machine, CASSETTE_TAG);
10131027
1014   /* initialize the ABC BUS */
1015   abcbus_init(machine, Z80_TAG, abcbus_config);
1016
10171028   /* setup memory banking */
10181029   state->videoram = auto_alloc_array(machine, UINT8, videoram_size);
10191030
r7626r7627
10641075   z80dart_ctsb_w(state->z80dart, 0); // 0 = 50Hz, 1 = 60Hz
10651076}
10661077
1067static DEVICE_IMAGE_LOAD( abc800_serial )
1068{
1069   /* filename specified */
1070   if (device_load_serial(image)==INIT_PASS)
1071   {
1072      /* setup transmit parameters */
1073      serial_device_setup(image, 9600 >> input_port_read(image->machine, "BAUD"), 8, 1, SERIAL_PARITY_NONE);
1074
1075      /* and start transmit */
1076      serial_device_set_transmit_state(image, 1);
1077
1078      return INIT_PASS;
1079   }
1080
1081   return INIT_FAIL;
1082}
1083
1084
1085static DEVICE_GET_INFO( abc800_serial )
1086{
1087   switch ( state )
1088   {
1089      case DEVINFO_FCT_IMAGE_LOAD:              info->f = (genf *) DEVICE_IMAGE_LOAD_NAME( abc800_serial );    break;
1090      case DEVINFO_STR_NAME:                      strcpy(info->s, "ABC800 serial port");                            break;
1091      case DEVINFO_STR_IMAGE_FILE_EXTENSIONS:       strcpy(info->s, "txt");                                           break;
1092      default:                           DEVICE_GET_INFO_CALL(serial);   break;
1093   }
1094}
1095
1096#define ABC800_SERIAL   DEVICE_GET_INFO_NAME(abc800_serial)
1097
1098#define MDRV_ABC800_SERIAL_ADD(_tag) \
1099   MDRV_DEVICE_ADD(_tag, ABC800_SERIAL, 0)
1100
11011078/* Machine Drivers */
11021079
11031080static MACHINE_DRIVER_START( abc800m )
r7626r7627
11271104   MDRV_Z80SIO_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
11281105   MDRV_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf)
11291106//  MDRV_ABC77_ADD(abc800_abc77_intf)
1130   MDRV_LUXOR_55_21046_ADD
11311107   MDRV_PRINTER_ADD("printer")
1132   MDRV_CASSETTE_ADD( "cassette", default_cassette_config )
1108   MDRV_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
11331109
1110   /* ABC bus */
1111   MDRV_ABCBUS_ADD(ABCBUS_TAG, abcbus_daisy)
1112   MDRV_LUXOR_55_21046_ADD("abc830")
1113
11341114   /* fake keyboard */
11351115   MDRV_TIMER_ADD_PERIODIC("keyboard", keyboard_tick, USEC(2500))
11361116
r7626r7627
11381118   MDRV_RAM_ADD("messram")
11391119   MDRV_RAM_DEFAULT_SIZE("16K")
11401120   MDRV_RAM_EXTRA_OPTIONS("32K")
1141
1142   MDRV_ABC800_SERIAL_ADD("serial")
11431121MACHINE_DRIVER_END
11441122
11451123static MACHINE_DRIVER_START( abc800c )
r7626r7627
11691147   MDRV_Z80SIO_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
11701148   MDRV_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf)
11711149//  MDRV_ABC77_ADD(abc800_abc77_intf)
1172   MDRV_LUXOR_55_21046_ADD
11731150   MDRV_PRINTER_ADD("printer")
1174   MDRV_CASSETTE_ADD( "cassette", default_cassette_config )
1151   MDRV_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
11751152
1153   /* ABC bus */
1154   MDRV_ABCBUS_ADD(ABCBUS_TAG, abcbus_daisy)
1155   MDRV_LUXOR_55_21046_ADD("abc830")
1156
11761157   /* fake keyboard */
11771158   MDRV_TIMER_ADD_PERIODIC("keyboard", keyboard_tick, USEC(2500))
11781159
r7626r7627
11801161   MDRV_RAM_ADD("messram")
11811162   MDRV_RAM_DEFAULT_SIZE("16K")
11821163   MDRV_RAM_EXTRA_OPTIONS("32K")
1183
1184   MDRV_ABC800_SERIAL_ADD("serial")
11851164MACHINE_DRIVER_END
11861165
11871166static MACHINE_DRIVER_START( abc802 )
r7626r7627
12111190   MDRV_Z80SIO_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
12121191   MDRV_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc802_dart_intf)
12131192//  MDRV_ABC77_ADD(abc800_abc77_intf)
1214   MDRV_LUXOR_55_21046_ADD
12151193   MDRV_PRINTER_ADD("printer")
1216   MDRV_CASSETTE_ADD( "cassette", default_cassette_config )
1194   MDRV_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
12171195
1196   /* ABC bus */
1197   MDRV_ABCBUS_ADD(ABCBUS_TAG, abc802_abcbus_daisy)
1198   MDRV_LUXOR_55_21046_ADD("abc830")
1199
12181200   /* fake keyboard */
12191201   MDRV_TIMER_ADD_PERIODIC("keyboard", keyboard_tick, USEC(2500))
12201202
12211203   /* internal ram */
12221204   MDRV_RAM_ADD("messram")
12231205   MDRV_RAM_DEFAULT_SIZE("64K")
1224
1225   MDRV_ABC800_SERIAL_ADD("serial")
12261206MACHINE_DRIVER_END
12271207
12281208static MACHINE_DRIVER_START( abc806 )
r7626r7627
12501230   MDRV_Z80SIO_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
12511231   MDRV_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc806_dart_intf)
12521232//  MDRV_ABC77_ADD(abc800_abc77_intf)
1253   MDRV_LUXOR_55_21046_ADD
12541233   MDRV_PRINTER_ADD("printer")
1255   MDRV_CASSETTE_ADD( "cassette", default_cassette_config )
1234   MDRV_CASSETTE_ADD(CASSETTE_TAG, default_cassette_config)
12561235
1236   /* ABC bus */
1237   MDRV_ABCBUS_ADD(ABCBUS_TAG, abcbus_daisy)
1238   MDRV_LUXOR_55_21046_ADD("abc830")
1239
12571240   /* fake keyboard */
12581241   MDRV_TIMER_ADD_PERIODIC("keyboard", keyboard_tick, USEC(2500))
12591242
r7626r7627
12611244   MDRV_RAM_ADD("messram")
12621245   MDRV_RAM_DEFAULT_SIZE("160K") // 32KB + 128KB
12631246   MDRV_RAM_EXTRA_OPTIONS("544K") // 32KB + 512KB
1264
1265   MDRV_ABC800_SERIAL_ADD("serial")
12661247MACHINE_DRIVER_END
12671248
12681249/* ROMs */
docs/messnew.txt
r7626r7627
8484 
8585- Refactored the MOS6530 device to use devcb. [Curt Coder]
8686
87- Refactored the Luxor ABC bus into a device. [Curt Coder]
8788
8889
90
89910.137
9092
9193New System Drivers Supported:

Previous 15994 Revisions Next


© 1998-2018 The MESS Team