Previous 15994 Revisions Next

r3749 Sunday 7th December, 2008 at 21:18:28 UTC by Nathan Woods
Enabled more drivers, did some search-n-replaces
[src/mess]mess.mak messdriv.c
[src/mess/audio]mea8000.c
[src/mess/drivers]kim1.c spectrum.c
[src/mess/machine]geneve.c hp48.c lynx.c mc6843.c mc6846.c mc6854.c odyssey2.c pdp1.c ti99_4x.c
[src/mess/video]border.c kc.c spectrum.c timex.c

src/mess/audio/mea8000.c
r3748r3749
662662   mea8000.req_out_func = req_out_func;
663663   mea8000.timer = timer_alloc(machine,  mea8000_timer_expire , NULL);
664664
665   state_save_register_item( "mea8000", NULL, 0, mea8000.state );
665   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.state );
666666   state_save_register_item_array( "mea8000", NULL, 0, mea8000.buf );
667   state_save_register_item( "mea8000", NULL, 0, mea8000.bufpos );
668   state_save_register_item( "mea8000", NULL, 0, mea8000.cont );
669   state_save_register_item( "mea8000", NULL, 0, mea8000.roe );
670   state_save_register_item( "mea8000", NULL, 0, mea8000.framelength );
671   state_save_register_item( "mea8000", NULL, 0, mea8000.framepos );
672   state_save_register_item( "mea8000", NULL, 0, mea8000.framelog );
673   state_save_register_item( "mea8000", NULL, 0, mea8000.lastsample );
674   state_save_register_item( "mea8000", NULL, 0, mea8000.sample );
675   state_save_register_item( "mea8000", NULL, 0, mea8000.phi );
667   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.bufpos );
668   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.cont );
669   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.roe );
670   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.framelength );
671   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.framepos );
672   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.framelog );
673   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.lastsample );
674   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.sample );
675   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.phi );
676676   for (i=0; i<4; i++)
677677   {
678      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].fm );
679      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].last_fm );
680      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].bw );
681      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].last_bw );
682      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].output );
683      state_save_register_item( "mea8000", NULL, i, mea8000.f[i].last_output );
678      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].fm );
679      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].last_fm );
680      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].bw );
681      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].last_bw );
682      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].output );
683      state_save_register_item(machine, "mea8000", NULL, i, mea8000.f[i].last_output );
684684   }
685   state_save_register_item( "mea8000", NULL, 0, mea8000.last_ampl );
686   state_save_register_item( "mea8000", NULL, 0, mea8000.ampl );
687   state_save_register_item( "mea8000", NULL, 0, mea8000.last_pitch );
688   state_save_register_item( "mea8000", NULL, 0, mea8000.pitch );
689   state_save_register_item( "mea8000", NULL, 0, mea8000.noise );
685   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.last_ampl );
686   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.ampl );
687   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.last_pitch );
688   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.pitch );
689   state_save_register_item(machine, "mea8000", NULL, 0, mea8000.noise );
690690
691691   mea8000_reset(machine);
692692}
src/mess/video/spectrum.c
r3748r3749
6767                pItem = EventList_GetFirstItem();
6868                set_last_border_color ( pItem[NumItems-1].Event_Data );
6969                EventList_Reset();
70            EventList_SetOffsetStartTime ( ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
70            EventList_SetOffsetStartTime ( cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
7171                logerror ("Event log reset in callback fn.\n");
7272        }
7373}
src/mess/video/border.c
r3748r3749
341341
342342   /* Assume all other routines have processed their data from the list */
343343   EventList_Reset();
344   EventList_SetOffsetStartTime ( ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
344   EventList_SetOffsetStartTime ( cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
345345}
src/mess/video/timex.c
r3748r3749
4444                pItem = EventList_GetFirstItem();
4545                set_last_border_color ( pItem[NumItems-1].Event_Data );
4646                EventList_Reset();
47            EventList_SetOffsetStartTime ( ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
47            EventList_SetOffsetStartTime ( cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
4848                logerror ("Event log reset in callback fn.\n");
4949        }
5050}
src/mess/video/kc.c
r3748r3749
111111/* set new blink state - record blink state in event list */
112112void kc85_video_set_blink_state(running_machine *machine, int data)
113113{
114   EventList_AddItemOffset(machine, KC85_VIDEO_EVENT_SET_BLINK_STATE, ((data & 0x01)<<7), ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))));
114   EventList_AddItemOffset(machine, KC85_VIDEO_EVENT_SET_BLINK_STATE, ((data & 0x01)<<7), cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))));
115115}
116116
117117
r3748r3749
548548   /* process remainder */
549549   kc85_common_vh_process_lines(&video_update, cycles_remaining_in_frame);
550550   EventList_Reset();
551   EventList_SetOffsetStartTime ( ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
551   EventList_SetOffsetStartTime ( cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
552552}
553553
554554
r3748r3749
571571      {
572572         pItem = EventList_GetFirstItem();
573573         EventList_Reset();
574         EventList_SetOffsetStartTime ( ATTOTIME_TO_CYCLES(0, attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
574         EventList_SetOffsetStartTime ( cpu_attotime_to_clocks(machine->cpu[0], attotime_mul(video_screen_get_scan_period(machine->primary_screen), video_screen_get_vpos(machine->primary_screen))) );
575575         logerror ("Event log reset in callback fn.\n");
576576      }
577577}
src/mess/messdriv.c
r3748r3749
4747//0128u5   DRIVER( a5200a )   /* Atari 5200 alt                           */
4848//0128u5   DRIVER( a7800 )      /* Atari 7800 NTSC                           */
4949//0128u5   DRIVER( a7800p )   /* Atari 7800 PAL                           */
50//0128u5   DRIVER( lynx )      /* Atari Lynx Handheld                        */
51//0128u5   DRIVER( lynx2 )      /* Atari Lynx II Handheld redesigned, no additions   */
50   DRIVER( lynx )      /* Atari Lynx Handheld                        */
51   DRIVER( lynx2 )      /* Atari Lynx II Handheld redesigned, no additions   */
5252//0128u5   DRIVER( jaguar )   /* Atari Jaguar                              */
5353//0128u5   DRIVER( atarist )   /* Atari ST                                 */
5454//0128u5   DRIVER( megast )   /* Atari Mega ST                           */
r3748r3749
168168//0128u5   DRIVER( sfzch )      /* CPS Changer (Street Fighter ZERO)            */
169169
170170   /* MAGNAVOX */
171//0128u5   DRIVER( odyssey2 )   /* Magnavox Odyssey 2 - 1978-1983               */
171   DRIVER( odyssey2 )   /* Magnavox Odyssey 2 - 1978-1983               */
172172
173173   /* Hartung, Watara, ...*/
174174//0128u5   DRIVER( gmaster )   /* Hartung Gamemaster                         */
r3748r3749
574574//0128u5   DRIVER( ep128 )      /* Enterprise 128 k                           */
575575
576576   /* NON LINEAR SYSTEMS */
577//0128u5   DRIVER( kaypro )   /* Kaypro 2X                              */
577   DRIVER( kaypro )   /* Kaypro 2X                              */
578578
579579   /* VEB MIKROELEKTRONIK */
580580   /* KC compact is partial CPC compatible */
src/mess/machine/pdp1.c
r3748r3749
11481148      if (parallel_drum.wc)
11491149         delay = attotime_add(delay, PARALLEL_DRUM_WORD_TIME);
11501150   } while (parallel_drum.wc);
1151   cpu_adjust_icount(Machine->cpu[0],-ATTOTIME_TO_CYCLES(0, delay));
1151   cpu_adjust_icount(Machine->cpu[0],-cpu_attotime_to_clocks(machine->cpu[0], delay));
11521152   /* if no error, skip */
11531153   cpu_set_reg(Machine->cpu[0], PDP1_PC, cpu_get_reg(Machine->cpu[0], PDP1_PC)+1);
11541154}
src/mess/machine/hp48.c
r3748r3749
12101210   state_save_register_global(machine,  hp48_bank_switch );
12111211   for ( i = 0; i < 6; i++ )
12121212   {
1213      state_save_register_item( "globals", NULL, i, hp48_modules[i].state );
1214      state_save_register_item( "globals", NULL, i, hp48_modules[i].base );
1215      state_save_register_item( "globals", NULL, i, hp48_modules[i].mask );
1213      state_save_register_item(machine, "globals", NULL, i, hp48_modules[i].state );
1214      state_save_register_item(machine, "globals", NULL, i, hp48_modules[i].base );
1215      state_save_register_item(machine, "globals", NULL, i, hp48_modules[i].mask );
12161216   }
12171217   state_save_register_global_array(machine,  hp48_io );
12181218   state_save_register_global_pointer(machine,  generic_nvram, generic_nvram_size );
src/mess/machine/mc6854.c
r3748r3749
975975   assert( mc6854 );
976976   mc6854->iface = iface;
977977   mc6854->ttimer = timer_alloc(machine,  mc6854_tfifo_cb , NULL);
978   state_save_register_item( "mc6854", NULL, 0, mc6854->cr1 );
979   state_save_register_item( "mc6854", NULL, 0, mc6854->cr2 );
980   state_save_register_item( "mc6854", NULL, 0, mc6854->cr3 );
981   state_save_register_item( "mc6854", NULL, 0, mc6854->cr4 );
982   state_save_register_item( "mc6854", NULL, 0, mc6854->sr1 );
983   state_save_register_item( "mc6854", NULL, 0, mc6854->sr2 );
984   state_save_register_item( "mc6854", NULL, 0, mc6854->cts );
985   state_save_register_item( "mc6854", NULL, 0, mc6854->dcd );
986   state_save_register_item( "mc6854", NULL, 0, mc6854->tstate );
978   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->cr1 );
979   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->cr2 );
980   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->cr3 );
981   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->cr4 );
982   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->sr1 );
983   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->sr2 );
984   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->cts );
985   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->dcd );
986   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->tstate );
987987   state_save_register_item_array( "mc6854", NULL, 0, mc6854->tfifo );
988   state_save_register_item( "mc6854", NULL, 0, mc6854->tones );
989   state_save_register_item( "mc6854", NULL, 0, mc6854->rstate );
990   state_save_register_item( "mc6854", NULL, 0, mc6854->rreg );
991   state_save_register_item( "mc6854", NULL, 0, mc6854->rones );
992   state_save_register_item( "mc6854", NULL, 0, mc6854->rsize );
988   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->tones );
989   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->rstate );
990   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->rreg );
991   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->rones );
992   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->rsize );
993993   state_save_register_item_array( "mc6854", NULL, 0, mc6854->rfifo );
994994   state_save_register_item_array( "mc6854", NULL, 0, mc6854->frame );
995   state_save_register_item( "mc6854", NULL, 0, mc6854->flen );
996   state_save_register_item( "mc6854", NULL, 0, mc6854->fpos );
995   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->flen );
996   state_save_register_item(machine, "mc6854", NULL, 0, mc6854->fpos );
997997   mc6854_reset();
998998}
src/mess/machine/mc6846.c
r3748r3749
570570   mc6846.interval = timer_alloc(machine,  mc6846_timer_expire , NULL);
571571   mc6846.one_shot = timer_alloc(machine,  mc6846_timer_one_shot , NULL);
572572
573   state_save_register_item( "mc6846", NULL, 0, mc6846.csr );
574   state_save_register_item( "mc6846", NULL, 0, mc6846.pcr );
575   state_save_register_item( "mc6846", NULL, 0, mc6846.ddr );
576   state_save_register_item( "mc6846", NULL, 0, mc6846.pdr );
577   state_save_register_item( "mc6846", NULL, 0, mc6846.tcr );
578   state_save_register_item( "mc6846", NULL, 0, mc6846.cp1 );
579   state_save_register_item( "mc6846", NULL, 0, mc6846.cp2 );
580   state_save_register_item( "mc6846", NULL, 0, mc6846.cp2_cpu );
581   state_save_register_item( "mc6846", NULL, 0, mc6846.cto );
582   state_save_register_item( "mc6846", NULL, 0, mc6846.time_MSB );
583   state_save_register_item( "mc6846", NULL, 0, mc6846.csr0_to_be_cleared );
584   state_save_register_item( "mc6846", NULL, 0, mc6846.csr1_to_be_cleared );
585   state_save_register_item( "mc6846", NULL, 0, mc6846.csr2_to_be_cleared );
586   state_save_register_item( "mc6846", NULL, 0, mc6846.latch );
587   state_save_register_item( "mc6846", NULL, 0, mc6846.preset );
588   state_save_register_item( "mc6846", NULL, 0, mc6846.timer_started );
573   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.csr );
574   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.pcr );
575   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.ddr );
576   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.pdr );
577   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.tcr );
578   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.cp1 );
579   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.cp2 );
580   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.cp2_cpu );
581   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.cto );
582   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.time_MSB );
583   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.csr0_to_be_cleared );
584   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.csr1_to_be_cleared );
585   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.csr2_to_be_cleared );
586   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.latch );
587   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.preset );
588   state_save_register_item(machine, "mc6846", NULL, 0, mc6846.timer_started );
589589
590590   mc6846_reset();
591591}
src/mess/machine/odyssey2.c
r3748r3749
129129{
130130   UINT8 data = p1;
131131
132   logerror("%.9f p1 read %.2x\n", attotime_to_double(timer_get_time(machine)), data);
132   logerror("%.9f p1 read %.2x\n", attotime_to_double(timer_get_time(space->machine)), data);
133133   return data;
134134}
135135
r3748r3749
141141
142142   odyssey2_lum_w ( space, 0, p1 >> 7 );
143143
144   logerror("%.6f p1 written %.2x\n", attotime_to_double(timer_get_time(machine)), data);
144   logerror("%.6f p1 written %.2x\n", attotime_to_double(timer_get_time(space->machine)), data);
145145}
146146
147147READ8_HANDLER( odyssey2_getp2 )
r3748r3749
175175    else
176176        p2 = p2 | 0xF0;
177177
178    logerror("%.6f p2 read %.2x\n", attotime_to_double(timer_get_time(machine)), p2);
178    logerror("%.6f p2 read %.2x\n", attotime_to_double(timer_get_time(space->machine)), p2);
179179    return p2;
180180}
181181
r3748r3749
183183{
184184    p2 = data;
185185
186    logerror("%.6f p2 written %.2x\n", attotime_to_double(timer_get_time(machine)), data);
186    logerror("%.6f p2 written %.2x\n", attotime_to_double(timer_get_time(space->machine)), data);
187187}
188188
189189READ8_HANDLER( odyssey2_getbus )
r3748r3749
196196    if ((p2 & P2_KEYBOARD_SELECT_MASK) == 0)
197197      data &= input_port_read(space->machine, "JOY1");       /* read joystick 2 */
198198
199    logerror("%.6f bus read %.2x\n", attotime_to_double(timer_get_time(machine)), data);
199    logerror("%.6f bus read %.2x\n", attotime_to_double(timer_get_time(space->machine)), data);
200200    return data;
201201}
202202
203203WRITE8_HANDLER( odyssey2_putbus )
204204{
205    logerror("%.6f bus written %.2x\n", attotime_to_double(timer_get_time(machine)), data);
205    logerror("%.6f bus written %.2x\n", attotime_to_double(timer_get_time(space->machine)), data);
206206}
207207
208208///////////////////////////////////
src/mess/machine/lynx.c
r3748r3749
767767
768768*/
769769
770static void lynx_blitter(void)
770static void lynx_blitter(running_machine *machine)
771771{
772772   static const int lynx_colors[4]={2,4,8,16};
773773
r3748r3749
10071007      case 0x92:   /* Better check this with docs! */
10081008         if (!attotime_compare(blitter.time, attotime_zero))
10091009         {
1010            if (ATTOTIME_TO_CYCLES(0, attotime_sub(timer_get_time(machine), blitter.time)) > blitter.memory_accesses * 20)
1010            if (cpu_attotime_to_clocks(space->machine->cpu[0], attotime_sub(timer_get_time(space->machine), blitter.time)) > blitter.memory_accesses * 20)
10111011            {
10121012               suzy.data[offset] &= ~0x01; //blitter finished
10131013               blitter.time = attotime_zero;
r3748r3749
11391139   case 0x91:
11401140      if (data & 0x01)
11411141      {
1142         blitter.time = timer_get_time(machine);
1143         lynx_blitter();
1142         blitter.time = timer_get_time(space->machine);
1143         lynx_blitter(space->machine);
11441144      }
11451145      break;
11461146//   case 0xb2: case 0xb3: /* Cart Bank 0 & 1 */
r3748r3749
13551355
13561356static TIMER_CALLBACK(lynx_timer_shot);
13571357
1358static void lynx_timer_init(int which)
1358static void lynx_timer_init(running_machine *machine, int which)
13591359{
13601360   memset( &lynx_timer[which], 0, sizeof(LYNX_TIMER) );
13611361   lynx_timer[which].timer = timer_alloc(machine,  lynx_timer_shot , NULL);
r3748r3749
15911591         {
15921592            uart.sending = TRUE;
15931593            uart.data_to_send = data;
1594            timer_set(machine, ATTOTIME_IN_USEC(11), NULL, 0, lynx_uart_timer);
1594            timer_set(space->machine, ATTOTIME_IN_USEC(11), NULL, 0, lynx_uart_timer);
15951595         }
15961596         break;
15971597   }
r3748r3749
18261826   lynx_uart_reset();
18271827
18281828   for (i = 0; i < NR_LYNX_TIMERS; i++)
1829      lynx_timer_init( i );
1829      lynx_timer_init(machine, i);
18301830
18311831   lynx_audio_reset();
18321832
src/mess/machine/geneve.c
r3748r3749
413413   if (! tms5220_ready_r())
414414   {
415415      attotime time_to_ready = double_to_attotime(tms5220_time_to_ready());
416      int cycles_to_ready = ceil(ATTOTIME_TO_CYCLES(0, time_to_ready));
416      int cycles_to_ready = ceil(cpu_attotime_to_clocks(machine->cpu[0], time_to_ready));
417417
418418      logerror("time to ready: %f -> %d\n", attotime_to_double(time_to_ready), (int) cycles_to_ready);
419419
src/mess/machine/mc6843.c
r3748r3749
795795   mc6843->iface = iface;
796796   mc6843->timer_cont = timer_alloc(machine,  mc6843_cont , NULL);
797797
798   state_save_register_item( "mc6843", NULL, 0, mc6843->CTAR );
799   state_save_register_item( "mc6843", NULL, 0, mc6843->CMR );
800   state_save_register_item( "mc6843", NULL, 0, mc6843->ISR );
801   state_save_register_item( "mc6843", NULL, 0, mc6843->SUR );
802   state_save_register_item( "mc6843", NULL, 0, mc6843->STRA );
803   state_save_register_item( "mc6843", NULL, 0, mc6843->STRB );
804   state_save_register_item( "mc6843", NULL, 0, mc6843->SAR );
805   state_save_register_item( "mc6843", NULL, 0, mc6843->GCR );
806   state_save_register_item( "mc6843", NULL, 0, mc6843->CCR );
807   state_save_register_item( "mc6843", NULL, 0, mc6843->LTAR );
808   state_save_register_item( "mc6843", NULL, 0, mc6843->drive );
809   state_save_register_item( "mc6843", NULL, 0, mc6843->side );
798   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->CTAR );
799   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->CMR );
800   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->ISR );
801   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->SUR );
802   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->STRA );
803   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->STRB );
804   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->SAR );
805   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->GCR );
806   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->CCR );
807   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->LTAR );
808   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->drive );
809   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->side );
810810   state_save_register_item_array( "mc6843", NULL, 0, mc6843->data );
811   state_save_register_item( "mc6843", NULL, 0, mc6843->data_size );
812   state_save_register_item( "mc6843", NULL, 0, mc6843->data_idx );
813   state_save_register_item( "mc6843", NULL, 0, mc6843->data_id );
814   state_save_register_item( "mc6843", NULL, 0, mc6843->index_pulse );
811   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->data_size );
812   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->data_idx );
813   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->data_id );
814   state_save_register_item(machine, "mc6843", NULL, 0, mc6843->index_pulse );
815815
816816   mc6843_reset(machine);
817817}
src/mess/machine/ti99_4x.c
r3748r3749
12831283   if (! tms5220_ready_r())
12841284   {
12851285      attotime time_to_ready = double_to_attotime(tms5220_time_to_ready());
1286      int cycles_to_ready = ceil(ATTOTIME_TO_CYCLES(0, time_to_ready));
1286      int cycles_to_ready = ceil(cpu_attotime_to_clocks(machine->cpu[0], time_to_ready));
12871287
12881288      logerror("time to ready: %f -> %d\n", attotime_to_double(time_to_ready), (int) cycles_to_ready);
12891289
r3748r3749
16441644               if (! tms5220_ready_r())
16451645               {
16461646                  attotime time_to_ready = double_to_attotime(tms5220_time_to_ready());
1647                  double d = ceil(ATTOTIME_TO_CYCLES(0, time_to_ready));
1647                  double d = ceil(cpu_attotime_to_clocks(machine->cpu[0], time_to_ready));
16481648                  int cycles_to_ready = ((int) (d + 3)) & ~3;
16491649
16501650                  logerror("time to ready: %f -> %d\n", attotime_to_double(time_to_ready)
src/mess/mess.mak
r3748r3749
397397   $(MESSOBJ)/cybiko.a \
398398   $(MESSOBJ)/dai.a \
399399   $(MESSOBJ)/shared.a \
400   $(MESSOBJ)/kaypro.a \
401   $(MESSOBJ)/kim1.a \
402   $(MESSOBJ)/lynx.a \
403   $(MESSOBJ)/magnavox.a \
404   $(MESSOBJ)/mbee.a \
400405
401406#   $(MESSOBJ)/amstrad.a \
402407#   $(MESSOBJ)/atari.a \
r3748r3749
418423#   $(MESSOBJ)/intv.a \
419424#   $(MESSOBJ)/irisha.a \
420425#   $(MESSOBJ)/jupiter.a \
421#   $(MESSOBJ)/kaypro.a \
422#   $(MESSOBJ)/kim1.a \
423426#   $(MESSOBJ)/kramermc.a \
424427#   $(MESSOBJ)/luxor.a \
425428#   $(MESSOBJ)/lviv.a \
426#   $(MESSOBJ)/lynx.a \
427#   $(MESSOBJ)/magnavox.a \
428#   $(MESSOBJ)/mbee.a \
429429#   $(MESSOBJ)/mc10.a \
430430#   $(MESSOBJ)/memotech.a \
431431#   $(MESSOBJ)/mephisto.a \
src/mess/drivers/kim1.c
r3748r3749
289289
290290static MACHINE_START( kim1 )
291291{
292   state_save_register_item( "kim1", NULL, 0, kim1_u2_port_b );
293   state_save_register_item( "kim1", NULL, 0, kim1_311_output );
294   state_save_register_item( "kim1", NULL, 0, kim1_cassette_high_count );
292   state_save_register_item(machine, "kim1", NULL, 0, kim1_u2_port_b );
293   state_save_register_item(machine, "kim1", NULL, 0, kim1_311_output );
294   state_save_register_item(machine, "kim1", NULL, 0, kim1_cassette_high_count );
295295}
296296
297297
src/mess/drivers/spectrum.c
r3748r3749
177177   if ((Changed & 0x07)!=0)
178178   {
179179      /* yes - send event */
180      EventList_AddItemOffset(space->machine, 0x0fe, data & 0x07, ATTOTIME_TO_CYCLES(0,attotime_mul(video_screen_get_scan_period(space->machine->primary_screen), video_screen_get_vpos(space->machine->primary_screen))));
180      EventList_AddItemOffset(space->machine, 0x0fe, data & 0x07, cpu_attotime_to_clocks(machine->cpu[0],attotime_mul(video_screen_get_scan_period(space->machine->primary_screen), video_screen_get_vpos(space->machine->primary_screen))));
181181   }
182182
183183   if ((Changed & (1<<4))!=0)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team