Skip to content

Commit f08276d

Browse files
author
mamedev
committed
MAME 0.113
1 parent bbdb3b7 commit f08276d

File tree

160 files changed

+6987
-2914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+6987
-2914
lines changed

‎makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,9 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
417417
@echo Compiling $<...
418418
$(CC) $(CDEFS) $(CFLAGS) -S $< -o $@
419419

420-
$(OBJ)/%.lh: $(SRC)/%.lay file2str$(EXE)
420+
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR)
421421
@echo Converting $<...
422-
@file2str$(EXE) $< $@ layout_$(basename $(notdir $<))
422+
@$(FILE2STR) $< $@ layout_$(basename $(notdir $<))
423423

424424
$(OBJ)/%.a:
425425
@echo Archiving $@...

‎src/emu/cpu/tms34010/tms34010.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ static void set_raster_op(void)
10291029

10301030
INLINE int scanline_to_vcount(int scanline)
10311031
{
1032-
if (Machine->screen[0].visarea.min_y == 0)
1032+
if (Machine->screen[state.config->scrnum].visarea.min_y == 0)
10331033
scanline += SMART_IOREG(VEBLNK);
10341034
if (scanline > SMART_IOREG(VTOTAL))
10351035
scanline -= SMART_IOREG(VTOTAL);
@@ -1039,7 +1039,7 @@ INLINE int scanline_to_vcount(int scanline)
10391039

10401040
INLINE int vcount_to_scanline(int vcount)
10411041
{
1042-
if (Machine->screen[0].visarea.min_y == 0)
1042+
if (Machine->screen[state.config->scrnum].visarea.min_y == 0)
10431043
vcount -= SMART_IOREG(VEBLNK);
10441044
if (vcount < 0)
10451045
vcount += SMART_IOREG(VTOTAL);
@@ -1085,7 +1085,7 @@ static void update_display_address(int vcount)
10851085

10861086
static void vsblnk_callback(int cpunum)
10871087
{
1088-
double interval = TIME_IN_HZ(Machine->screen[0].refresh);
1088+
double interval = TIME_IN_HZ(Machine->screen[state.config->scrnum].refresh);
10891089

10901090
/* reset timer for next frame before going into the CPU context */
10911091
timer_adjust(vsblnk_timer[cpunum], interval, cpunum, 0);
@@ -1101,7 +1101,7 @@ static void vsblnk_callback(int cpunum)
11011101

11021102
static void dpyint_callback(int cpunum)
11031103
{
1104-
double interval = TIME_IN_HZ(Machine->screen[0].refresh);
1104+
double interval = TIME_IN_HZ(Machine->screen[state.config->scrnum].refresh);
11051105

11061106
logerror("-- dpyint(%d) @ %d --\n", cpunum, cpu_getscanline());
11071107

@@ -1527,9 +1527,9 @@ READ16_HANDLER( tms34010_io_register_r )
15271527

15281528
case REG_HCOUNT:
15291529
/* scale the horizontal position from screen width to HTOTAL */
1530-
result = cpu_gethorzbeampos();
1530+
result = video_screen_get_hpos(state.config->scrnum);
15311531
total = IOREG(REG_HTOTAL);
1532-
result = result * total / Machine->screen[0].width;
1532+
result = result * total / Machine->screen[state.config->scrnum].width;
15331533

15341534
/* offset by the HBLANK end */
15351535
result += IOREG(REG_HEBLNK);
@@ -1576,9 +1576,9 @@ READ16_HANDLER( tms34020_io_register_r )
15761576

15771577
case REG020_HCOUNT:
15781578
/* scale the horizontal position from screen width to HTOTAL */
1579-
result = cpu_gethorzbeampos();
1579+
result = video_screen_get_hpos(state.config->scrnum);
15801580
total = IOREG(REG020_HTOTAL);
1581-
result = result * total / Machine->screen[0].width;
1581+
result = result * total / Machine->screen[state.config->scrnum].width;
15821582

15831583
/* offset by the HBLANK end */
15841584
result += IOREG(REG020_HEBLNK);

‎src/emu/cpu/tms34010/tms34010.h

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ struct tms34010_config
6666
void (*from_shiftreg)(offs_t, UINT16 *);/* shift register read */
6767
void (*display_addr_changed)(UINT32 offs, int rowbytes, int scanline);/* display address changed */
6868
void (*display_int_callback)(int scanline);/* display interrupt callback */
69+
UINT8 scrnum; /* the screen operated on */
6970
};
7071

7172

‎src/emu/cpu/z80gb/opc_main.h

-10
Original file line numberDiff line numberDiff line change
@@ -770,19 +770,9 @@ case 0x75: /* LD (HL),L */
770770
mem_WriteByte (Regs.w.HL, Regs.b.L);
771771
break;
772772
case 0x76: /* HALT */
773-
if ( Regs.w.leavingHALT ) {
774-
Regs.w.leavingHALT--;
775-
} else {
776773
CheckInterrupts = 1;
777774
Regs.w.enable |= HALTED;
778775
Regs.w.PC--;
779-
if ( ! Regs.w.enable & IME ) {
780-
/* check for pending interrupts to perform the HALT bug */
781-
if ( Regs.w.IE & Regs.w.IF ) {
782-
Regs.w.doHALTbug = 1;
783-
}
784-
}
785-
}
786776
break;
787777
case 0x77: /* LD (HL),A */
788778

‎src/emu/cpu/z80gb/z80gb.c

+11-3
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ typedef struct {
5656
int gb_speed;
5757
int gb_speed_change_pending;
5858
int enable;
59-
int leavingHALT;
6059
int doHALTbug;
60+
UINT8 features;
6161
const Z80GB_CONFIG *config;
6262
} z80gb_16BitRegs;
6363

@@ -181,6 +181,7 @@ static void z80gb_reset(void)
181181
Regs.w.SP = 0x0000;
182182
Regs.w.PC = 0x0000;
183183
Regs.w.timer_callback = NULL;
184+
Regs.w.features = Z80GB_FEATURE_HALT_BUG;
184185
if (Regs.w.config)
185186
{
186187
if ( Regs.w.config->regs ) {
@@ -192,13 +193,13 @@ static void z80gb_reset(void)
192193
Regs.w.PC = Regs.w.config->regs[5];
193194
}
194195
Regs.w.timer_callback = Regs.w.config->timer_callback;
196+
Regs.w.features = Regs.w.config->features;
195197
}
196198
Regs.w.enable &= ~IME;
197199
Regs.w.IE = 0;
198200
Regs.w.IF = 0;
199201

200202
CheckInterrupts = 0;
201-
Regs.w.leavingHALT = 0;
202203
Regs.w.doHALTbug = 0;
203204
Regs.w.ei_delay = 0;
204205
Regs.w.gb_speed_change_pending = 0;
@@ -237,7 +238,14 @@ INLINE void z80gb_ProcessInterrupts (void)
237238
if (Regs.w.enable & HALTED)
238239
{
239240
Regs.w.enable &= ~HALTED;
240-
Regs.w.leavingHALT++;
241+
Regs.w.IF &= ~(1 << irqline);
242+
Regs.w.PC++;
243+
if ( ! Regs.w.enable & IME ) {
244+
/* check if the HALT bug should be performed */
245+
if ( Regs.w.features & Z80GB_FEATURE_HALT_BUG ) {
246+
Regs.w.doHALTbug = 1;
247+
}
248+
}
241249
}
242250
if ( Regs.w.enable & IME ) {
243251
if ( Regs.w.irq_callback )

‎src/emu/cpu/z80gb/z80gb.h

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ extern int z80gb_ICount;
77

88
typedef struct {
99
UINT16 *regs;
10+
UINT8 features;
1011
void (*timer_callback)(int cycles);
1112
} Z80GB_CONFIG;
1213

@@ -19,6 +20,8 @@ enum {
1920
Z80GB_SPEED,
2021
};
2122

23+
#define Z80GB_FEATURE_HALT_BUG 0x01
24+
2225
/****************************************************************************/
2326
/* Return register contents */
2427
/****************************************************************************/

‎src/emu/cpuexec.c

-54
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ struct _cpuexec_data
9999
INT32 vblankint_countdown; /* number of vblank callbacks left until we interrupt */
100100
INT32 vblankint_multiplier; /* number of vblank callbacks per interrupt */
101101
void * vblankint_timer; /* reference to elapsed time counter */
102-
mame_time vblankint_period; /* timing period of the VBLANK interrupt */
103102

104103
void * timedint_timer; /* reference to this CPU's timer */
105104
mame_time timedint_period; /* timing period of the timed interrupt */
@@ -796,21 +795,6 @@ int cycles_currently_ran(void)
796795

797796

798797

799-
/*************************************
800-
*
801-
* Return cycles remaining in this
802-
* iteration
803-
*
804-
*************************************/
805-
806-
int cycles_left_to_run(void)
807-
{
808-
VERIFY_EXECUTINGCPU(cycles_left_to_run);
809-
return activecpu_get_icount();
810-
}
811-
812-
813-
814798
/*************************************
815799
*
816800
* Return total number of CPU cycles
@@ -871,25 +855,6 @@ UINT64 cpunum_gettotalcycles64(int cpunum)
871855

872856

873857

874-
/*************************************
875-
*
876-
* Return cycles until next interrupt
877-
* handler call
878-
*
879-
*************************************/
880-
881-
int activecpu_geticount(void)
882-
{
883-
int result;
884-
885-
/* remove me - only used by mamedbg, m92 */
886-
VERIFY_EXECUTINGCPU(cpu_geticount);
887-
result = MAME_TIME_TO_CYCLES(activecpu, sub_mame_times(cpu[activecpu].vblankint_period, mame_timer_timeelapsed(cpu[activecpu].vblankint_timer)));
888-
return (result < 0) ? 0 : result;
889-
}
890-
891-
892-
893858
/*************************************
894859
*
895860
* Safely eats cycles so we don't
@@ -1054,24 +1019,6 @@ double cpu_getscanlineperiod(void)
10541019

10551020

10561021

1057-
/*************************************
1058-
*
1059-
* Returns a crude approximation
1060-
* of the horizontal position of the
1061-
* bream
1062-
*
1063-
*************************************/
1064-
1065-
int cpu_gethorzbeampos(void)
1066-
{
1067-
mame_time elapsed_time = mame_timer_timeelapsed(refresh_timer);
1068-
int scanline = elapsed_time.subseconds / scanline_period.subseconds;
1069-
mame_time time_since_scanline = sub_subseconds_from_mame_time(elapsed_time, scanline * scanline_period.subseconds);
1070-
return time_since_scanline.subseconds * Machine->screen[0].width / scanline_period.subseconds;
1071-
}
1072-
1073-
1074-
10751022
/*************************************
10761023
*
10771024
* Returns the VBLANK state
@@ -1631,7 +1578,6 @@ static void cpu_inittimers(void)
16311578
/* compute the average number of cycles per interrupt */
16321579
if (ipf <= 0)
16331580
ipf = 1;
1634-
cpu[cpunum].vblankint_period = double_to_mame_time(1.0 / (Machine->screen[0].refresh * ipf));
16351581
cpu[cpunum].vblankint_timer = mame_timer_alloc(NULL);
16361582

16371583
/* see if we need to allocate a CPU timer */

‎src/emu/cpuexec.h

-9
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ void cpu_boost_interleave(double timeslice_time, double boost_duration);
148148
/* Returns the number of cycles run so far this timeslice */
149149
int cycles_currently_ran(void);
150150

151-
/* Returns the number of cycles left to run in this timeslice */
152-
int cycles_left_to_run(void);
153-
154151
/* Returns the total number of CPU cycles */
155152
UINT32 activecpu_gettotalcycles(void);
156153
UINT64 activecpu_gettotalcycles64(void);
@@ -159,9 +156,6 @@ UINT64 activecpu_gettotalcycles64(void);
159156
UINT32 cpunum_gettotalcycles(int cpunum);
160157
UINT64 cpunum_gettotalcycles64(int cpunum);
161158

162-
/* Returns the number of CPU cycles before the next interrupt handler call */
163-
int activecpu_geticount(void);
164-
165159
/* Safely eats cycles so we don't cross a timeslice boundary */
166160
void activecpu_eat_cycles(int cycles);
167161

@@ -198,9 +192,6 @@ double cpu_getscanlinetime(int scanline);
198192
mame_time cpu_getscanlineperiod_mt(void);
199193
double cpu_getscanlineperiod(void);
200194

201-
/* Returns the current horizontal beam position in pixels */
202-
int cpu_gethorzbeampos(void);
203-
204195
/* Returns the current VBLANK state */
205196
int cpu_getvblank(void);
206197

‎src/emu/debug/debugcpu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ static UINT64 get_logunmap(UINT32 ref)
638638

639639
static UINT64 get_beamx(UINT32 ref)
640640
{
641-
return cpu_gethorzbeampos();
641+
return video_screen_get_hpos(0);
642642
}
643643

644644

‎src/emu/debug/debugvw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ static void registers_update(debug_view *view)
11181118
break;
11191119

11201120
case MAX_REGS + 2:
1121-
sprintf(dummy, "beamx:%3d", cpu_gethorzbeampos());
1121+
sprintf(dummy, "beamx:%3d", video_screen_get_hpos(0));
11221122
break;
11231123

11241124
case MAX_REGS + 3:

‎src/emu/inptport.c

+29-29
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ struct _analog_port_info
138138
INT32 minimum; /* minimum adjusted value */
139139
INT32 maximum; /* maximum adjusted value */
140140
INT32 center; /* center adjusted value for autocentering */
141-
INT32 reverse_val; /* value where we subract from to reverse directions */
141+
INT32 reverse_val; /* value where we subtract from to reverse directions */
142142
double scalepos; /* scale factor to apply to positive adjusted values */
143143
double scaleneg; /* scale factor to apply to negative adjusted values */
144144
double keyscalepos; /* scale factor to apply to the key delta field when pos */
@@ -148,9 +148,9 @@ struct _analog_port_info
148148
UINT8 bits; /* how many bits of resolution are expected? */
149149
UINT8 absolute; /* is this an absolute or relative input? */
150150
UINT8 wraps; /* does the control wrap around? */
151-
UINT8 one_of_x; /* is this a 1 of X postional input? */
151+
UINT8 one_of_x; /* is this a 1 of X positional input? */
152152
UINT8 autocenter; /* autocenter this input? */
153-
UINT8 single_scale; /* scale joystick diferently if default is between min/max */
153+
UINT8 single_scale; /* scale joystick differently if default is between min/max */
154154
UINT8 interpolate; /* should we do linear interpolation for mid-frame reads? */
155155
UINT8 lastdigital; /* was the last modification caused by a digital form? */
156156
UINT32 crosshair_pos; /* position of fake crosshair */
@@ -725,32 +725,32 @@ static const input_port_default_entry default_ports_builtin[] =
725725
INPUT_PORT_DIGITAL_DEF( 0, IPG_OTHER, VOLUME_DOWN, "Volume Down", SEQ_DEF_1(KEYCODE_MINUS) )
726726
INPUT_PORT_DIGITAL_DEF( 0, IPG_OTHER, VOLUME_UP, "Volume Up", SEQ_DEF_1(KEYCODE_EQUALS) )
727727

728-
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL, "P1 Pedal 1", SEQ_DEF_1(JOYCODE_1_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_LCONTROL, CODE_OR, JOYCODE_1_BUTTON1) )
729-
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL, "P2 Pedal 1", SEQ_DEF_1(JOYCODE_2_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_A, CODE_OR, JOYCODE_2_BUTTON1) )
730-
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL, "P3 Pedal 1", SEQ_DEF_1(JOYCODE_3_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_RCONTROL, CODE_OR, JOYCODE_3_BUTTON1) )
731-
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL, "P4 Pedal 1", SEQ_DEF_1(JOYCODE_4_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_0_PAD, CODE_OR, JOYCODE_4_BUTTON1) )
732-
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL, "P5 Pedal 1", SEQ_DEF_1(JOYCODE_5_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON1) )
733-
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL, "P6 Pedal 1", SEQ_DEF_1(JOYCODE_6_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON1) )
734-
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL, "P7 Pedal 1", SEQ_DEF_1(JOYCODE_7_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON1) )
735-
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL, "P8 Pedal 1", SEQ_DEF_1(JOYCODE_8_ANALOG_X_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON1) )
736-
737-
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL2, "P1 Pedal 2", SEQ_DEF_1(JOYCODE_1_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_LALT, CODE_OR, JOYCODE_1_BUTTON2) )
738-
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL2, "P2 Pedal 2", SEQ_DEF_1(JOYCODE_2_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_S, CODE_OR, JOYCODE_2_BUTTON2) )
739-
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL2, "P3 Pedal 2", SEQ_DEF_1(JOYCODE_3_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_RSHIFT, CODE_OR, JOYCODE_3_BUTTON2) )
740-
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL2, "P4 Pedal 2", SEQ_DEF_1(JOYCODE_4_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_DEL_PAD, CODE_OR, JOYCODE_4_BUTTON2) )
741-
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL2, "P5 Pedal 2", SEQ_DEF_1(JOYCODE_5_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON2) )
742-
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL2, "P6 Pedal 2", SEQ_DEF_1(JOYCODE_6_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON2) )
743-
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL2, "P7 Pedal 2", SEQ_DEF_1(JOYCODE_7_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON2) )
744-
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL2, "P8 Pedal 2", SEQ_DEF_1(JOYCODE_8_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON2) )
745-
746-
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL3, "P1 Pedal 3", SEQ_DEF_1(JOYCODE_1_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_SPACE, CODE_OR, JOYCODE_1_BUTTON3) )
747-
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL3, "P2 Pedal 3", SEQ_DEF_1(JOYCODE_2_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_Q, CODE_OR, JOYCODE_2_BUTTON3) )
748-
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL3, "P3 Pedal 3", SEQ_DEF_1(JOYCODE_3_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_ENTER, CODE_OR, JOYCODE_3_BUTTON3) )
749-
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL3, "P4 Pedal 3", SEQ_DEF_1(JOYCODE_4_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_ENTER_PAD, CODE_OR, JOYCODE_4_BUTTON3) )
750-
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL3, "P5 Pedal 3", SEQ_DEF_1(JOYCODE_5_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON3) )
751-
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL3, "P6 Pedal 3", SEQ_DEF_1(JOYCODE_6_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON3) )
752-
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL3, "P7 Pedal 3", SEQ_DEF_1(JOYCODE_7_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON3) )
753-
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL3, "P8 Pedal 3", SEQ_DEF_1(JOYCODE_8_ANALOG_Z_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON3) )
728+
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL, "P1 Pedal 1", SEQ_DEF_1(JOYCODE_1_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_LCONTROL, CODE_OR, JOYCODE_1_BUTTON1) )
729+
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL, "P2 Pedal 1", SEQ_DEF_1(JOYCODE_2_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_A, CODE_OR, JOYCODE_2_BUTTON1) )
730+
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL, "P3 Pedal 1", SEQ_DEF_1(JOYCODE_3_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_RCONTROL, CODE_OR, JOYCODE_3_BUTTON1) )
731+
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL, "P4 Pedal 1", SEQ_DEF_1(JOYCODE_4_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_0_PAD, CODE_OR, JOYCODE_4_BUTTON1) )
732+
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL, "P5 Pedal 1", SEQ_DEF_1(JOYCODE_5_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON1) )
733+
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL, "P6 Pedal 1", SEQ_DEF_1(JOYCODE_6_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON1) )
734+
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL, "P7 Pedal 1", SEQ_DEF_1(JOYCODE_7_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON1) )
735+
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL, "P8 Pedal 1", SEQ_DEF_1(JOYCODE_8_ANALOG_Y_NEG), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON1) )
736+
737+
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL2, "P1 Pedal 2", SEQ_DEF_1(JOYCODE_1_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_LALT, CODE_OR, JOYCODE_1_BUTTON2) )
738+
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL2, "P2 Pedal 2", SEQ_DEF_1(JOYCODE_2_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_S, CODE_OR, JOYCODE_2_BUTTON2) )
739+
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL2, "P3 Pedal 2", SEQ_DEF_1(JOYCODE_3_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_RSHIFT, CODE_OR, JOYCODE_3_BUTTON2) )
740+
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL2, "P4 Pedal 2", SEQ_DEF_1(JOYCODE_4_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_3(KEYCODE_DEL_PAD, CODE_OR, JOYCODE_4_BUTTON2) )
741+
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL2, "P5 Pedal 2", SEQ_DEF_1(JOYCODE_5_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON2) )
742+
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL2, "P6 Pedal 2", SEQ_DEF_1(JOYCODE_6_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON2) )
743+
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL2, "P7 Pedal 2", SEQ_DEF_1(JOYCODE_7_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON2) )
744+
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL2, "P8 Pedal 2", SEQ_DEF_1(JOYCODE_8_ANALOG_Y_POS), SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON2) )
745+
746+
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PEDAL3, "P1 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_3(KEYCODE_SPACE, CODE_OR, JOYCODE_1_BUTTON3) )
747+
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PEDAL3, "P2 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_3(KEYCODE_Q, CODE_OR, JOYCODE_2_BUTTON3) )
748+
INPUT_PORT_ANALOG_DEF ( 3, IPG_PLAYER3, PEDAL3, "P3 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_3(KEYCODE_ENTER, CODE_OR, JOYCODE_3_BUTTON3) )
749+
INPUT_PORT_ANALOG_DEF ( 4, IPG_PLAYER4, PEDAL3, "P4 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_3(KEYCODE_ENTER_PAD, CODE_OR, JOYCODE_4_BUTTON3) )
750+
INPUT_PORT_ANALOG_DEF ( 5, IPG_PLAYER5, PEDAL3, "P5 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_1(JOYCODE_5_BUTTON3) )
751+
INPUT_PORT_ANALOG_DEF ( 6, IPG_PLAYER6, PEDAL3, "P6 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_1(JOYCODE_6_BUTTON3) )
752+
INPUT_PORT_ANALOG_DEF ( 7, IPG_PLAYER7, PEDAL3, "P7 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_1(JOYCODE_7_BUTTON3) )
753+
INPUT_PORT_ANALOG_DEF ( 8, IPG_PLAYER8, PEDAL3, "P8 Pedal 3", SEQ_DEF_0, SEQ_DEF_0, SEQ_DEF_1(JOYCODE_8_BUTTON3) )
754754

755755
INPUT_PORT_ANALOG_DEF ( 1, IPG_PLAYER1, PADDLE, "Paddle", SEQ_DEF_3(MOUSECODE_1_ANALOG_X, CODE_OR, JOYCODE_1_ANALOG_X), SEQ_DEF_3(KEYCODE_LEFT, CODE_OR, JOYCODE_1_LEFT), SEQ_DEF_3(KEYCODE_RIGHT, CODE_OR, JOYCODE_1_RIGHT) )
756756
INPUT_PORT_ANALOG_DEF ( 2, IPG_PLAYER2, PADDLE, "Paddle 2", SEQ_DEF_3(MOUSECODE_2_ANALOG_X, CODE_OR, JOYCODE_2_ANALOG_X), SEQ_DEF_3(KEYCODE_D, CODE_OR, JOYCODE_2_LEFT), SEQ_DEF_3(KEYCODE_G, CODE_OR, JOYCODE_2_RIGHT) )

‎src/emu/mame.h

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#define MAMERR_MISSING_FILES 2 /* missing files */
3434
#define MAMERR_FATALERROR 3 /* some other fatal error */
3535
#define MAMERR_DEVICE 4 /* device initialization error (MESS-specific) */
36+
#define MAMERR_NO_SUCH_GAME 5 /* game was specified but doesn't exist */
37+
#define MAMERR_INVALID_CONFIG 6 /* some sort of error in configuration */
3638

3739

3840
/* program phases */

0 commit comments

Comments
 (0)