Previous 199869 Revisions Next

r37079 Wednesday 8th April, 2015 at 14:14:01 UTC by Zoë Blade
Tidy more whitespace
[nl_examples]breakout.c
[src/emu/machine]vrc4373.c
[src/emu/sound]es1373.c tms5220.c
[src/mame/machine]cps2crpt.c
[src/mame/video]m107.c m72.c mainsnk.c niyanpai.c portrait.c powerins.c stactics.c thepit.c tunhunt.c

trunk/nl_examples/breakout.c
r245590r245591
6464   CHIP("S2", DIPSWITCH, &dipswitch2_desc)
6565   CHIP("S3", DIPSWITCH, &dipswitch3_desc)
6666   CHIP("S4", DIPSWITCH, &dipswitch4_desc)
67       
67
6868    SOLVER(Solver, 48000)
6969    PARAM(Solver.ACCURACY, 1e-7) // works and is sufficient
7070    //CHIP("CLOCK", CLOCK_14_318_MHZ)
r245590r245591
8080   CHIP("C36", CAPACITOR, &c36_desc)
8181    CHIP("C37", CAPACITOR, &c37_desc)
8282    CHIP("PAD_EN_BUF", BUFFER, &pad_en_buf_desc)
83
83
8484   CHIP("A3", 7474)
8585   CHIP("A4", 7408)
8686   CHIP("A5", 7400)
r245590r245591
105105   CHIP("C7", 9316)
106106   CHIP("C8", 9316)
107107    CHIP("C9", 555_Mono, &c9_555_desc)
108   
108
109109   CHIP("D2", 7432)
110110   CHIP("D3", 7474)
111111   CHIP("D4", 9316)
r245590r245591
208208    CHIP("COIN1", COIN_INPUT)
209209
210210    //CHIP("COIN2", COIN_INPUT)
211   
211
212212    CHIP("START", START_INPUT)
213213
214214    CHIP("SERVE", BUTTONS1_INPUT)
215   
215
216216    //TODO: coin2 and start 2
217217
218218    VIDEO(breakout)
r245590r245591
256256   #define H64      "K2", 3
257257   #define H128      "K2", 6
258258
259   //#define V1     
259   //#define V1
260260   #define V2      "M3", 3
261261   #define V4      "M3", 6
262262   #define V8      "M3", 11
r245590r245591
274274   #define BSYNC     "J1", 15
275275   #define BSYNC_n     "J1", 14
276276
277   #define BALL    "D7", 6
277   #define BALL    "D7", 6
278278   #define BALL_DISPLAY "A4", 6
279   #define PLAYFIELD    "H4", 3
280   #define SCORE    "D3", 5 
279   #define PLAYFIELD    "H4", 3
280   #define SCORE    "D3", 5
281281   #define VERT_TRIG_n    "H1", 8
282282
283283   #define CLOCK    "H1", 11
r245590r245591
292292
293293   #define COIN       "L9", 6
294294   #define COIN1_n       "F8", 5
295   #define COIN2_n       "H9", 5   
295   #define COIN2_n       "H9", 5
296296   #define CREDIT_1_OR_2    "L9", 3
297297   #define CREDIT_1_OR_2_n    "F9", 8
298298   #define CREDIT2       "F9", 6
r245590r245591
306306
307307   #define P2_CONDITIONAL   "H1", 3
308308   #define P2_CONDITIONAL_dash    "H7", 8
309   #define PLAYER_2       "B4", 14
309   #define PLAYER_2       "B4", 14
310310   #define PLAYER_2_n       "M9", 8
311311
312312   #define START_GAME       "D8", 6
r245590r245591
317317   #define BG1       "K8", 8
318318   #define BG2_n   "K8", 5
319319   #define BG2      "K8", 6
320
320
321321   #define FREE_GAME_TONE   "N7", 3
322322   #define BONUS_COIN      "L9", 11
323
323
324324   //#define Q        "E9", 6
325325   #define LAT_Q   "E9", 6
326326   #define Q_n       "LATCH", 3
327327   #define SBD_n    "D2", 11
328328
329329   #define PLAY_CP    "D2", 8
330   #define PLGM2_n    "F7", 7   
330   #define PLGM2_n    "F7", 7
331331   #define VB_HIT_n    "A5", 6
332332
333333   #define SERVE_n    "SERVE", 1
334334   #define SERVE_WAIT    "A3", 9
335   #define SERVE_WAIT_n "A3", 8   
335   #define SERVE_WAIT_n "A3", 8
336336
337   #define BRICK_DISPLAY    "E3", 1   
337   #define BRICK_DISPLAY    "E3", 1
338338   #define BRICK_HIT       "E6", 5
339339   #define BRICK_HIT_n       "E6", 6
340340
r245590r245591
401401   #define FPD1_n    "F3", 9
402402   #define FPD2    "F3", 6
403403   #define FPD2_n    "F3", 7
404
404
405405   #define COUNT    "N7", 11
406406   #define COUNT_1    "N7", 8
407407   #define COUNT_2    "N7", 6
408408
409409   #define ATTRACT    "E6", 8
410410   #define ATTRACT_n    "E6", 9
411   
411
412412   #define BRICK_SOUND    "B8", 14
413413   #define P_HIT_SOUND    "B7", 12
414414   #define VB_HIT_SOUND "B7", 11
r245590r245591
416416   #define LH_SIDE    "J3", 13
417417   #define RH_SIDE    "H2", 3
418418   #define TOP_BOUND    "K4", 6
419   
419
420420//   CONNECTION(CREDIT_1_OR_2, "CREDIT_LIGHT1", 1)
421421//   CONNECTION(CREDIT2, "CREDIT_LIGHT2", 1)
422422//   CONNECTION(SERVE_WAIT_n, "SERVE_LIGHT", 1)
r245590r245591
540540   CONNECTION(P2_CONDITIONAL, "M2", 7)
541541   CONNECTION(GND, "M2", 4)
542542   CONNECTION(GND, "M2", 16)
543   
543
544544   CONNECTION("M2", 14, "N2", 13)
545545   CONNECTION(V16_d, "N2", 10)
546546   CONNECTION(V32_d, "N2", 8)
r245590r245591
608608   CONNECTION(P, "K1", 10)
609609   CONNECTION(CLOCK, "K1", 2)
610610   CONNECTION("L1", 15, "K1", 7)
611
611
612612   CONNECTION(P, "L1", 1)
613613   CONNECTION(P, "L1", 3)
614614   CONNECTION(GND, "L1", 4)
r245590r245591
631631
632632   CONNECTION("M1", 15, "H2", 5)
633633   CONNECTION("L1", 15, "H2", 4)
634   
634
635635   CONNECTION(V128_d, "N4", 5)
636636   CONNECTION(V64_d, "N4", 3)
637637   CONNECTION(V32_d, "N4", 4)
r245590r245591
648648   CONNECTION("L1", 15, "M1", 7)
649649   CONNECTION("K1", 15, "M1", 10)
650650
651
651
652652   //9312 circuit
653653   CONNECTION(PLAYER_2, "M9", 9)
654654   CONNECTION(BALL_A, "C5", 5)
r245590r245591
758758
759759   //PADDLES
760760   CONNECTION(ATTRACT_n, "B2", 4)
761   
761
762762   CONNECTION("B2", 3, "E9", 13)
763763   CONNECTION(PLAYER_2_n, "M3", 9)
764764   CONNECTION(V128, "M3", 10)
r245590r245591
810810   CONNECTION(P, "D4", 10)
811811   CONNECTION("C3", 11, "D4", 7)
812812   CONNECTION(VSYNC_n, "D4", 1)
813   
813
814814   CONNECTION("D4", 15, "E4", 10)
815815   CONNECTION("H7", 6, "E4", 9)
816816   CONNECTION("C9", 3, "H7", 5)
r245590r245591
839839   CONNECTION(V32_d, "J2", 9)
840840   CONNECTION("J2", 8, "C2", 10)
841841   CONNECTION("C2", 6, "C2", 9)
842   
843842
843
844844   //SCORE
845845   CONNECTION(SCI_n, "D3", 4)
846846   CONNECTION(GND, "D3", 2)
847847   CONNECTION(GND, "D3", 3)
848848   CONNECTION(GND, "D3", 1)
849
849
850850   //PLAYER2_CONDITIONAL
851851   CONNECTION(PLAYER_2, "H7", 10)
852852   CONNECTION(GND, "S2", 1)
r245590r245591
874874   CONNECTION(PLAYER_2, "M6", 7)
875875   CONNECTION(COUNT_2, "M6", 2)
876876   CONNECTION(START_GAME_n, "M6", 1)
877   
877
878878   CONNECTION("M6", 15, "L6", 10)
879879   CONNECTION(PLAYER_2, "L6", 7)
880880   CONNECTION(COUNT_2, "L6", 2)
r245590r245591
884884   CONNECTION(RAM_PLAYER1, "H6", 7)
885885   CONNECTION(COUNT_1, "H6", 2)
886886   CONNECTION(START_GAME_n, "H6", 1)
887   
887
888888   CONNECTION("H6", 15, "J6", 10)
889889   CONNECTION(RAM_PLAYER1, "J6", 7)
890890   CONNECTION(COUNT_1, "J6", 2)
r245590r245591
917917   CONNECTION("N8", 9, "N9", 11)
918918   CONNECTION(P, "N9", 15)
919919   CONNECTION(P, "N9", 5)
920   
920
921921   CONNECTION(COUNT, "N9", 4)
922922   CONNECTION(START_GAME, "N9", 14)
923923   CONNECTION(H8_n, "N9", 1)
r245590r245591
991991   CONNECTION(CKBH, "H1", 12)
992992   CONNECTION("F1", 14, "H1", 13)
993993   CONNECTION("F1", 15, "E1", 5)
994   
994
995995   CONNECTION(P, "F1", 1)
996996   CONNECTION(P, "F1", 7)
997997   CONNECTION(P, "F1", 10)
r245590r245591
10291029
10301030   // Coin Circuit
10311031   CONNECTION("COIN1", 1, "F9", 13)
1032   
1032
10331033   CONNECTION(CSW1, "F9", 11)
10341034   //CONNECTION("F9", 10, "F9", 13) //TODO: causes lots of bouncing, commented out since this trace is not implemented in gotcha
10351035
r245590r245591
10441044   CONNECTION(V64I, "F8", 3)
10451045   CONNECTION("F8", 9, "F8", 2)
10461046   CONNECTION(CSW1, "F8", 4)
1047 
1047
10481048   CONNECTION("F8", 6, "H8", 12)
10491049   CONNECTION(P, "H8", 10)
10501050   CONNECTION(V16_d, "H8", 11)
r245590r245591
10631063   //COIN2 circuit
10641064   //CONNECTION("COIN2", 1, "F9", 1)
10651065   CONNECTION(GND, "F9", 1)      //TODO: coin2 not implemented
1066
1066
10671067   CONNECTION(CSW2, "F9", 3)
10681068   CONNECTION(CSW2, "H9", 10)
10691069   CONNECTION("F9", 4, "H9", 12)
r245590r245591
10731073   CONNECTION("H9", 9, "H9", 2)
10741074   CONNECTION(CSW2, "H9", 4)
10751075   CONNECTION(P, "H9", 1)
1076   
1076
10771077   CONNECTION(P, "H8", 4)
10781078   CONNECTION("H9", 6, "H8", 2)
10791079   CONNECTION(V16_d, "H8", 3)
r245590r245591
11791179   CONNECTION(P, "D3", 12)
11801180   CONNECTION(START_GAME, "D3", 11)
11811181   CONNECTION(SERVE_n, "D3", 13)
1182     
1182
11831183   //Playfield
11841184   CONNECTION(LH_SIDE, "H3", 1)
11851185   CONNECTION(TOP_BOUND, "H3", 13)
r245590r245591
11871187   CONNECTION("H3", 12, "H4", 2)
11881188   CONNECTION("E1", 2, "C36", 1)
11891189   CONNECTION("C36", 2, "H4", 1)
1190   
1190
11911191   CONNECTION(BALL_DISPLAY, "A5", 10)
11921192   CONNECTION(PSYNC, "A5", 9)
11931193   CONNECTION(BSYNC, "C3", 2)
r245590r245591
12001200   CONNECTION("C5", 12, "A5", 2)
12011201   CONNECTION(BSYNC, "A5", 5)
12021202   CONNECTION(VSYNC, "A5", 4)
1203 
1203
12041204   CONNECTION("C5", 12, "A5", 13)
12051205   CONNECTION("A5", 3, "A5", 12)
12061206
r245590r245591
12131213   CONNECTION("C4", 6, "A6", 12)
12141214   CONNECTION(BP_HIT_n, "A6", 11)
12151215   CONNECTION(P, "A6", 13)
1216   
1216
12171217   CONNECTION("A5", 3, "A6", 4)
12181218   CONNECTION(V16_d, "A6", 2)
12191219   CONNECTION(VB_HIT_n, "A6", 3)
r245590r245591
12411241
12421242   CONNECTION("B5", 6, "C5", 11)
12431243   CONNECTION("B5", 7, "C5", 9)
1244
1244
12451245   CONNECTION(SU_n, "B5", 11)
12461246   CONNECTION(P, "B5", 15)
12471247   CONNECTION(P, "B5", 1)
r245590r245591
13261326   CONNECTION(P, "F4", 2)
13271327   CONNECTION("E4", 3, "F4", 3)
13281328   CONNECTION(START_GAME1_n, "F4", 1)
1329
1329
13301330   CONNECTION(P, "F4", 10)
13311331   CONNECTION(P, "F4", 12)
13321332   CONNECTION("E4", 6, "F4", 11)
r245590r245591
13391339
13401340   CONNECTION(P, "F3", 3)
13411341   CONNECTION(P, "F3", 13)
1342 
1343 
1342
1343
13441344   //CREDIT_COUNTER
13451345   CONNECTION(BONUS_COIN, "E7", 8)
13461346   CONNECTION(COIN, "E7", 9)
r245590r245591
13641364   CONNECTION("L8", 6, "M8", 10)
13651365   CONNECTION("L8", 2, "M8", 11)
13661366   CONNECTION("L8", 3, "M9", 13)
1367 
1367
13681368   CONNECTION(CREDIT2_n, "F9", 5)
13691369   CONNECTION(CREDIT2_n, "L9", 2)
13701370   CONNECTION("M9", 12, "L9", 1)
r245590r245591
14021402   CONNECTION(BALL_C, "S4", 2)
14031403   CONNECTION("S4", 3, "A4", 1)
14041404   CONNECTION("A4", 3, "C37", 1)
1405   
1405
14061406   CONNECTION(SERVE_WAIT_n, "A4", 5)
14071407   CONNECTION(BALL, "A4", 4)
14081408
1409   // Ball Circuit   
1409   // Ball Circuit
14101410
14111411
14121412   // Video Summing
r245590r245591
14281428
14291429   CONNECTION("VIDEO", Video::HBLANK_PIN, HSYNC)
14301430   CONNECTION("VIDEO", Video::VBLANK_PIN, "E3", 10)
1431   
14321431
1432
14331433   // Audio Summing
14341434   CONNECTION("AUDIO", 1, "B9", 11)
14351435   CONNECTION("AUDIO", 2, "B9", 8)
trunk/src/emu/machine/vrc4373.c
r245590r245591
263263      m_cpu_regs[NREG_DMA_CPAR] += 0x4;
264264      m_cpu_regs[NREG_DMA_REM]--;
265265   }
266}   
266}
267267// CPU I/F
268268READ32_MEMBER (vrc4373_device::cpu_if_r)
269269{
r245590r245591
347347      case NREG_DMACR1:
348348      case NREG_DMACR2:
349349         // Start when DMA_GO bit is set
350         if (!(oldData & DMA_GO) && (data & DMA_GO)) {           
350         if (!(oldData & DMA_GO) && (data & DMA_GO)) {
351351            int which = (offset-NREG_DMACR1)>>3;
352352            // Check to see DMA is not already started
353353            if (!(data&DMA_BUSY)) {
354354               // Set counts and address
355355               m_cpu_regs[NREG_DMA_CPAR] = m_cpu_regs[NREG_DMAPCI1+which*0xC];
356               m_cpu_regs[NREG_DMA_CMAR] = m_cpu_regs[NREG_DMAMAR1+which*0xC];               
356               m_cpu_regs[NREG_DMA_CMAR] = m_cpu_regs[NREG_DMAMAR1+which*0xC];
357357               m_cpu_regs[NREG_DMA_REM] = (data & DMA_BLK_SIZE)>>2;
358358               m_cpu_regs[NREG_DMACR1+which*0xc] |= DMA_BUSY;
359359               // Start the transfer
trunk/src/emu/sound/es1373.c
r245590r245591
9494      // The initalized is to signal that inital buffer has been written
9595      if (m_dac2.buf_count<=m_dac2.buf_size && m_dac2.initialized) {
9696         // Send data to sound???
97         // sound = m_sound_cache[chan.buf_rptr]
98         if (0 && LOG_ES)
99            logerror("%X: DAC2 buf_count: %i buf_size: %X buf_rptr: %X buf_wptr: %X\n", machine().device("maincpu")->safe_pc(),
97         // sound = m_sound_cache[chan.buf_rptr]
98         if (0 && LOG_ES)
99            logerror("%X: DAC2 buf_count: %i buf_size: %X buf_rptr: %X buf_wptr: %X\n", machine().device("maincpu")->safe_pc(),
100100               m_dac2.buf_count, m_dac2.buf_size, m_dac2.buf_rptr, m_dac2.buf_wptr);
101101         if (m_dac2.buf_count==m_dac2.buf_size) {
102102            if (m_dac2.int_en) {
r245590r245591
122122   }
123123   if (m_adc.enable) {
124124      if (m_adc.buf_count<=m_adc.buf_size) {
125         if (LOG_ES)
126            logerror("%s: ADC buf_count: %i buf_size: %i buf_rptr: %i buf_wptr: %i\n", machine().describe_context(),
125         if (LOG_ES)
126            logerror("%s: ADC buf_count: %i buf_size: %i buf_rptr: %i buf_wptr: %i\n", machine().describe_context(),
127127               m_adc.buf_count, m_adc.buf_size, m_adc.buf_rptr, m_adc.buf_wptr);
128128         if (m_adc.int_en && m_adc.buf_count==m_adc.buf_size) {
129129            m_es_regs[ES_INT_CS_STATUS] |= ICSTATUS_ADC_INT_MASK;
trunk/src/emu/sound/tms5220.c
r245590r245591
406406   save_item(NAME(m_digital_select));
407407
408408   save_item(NAME(m_io_ready));
409   
409
410410   save_item(NAME(m_true_timing));
411411
412412   save_item(NAME(m_rs_ws));
trunk/src/mame/machine/cps2crpt.c
r245590r245591
899899   { "sfz2alj",  { 0x99450c88,0xa00a2c4d }, 0x100000 },    // 0C80 8E73 9110  cmpi.l  #$8E739110,D0
900900   { "sfz2alh",  { 0x95f15b7c,0x200c08c6 }, 0x100000 },    // 0C80 8E73 9110  cmpi.l  #$8E739110,D0
901901   { "sfz2alb",  { 0x73cd4a28,0xff83af1c }, 0x100000 },    // 0C80 8E73 9110  cmpi.l  #$8E739110,D0
902   { "spf2t",    { 0xdde26f09,0x55821ee7 }, 0x040000 },    // 0C80 3039 9819  cmpi.l  #$30399819,D0   
902   { "spf2t",    { 0xdde26f09,0x55821ee7 }, 0x040000 },    // 0C80 3039 9819  cmpi.l  #$30399819,D0
903903   { "spf2tu",   { 0x706a8750,0x7d0fc185 }, 0x040000 },    // 0C80 3039 9819  cmpi.l  #$30399819,D0
904904   { "spf2xj",   { 0xb12c835a,0xe90976ff }, 0x040000 },    // 0C80 3039 9819  cmpi.l  #$30399819,D0
905905   { "spf2ta",   { 0x9c48e1ab,0xd60f34fb }, 0x040000 },    // 0C80 3039 9819  cmpi.l  #$30399819,D0
trunk/src/mame/video/m107.c
r245590r245591
141141   }
142142
143143   m_buffered_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x1000/2);
144   
144
145145   save_item(NAME(m_sprite_display));
146146   save_item(NAME(m_raster_irq_position));
147147   save_item(NAME(m_control));
148148   save_pointer(NAME(m_buffered_spriteram), 0x1000/2);
149   
149
150150   for (int i = 0; i < 4; i++)
151151   {
152152      save_item(NAME(m_pf_layer[i].vram_base), i);
trunk/src/mame/video/m72.c
r245590r245591
178178   m_bg_tilemap->set_scrolldx(6,0);
179179   m_fg_tilemap->set_scrolldy(-128,-128);
180180   m_bg_tilemap->set_scrolldy(-128,-128);
181   
181
182182   save_item(NAME(m_prev));
183183   save_item(NAME(m_diff));
184184}
trunk/src/mame/video/mainsnk.c
r245590r245591
7676
7777   m_bg_tilemap->set_scrolldx(16, 16);
7878   m_bg_tilemap->set_scrolldy(8,  8);
79   
79
8080   save_item(NAME(m_bg_tile_offset));
8181}
8282
trunk/src/mame/video/niyanpai.c
r245590r245591
371371   m_clut[2] = auto_alloc_array(machine(), UINT8, 0x1000);
372372   m_nb19010_busyflag = 1;
373373   m_blitter_timer = timer_alloc(TIMER_BLITTER);
374   
374
375375   save_item(NAME(m_scrollx));
376376   save_item(NAME(m_scrolly));
377377   save_item(NAME(m_blitter_destx));
trunk/src/mame/video/portrait.c
r245590r245591
6868   m_foreground = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(portrait_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32 );
6969
7070   m_foreground->set_transparent_pen(7);
71   
71
7272   save_item(NAME(m_scroll));
7373}
7474
trunk/src/mame/video/powerins.c
r245590r245591
168168   m_tilemap_1->set_scroll_rows(1);
169169   m_tilemap_1->set_scroll_cols(1);
170170   m_tilemap_1->set_transparent_pen(15);
171   
171
172172   save_item(NAME(m_tile_bank));
173173}
174174
trunk/src/mame/video/stactics.c
r245590r245591
363363   m_shot_arrive = 0;
364364   m_beam_state = 0;
365365   m_old_beam_state = 0;
366   
366
367367   save_item(NAME(m_y_scroll_d));
368368   save_item(NAME(m_y_scroll_e));
369369   save_item(NAME(m_y_scroll_f));
trunk/src/mame/video/thepit.c
r245590r245591
136136   m_dummy_tile = auto_alloc_array_clear(machine(), UINT8, 8*8);
137137
138138   m_graphics_bank = 0;    /* only used in intrepid */
139   
139
140140   save_item(NAME(m_graphics_bank));
141141   save_item(NAME(m_flip_x));
142142   save_item(NAME(m_flip_y));
trunk/src/mame/video/tunhunt.c
r245590r245591
7878
7979   m_fg_tilemap->set_transparent_pen(0);
8080   m_fg_tilemap->set_scrollx(0, 64);
81   
81
8282   save_item(NAME(m_control));
8383}
8484

https://github.com/mamedev/mame/commit/1e5c5c9faed6142d473dbee5f2cb0b0060bd5b66

Previous 199869 Revisions Next

© 1997-2024 The MAME Team