Previous 15994 Revisions Next

r2172 Sunday 30th March, 2008 at 22:02:46 UTC by Wilbert Pol
nec765 update: Connectivity of the RDY pin is now configurable.
Also contains src/mame/machine/pcshare updates as submitted to mamedev.
[src/mame/machine]pcshare.c pcshare.h
[src/mess/drivers]amstrad.c nc.c pcw.c pcw16.c sg1000.c sord.c spectrum.c x68k.c
[src/mess/machine]bebox.c compis.c kc.c nec765.c nec765.h pc.c pc8801.c pc_fdc.c pc_fdc.h

src/mame/machine/pcshare.c
r2171r2172
399399static const struct pc_fdc_interface fdc_interface =
400400{
401401   NEC765A,
402   NEC765_RDY_PIN_CONNECTED,
402403   pc_fdc_interrupt,
403404   pc_fdc_dma_drq,
404405};
406
407static const struct pc_fdc_interface fdc_interface_nc =
408{
409   NEC765A,
410   NEC765_RDY_PIN_NOT_CONNECTED,
411   pc_fdc_interrupt,
412   pc_fdc_dma_drq,
413};
405414#endif /* MESS */
406415
407416
r2171r2172
442451
443452#ifdef MESS
444453   /* FDC/HDC hardware */
445   pc_fdc_init(&fdc_interface);
454   pc_fdc_init( ( flags & PCCOMMON_NEC765_RDY_NC ) ? &fdc_interface_nc : &fdc_interface);
446455   pc_hdc_setup();
447456
448457   /* com hardware */
r2171r2172
506515static struct {
507516   UINT8 data;
508517   int on;
518   int self_test;
509519} pc_keyb= { 0 };
510520
511521UINT8 pc_keyb_read(void)
r2171r2172
517527
518528static TIMER_CALLBACK( pc_keyb_timer )
519529{
520   at_keyboard_reset();
521   pc_keyboard();
530   if ( pc_keyb.on ) {
531      pc_keyb.self_test = ( pc_keyb.self_test == 1 ) ? 2 : 0;
532      pc_keyboard();
533   } else {
534      /* Clock has been low for more than 5 msec, start diagnostic test */
535      at_keyboard_reset();
536      pc_keyb.self_test = 1;
537   }
522538}
523539
524540
r2171r2172
529545
530546   if (pc_keyb.on != on)
531547   {
532      if (on)
548      if (!on)
533549         timer_adjust_oneshot(pc_keyboard_timer, ATTOTIME_IN_MSEC(5), 0);
534      else
535         timer_reset(pc_keyboard_timer, attotime_never);
550      else {
551         if ( pc_keyb.self_test == 1 ) {
552            /* The self test of the keyboard takes some time. 2 msec seems to work. */
553            /* This still needs to verified against a real keyboard. */
554            timer_adjust_oneshot(pc_keyboard_timer, ATTOTIME_IN_MSEC( 2 ), 0);
555         } else {
556            timer_reset(pc_keyboard_timer, attotime_never);
557            pc_keyb.self_test = 0;
558         }
559      }
536560
537561      pc_keyb.on = on;
538562   }
r2171r2172
541565void pc_keyb_clear(void)
542566{
543567   pc_keyb.data = 0;
568   pic8259_set_irq_line(0, 1, 0);
544569}
545570
546571void pc_keyboard(void)
r2171r2172
554579      if ( (data=at_keyboard_read())!=-1) {
555580         pc_keyb.data = data;
556581         DBG_LOG(1,"KB_scancode",("$%02x\n", pc_keyb.data));
557         pic8259_set_irq_line(0, 1, 1);
558         pic8259_set_irq_line(0, 1, 0);
582         if ( ! ( data & 0x80 ) || pc_keyb.self_test == 2 ) {
583            pic8259_set_irq_line(0, 1, 1);
584            if ( pc_keyb.self_test == 2 ) {
585               pc_keyb.self_test = 0;
586            }
587         }
559588      }
560589   }
561590}
src/mame/machine/pcshare.h
r2171r2172
88#define PCCOMMON_TIMER_NONE     0
99#define PCCOMMON_TIMER_8253     4
1010#define PCCOMMON_TIMER_8254     8
11#define PCCOMMON_NEC765_RDY_NC   16
1112
1213void init_pc_common(UINT32 flags);
1314
src/mess/machine/nec765.c
r2171r2172
6868   unsigned long   sector_counter;
6969   /* version of fdc to emulate */
7070   NEC765_VERSION version;
71   /* is the RDY pin connected or not */
72   NEC765_RDY_PIN   rdy_pin;
7173   /* main status register */
7274   unsigned char    FDC_main;
7375   /* data register */
r2171r2172
664666   fdc.nec765_status[0] = 0x0c0 | drive;
665667
666668   /* not ready */
667   if (state==0)
669   if (state==0 && fdc.rdy_pin == NEC765_RDY_PIN_CONNECTED )
668670      fdc.nec765_status[0] |= 8;
669671
670672   /* trigger an int */
r2171r2172
674676
675677
676678
677void nec765_init(const nec765_interface *iface, NEC765_VERSION version)
679void nec765_init(const nec765_interface *iface, NEC765_VERSION version, NEC765_RDY_PIN rdy_pin)
678680{
679681   int i;
680682
681683   fdc.version = version;
684   fdc.rdy_pin = rdy_pin;
682685   fdc.timer = timer_alloc(nec765_timer_callback, NULL);
683686   fdc.seek_timer = timer_alloc(nec765_seek_timer_callback, NULL);
684687   fdc.command_timer = timer_alloc(nec765_continue_command, NULL);
r2171r2172
21462149
21472150      }
21482151
2149      if (!a_drive_is_ready)
2152      if (!a_drive_is_ready && fdc.rdy_pin == NEC765_RDY_PIN_CONNECTED )
21502153      {
21512154         fdc.nec765_status[0] |= 0x08;
21522155      }
src/mess/machine/nec765.h
r2171r2172
2121   NEC72065 = 3
2222} NEC765_VERSION;
2323
24/* RDY pin connected state */
25typedef enum
26{
27   NEC765_RDY_PIN_NOT_CONNECTED = 0,
28   NEC765_RDY_PIN_CONNECTED = 1
29} NEC765_RDY_PIN;
30
2431#define NEC765_DAM_DELETED_DATA 0x0f8
2532#define NEC765_DAM_DATA 0x0fb
2633
r2171r2172
3744} nec765_interface;
3845
3946/* init nec765 interface */
40void nec765_init(const nec765_interface *iface, NEC765_VERSION version);
47void nec765_init(const nec765_interface *iface, NEC765_VERSION version, NEC765_RDY_PIN rdy_pin);
4148/* set nec765 terminal count input state */
4249void nec765_set_tc_state(int);
4350/* set nec765 ready input*/
src/mess/machine/pc8801.c
r2171r2172
816816      cpunum_suspend(1, SUSPEND_REASON_DISABLE, 1);
817817   else
818818      cpunum_resume(1, SUSPEND_REASON_DISABLE);
819   nec765_init(&pc8801_fdc_interface,NEC765A);
819   nec765_init(&pc8801_fdc_interface,NEC765A,NEC765_RDY_PIN_CONNECTED);
820820   cpunum_set_input_line_vector(1,0,0);
821821   floppy_drive_set_motor_state(image_from_devtype_and_index(IO_FLOPPY, 0), 1);
822822   floppy_drive_set_motor_state(image_from_devtype_and_index(IO_FLOPPY, 1), 1);
src/mess/machine/pc_fdc.c
r2171r2172
9292      memcpy(&fdc->fdc_interface, iface, sizeof(fdc->fdc_interface));
9393
9494   /* setup nec765 interface */
95   nec765_init(&pc_fdc_nec765_interface, iface->nec765_type);
95   nec765_init(&pc_fdc_nec765_interface, iface->nec765_type, iface->nec765_rdy_pin);
9696
9797   pc_fdc_reset();
9898
src/mess/machine/pc_fdc.h
r2171r2172
2727struct pc_fdc_interface
2828{
2929   NEC765_VERSION nec765_type;
30   NEC765_RDY_PIN nec765_rdy_pin;
3031   void (*pc_fdc_interrupt)(int);
3132   void (*pc_fdc_dma_drq)(int,int);
3233   const device_config *(*get_image)(int floppy_index);
src/mess/machine/bebox.c
r2171r2172
391391static const struct pc_fdc_interface bebox_fdc_interface =
392392{
393393   SMC37C78,
394   NEC765_RDY_PIN_CONNECTED,
394395   bebox_fdc_interrupt,
395396   bebox_fdc_dma_drq,
396397   bebox_fdc_get_image
src/mess/machine/pc.c
r2171r2172
4949
5050DRIVER_INIT( pccga )
5151{
52   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
52   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
5353   ppi8255_init(&pc_ppi8255_interface);
5454   pc_rtc_init();
5555   pc_turbo_setup(0, 3, 0x02, 4.77/12, 1);
r2171r2172
5757
5858DRIVER_INIT( bondwell )
5959{
60   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
60   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
6161   ppi8255_init(&pc_ppi8255_interface);
6262   pc_turbo_setup(0, 3, 0x02, 4.77/12, 1);
6363}
6464
6565DRIVER_INIT( pcmda )
6666{
67   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
67   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
6868   ppi8255_init(&pc_ppi8255_interface);
6969   pc_turbo_setup(0, 3, 0x02, 4.77/12, 1);
7070}
r2171r2172
9090      rom[0xfffff]=256-a;
9191   }
9292
93   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
93   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
9494
9595   europc_rtc_init();
9696//   europc_rtc_set_time(machine);
r2171r2172
103103    /* just a plain bit pattern for graphics data generation */
104104    for (i = 0; i < 256; i++)
105105      gfx[i] = i;
106   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
106   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
107107   pc_turbo_setup(0, 3, 0x02, 4.77/12, 1);
108108}
109109
r2171r2172
122122   videoram=memory_region(REGION_CPU1)+0xb0000;
123123   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc200_16le_port378_r );
124124
125   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
125   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
126126}
127127
128128DRIVER_INIT( pc1512 )
r2171r2172
143143   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc16le_parallelport2_r );
144144
145145
146   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
146   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
147147   mc146818_init(MC146818_IGNORE_CENTURY);
148148}
149149
r2171r2172
206206   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc1640_16le_port278_r );
207207   memory_install_read16_handler(0, ADDRESS_SPACE_IO, 0x4278, 0x427b, 0, 0, pc1640_16le_port4278_r );
208208
209   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
209   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
210210
211211   mc146818_init(MC146818_IGNORE_CENTURY);
212212}
213213
214214DRIVER_INIT( pc_vga )
215215{
216   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253);
216   init_pc_common(PCCOMMON_KEYBOARD_PC | PCCOMMON_DMA8237_PC | PCCOMMON_TIMER_8253 | PCCOMMON_NEC765_RDY_NC);
217217   ppi8255_init(&pc_ppi8255_interface);
218218
219219   pc_vga_init(&vga_interface, NULL);
src/mess/machine/compis.c
r2171r2172
15881588   ppi8255_init(&compis_ppi_interface);
15891589
15901590   /* FDC */
1591   nec765_init(&compis_fdc_interface, NEC765A);
1591   nec765_init(&compis_fdc_interface, NEC765A, NEC765_RDY_PIN_CONNECTED);
15921592   compis_fdc_reset();
15931593
15941594   /* RTC */
src/mess/machine/kc.c
r2171r2172
241241{
242242   timer_set(attotime_zero, NULL, 0, kc85_disk_reset_timer_callback);
243243
244   nec765_init(&kc_fdc_interface,NEC765A);
244   nec765_init(&kc_fdc_interface,NEC765A,NEC765_RDY_PIN_CONNECTED);
245245
246246   /* reset ctc */
247247   z80ctc_reset(1);
src/mess/drivers/nc.c
r2171r2172
13501350
13511351    nc_common_init_machine(machine);
13521352
1353    nec765_init(&nc200_nec765_interface, NEC765A);
1353    nec765_init(&nc200_nec765_interface, NEC765A,NEC765_RDY_PIN_CONNECTED);
13541354    /* double sided, 80 track drive */
13551355   floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 0), FLOPPY_DRIVE_DS_80);
13561356   //floppy_drive_set_index_pulse_callback(image_from_devtype_and_index(IO_FLOPPY, 0), nc200_floppy_drive_index_callback);
src/mess/drivers/sord.c
r2171r2172
178178
179179static void sord_fd5_init(void)
180180{
181   nec765_init(&sord_fd5_nec765_interface,NEC765A);
181   nec765_init(&sord_fd5_nec765_interface,NEC765A,NEC765_RDY_PIN_CONNECTED);
182182}
183183
184184static MACHINE_RESET( sord_m5_fd5 )
src/mess/drivers/pcw16.c
r2171r2172
12071207static const struct pc_fdc_interface pcw16_fdc_interface=
12081208{
12091209   NEC765A,
1210   NEC765_RDY_PIN_CONNECTED,
12101211   pcw16_fdc_interrupt,
12111212   NULL
12121213};
src/mess/drivers/x68k.c
r2171r2172
19761976   memcpy(user2,(rom+0xff0000),0x10000);
19771977
19781978   ppi8255_init(&ppi_interface);
1979   nec765_init(&fdc_interface,NEC72065);
1979   nec765_init(&fdc_interface,NEC72065,NEC765_RDY_PIN_CONNECTED);
19801980   hd63450_init(&dmac_interface);
19811981   nec765_reset(0);
19821982   mfp_init();
src/mess/drivers/spectrum.c
r2171r2172
835835{
836836   spectrum_alloc_ram(128);
837837
838   nec765_init(&spectrum_plus3_nec765_interface, NEC765A);
838   nec765_init(&spectrum_plus3_nec765_interface, NEC765A, NEC765_RDY_PIN_CONNECTED);
839839
840840   floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 0), FLOPPY_DRIVE_SS_40);
841841   floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 1), FLOPPY_DRIVE_SS_40);
src/mess/drivers/sg1000.c
r2171r2172
534534{
535535   TMS9928A_configure(&tms9928a_interface);
536536   ppi8255_init(&sf7000_ppi8255_intf);
537   nec765_init(&sf7000_nec765_interface, NEC765A);
537   nec765_init(&sf7000_nec765_interface, NEC765A, NEC765_RDY_PIN_CONNECTED);
538538   floppy_drive_set_index_pulse_callback(image_from_devtype_and_index(IO_FLOPPY, 0), sf7000_fdc_index_callback);
539539   msm8251_init(&sf7000_uart_interface);
540540   centronics_config(1, sf7000_centronics_config);
src/mess/drivers/pcw.c
r2171r2172
746746
747747   cpunum_set_input_line_vector(0, 0,0x0ff);
748748
749    nec765_init(&pcw_nec765_interface,NEC765A);
749    nec765_init(&pcw_nec765_interface,NEC765A,NEC765_RDY_PIN_CONNECTED);
750750
751751   /* ram paging is actually undefined at power-on */
752752   pcw_banks[0] = 0;
src/mess/drivers/amstrad.c
r2171r2172
20392039
20402040   if(amstrad_system_type != SYSTEM_GX4000)
20412041   {
2042      nec765_init(&amstrad_nec765_interface,NEC765A/*?*/);
2042      nec765_init(&amstrad_nec765_interface,NEC765A/*?*/,NEC765_RDY_PIN_CONNECTED);
20432043      floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 0),  FLOPPY_DRIVE_SS_40);
20442044      floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 1),  FLOPPY_DRIVE_SS_40);
20452045   }
r2171r2172
22282228   amstrad_common_init();
22292229   amstrad_reset_machine(machine);
22302230
2231   nec765_init(&aleste_8272_interface,NEC765A);
2231   nec765_init(&aleste_8272_interface,NEC765A,NEC765_RDY_PIN_CONNECTED);
22322232   floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 0),  FLOPPY_DRIVE_DS_80);
22332233   floppy_drive_set_geometry(image_from_devtype_and_index(IO_FLOPPY, 1),  FLOPPY_DRIVE_DS_80);
22342234}

Previous 15994 Revisions Next


© 1998-2018 The MESS Team