From c0b3576488b11336c6379a12d6b2e3e2f6337d99 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Tue, 6 Sep 2011 13:39:18 +0000 Subject: Cleanups and version bump --- src/emu/cpu/m37710/m37710.c | 30 +- src/emu/cpu/m37710/m37710op.h | 8 +- src/emu/cpu/m68000/m68k_in.c | 22 +- src/emu/cpu/m68000/m68kcpu.h | 2 +- src/emu/cpu/m68000/m68kmake.c | 2 +- src/emu/diserial.c | 12 +- src/emu/diserial.h | 34 +- src/emu/imagedev/floppy.h | 2 +- src/emu/imagedev/serial.c | 14 +- src/emu/imagedev/serial.h | 8 +- src/emu/machine/6551acia.c | 6 +- src/emu/machine/6551acia.h | 12 +- src/emu/machine/i8251.c | 4 +- src/emu/machine/i8251.h | 14 +- src/emu/machine/idectrl.c | 4 +- src/emu/sound/es5503.c | 2 +- src/emu/sound/es5503.h | 4 +- src/emu/sound/k051649.c | 2 +- src/emu/video/psx.c | 12 +- src/lib/formats/ami_dsk.c | 2 +- src/lib/formats/flopimg.h | 2 +- src/lib/formats/mfi_dsk.c | 2 +- src/mame/drivers/atari_s2.c | 4 +- src/mame/drivers/atari_s3.c | 2 +- src/mame/drivers/bfm_sc4.c | 4 +- src/mame/drivers/bingo.c | 6 +- src/mame/drivers/cobra.c | 874 +++++++++++++++++++++--------------------- src/mame/drivers/ecoinf3.c | 6 +- src/mame/drivers/ecoinfr.c | 56 +-- src/mame/drivers/jeutel.c | 4 +- src/mame/drivers/jpmimpct.c | 2 +- src/mame/drivers/maygayep.c | 6 +- src/mame/drivers/maygaysw.c | 48 +-- src/mame/drivers/mpu5.c | 8 +- src/mame/drivers/namcos22.c | 2 +- src/mame/drivers/neodrvr.c | 22 +- src/mame/drivers/pluto5.c | 4 +- src/mame/drivers/raiden2.c | 10 +- src/mame/drivers/spectra.c | 4 +- src/mame/drivers/taitoair.c | 16 +- src/mame/drivers/unkfr.c | 202 +++++----- src/mame/drivers/white_mod.c | 4 +- src/mame/includes/taitoair.h | 2 +- src/mame/mame.lst | 1 + src/mame/video/taitoair.c | 14 +- src/version.c | 2 +- 46 files changed, 752 insertions(+), 751 deletions(-) diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c index d8a18431d61..6a0c9877db5 100644 --- a/src/emu/cpu/m37710/m37710.c +++ b/src/emu/cpu/m37710/m37710.c @@ -66,22 +66,22 @@ extern const int m37710_irq_levels[M37710_LINE_MAX]; const int m37710_irq_levels[M37710_LINE_MAX] = { // maskable - 0x70, // ADC 0 + 0x70, // ADC 0 0x73, // UART 1 XMIT 1 0x74, // UART 1 RECV 2 0x71, // UART 0 XMIT 3 0x72, // UART 0 RECV 4 - 0x7c, // Timer B2 5 - 0x7b, // Timer B1 6 - 0x7a, // Timer B0 7 - 0x79, // Timer A4 8 - 0x78, // Timer A3 9 - 0x77, // Timer A2 10 - 0x76, // Timer A1 11 - 0x75, // Timer A0 12 - 0x7f, // IRQ 2 13 - 0x7e, // IRQ 1 14 - 0x7d, // IRQ 0 15 + 0x7c, // Timer B2 5 + 0x7b, // Timer B1 6 + 0x7a, // Timer B0 7 + 0x79, // Timer A4 8 + 0x78, // Timer A3 9 + 0x77, // Timer A2 10 + 0x76, // Timer A1 11 + 0x75, // Timer A0 12 + 0x7f, // IRQ 2 13 + 0x7e, // IRQ 1 14 + 0x7d, // IRQ 0 15 // non-maskable 0, // watchdog @@ -94,11 +94,11 @@ const int m37710_irq_levels[M37710_LINE_MAX] = static const int m37710_irq_vectors[M37710_LINE_MAX] = { // maskable - 0xffd6, // A-D converter + 0xffd6, // A-D converter 0xffd8, // UART1 transmit - 0xffda, // UART1 receive + 0xffda, // UART1 receive 0xffdc, // UART0 transmit - 0xffde, // UART0 receive + 0xffde, // UART0 receive 0xffe0, // Timer B2 0xffe2, // Timer B1 0xffe4, // Timer B0 diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h index 64b025f5a3f..2fbf1765f00 100644 --- a/src/emu/cpu/m37710/m37710op.h +++ b/src/emu/cpu/m37710/m37710op.h @@ -521,7 +521,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ if (SRC&0x40) \ { m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \ if (SRC&0x80) \ - { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } + { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } #else // FLAG_SET_X #define OP_PSH(MODE) \ SRC = OPER_8_##MODE(cpustate); \ @@ -541,7 +541,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ if (SRC&0x40) \ { m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \ if (SRC&0x80) \ - { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } + { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } #endif // FLAG_SET_X #else // FLAG_SET_M #if FLAG_SET_X @@ -563,7 +563,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ if (SRC&0x40) \ { m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \ if (SRC&0x80) \ - { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } + { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } #else // FLAG_SET_X #define OP_PSH(MODE) \ SRC = OPER_8_##MODE(cpustate); \ @@ -583,7 +583,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ if (SRC&0x40) \ { m37710i_push_8(cpustate, REG_PB>>16); CLK(1); } \ if (SRC&0x80) \ - { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } + { m37710i_push_8(cpustate, cpustate->ipl); m37710i_push_8(cpustate, m37710i_get_reg_p(cpustate)); CLK(2); } #endif // FLAG_SET_X #endif // FLAG_SET_M diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index 8dd59051f0a..eb6ef39c092 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -530,10 +530,10 @@ cmpm 32 . . 1011...110001... .......... U U U U U U 20 20 9 cinv 32 . . 11110100..0..... .......... . . . . U . . . . . 16 . 040 only cpush 32 . . 11110100..1..... .......... . . . . U . . . . . 16 . 040 only cpbcc 32 . . 1111...01....... .......... . . U U . . . . 4 4 . . cpXXX only for 020/030, not on 040! -cpdbcc 32 . . 1111...001001... .......... . . U U . . . . 4 4 . . -cpgen 32 . . 1111...000...... .......... . . U U . . . . 4 4 . . -cpscc 32 . . 1111...001...... .......... . . U U . . . . 4 4 . . -cptrapcc 32 . . 1111...001111... .......... . . U U . . . . 4 4 . . +cpdbcc 32 . . 1111...001001... .......... . . U U . . . . 4 4 . . +cpgen 32 . . 1111...000...... .......... . . U U . . . . 4 4 . . +cpscc 32 . . 1111...001...... .......... . . U U . . . . 4 4 . . +cptrapcc 32 . . 1111...001111... .......... . . U U . . . . 4 4 . . dbt 16 . . 0101000011001... .......... U U U U U U 12 12 6 6 6 6 dbf 16 . . 0101000111001... .......... U U U U U U 12 12 6 6 6 6 dbcc 16 . . 0101....11001... .......... U U U U U U 12 12 6 6 6 6 @@ -595,7 +595,7 @@ move 8 pi7 d 0001111011000... .......... U U U U U U 8 8 4 move 8 pi7 . 0001111011...... A+-DXWLdxI U U U U U U 8 8 4 4 4 4 move 8 pd d 0001...100000... .......... U U U U U U 8 8 5 5 5 5 move 8 pd . 0001...100...... A+-DXWLdxI U U U U U U 8 8 5 5 5 5 -move 8 pd7 d 0001111100000... .......... U U U U U U 8 8 5 5 5 5 +move 8 pd7 d 0001111100000... .......... U U U U U U 8 8 5 5 5 5 move 8 pd7 . 0001111100...... A+-DXWLdxI U U U U U U 8 8 5 5 5 5 move 8 di d 0001...101000... .......... U U U U U U 12 12 5 5 5 5 move 8 di . 0001...101...... A+-DXWLdxI U U U U U U 12 12 5 5 5 5 @@ -636,7 +636,7 @@ move 32 ai d 0010...010000... .......... U U U U U U 12 12 4 move 32 ai a 0010...010001... .......... U U U U U U 12 12 4 4 4 4 move 32 ai . 0010...010...... A+-DXWLdxI U U U U U U 12 12 4 4 4 4 move 32 pi d 0010...011000... .......... U U U U U U 12 12 4 4 4 4 -move 32 pi a 0010...011001... .......... U U U U U U 12 12 4 4 4 4 +move 32 pi a 0010...011001... .......... U U U U U U 12 12 4 4 4 4 move 32 pi . 0010...011...... A+-DXWLdxI U U U U U U 12 12 4 4 4 4 move 32 pd d 0010...100000... .......... U U U U U U 12 14 5 5 5 5 move 32 pd a 0010...100001... .......... U U U U U U 12 14 5 5 5 5 @@ -652,7 +652,7 @@ move 32 aw a 0010000111001... .......... U U U U U U 16 16 4 move 32 aw . 0010000111...... A+-DXWLdxI U U U U U U 16 16 4 4 4 4 move 32 al d 0010001111000... .......... U U U U U U 20 20 6 6 6 6 move 32 al a 0010001111001... .......... U U U U U U 20 20 6 6 6 6 -move 32 al . 0010001111...... A+-DXWLdxI U U U U U U 20 20 6 6 6 6 +move 32 al . 0010001111...... A+-DXWLdxI U U U U U U 20 20 6 6 6 6 movea 16 . d 0011...001000... .......... U U U U U U 4 4 2 2 2 2 movea 16 . a 0011...001001... .......... U U U U U U 4 4 2 2 2 2 movea 16 . . 0011...001...... A+-DXWLdxI U U U U U U 4 4 2 2 2 2 @@ -669,7 +669,7 @@ move 16 tos d 0100011011000... .......... S S S S S S 12 12 8 move 16 tos . 0100011011...... A+-DXWLdxI S S S S S S 12 12 8 8 8 8 move 32 fru . 0100111001101... .......... S S S S S S 4 6 2 2 2 2 move 32 tou . 0100111001100... .......... S S S S S S 4 6 2 2 2 2 -movec 32 cr . 0100111001111010 .......... . S S S S S . 12 6 6 6 6 +movec 32 cr . 0100111001111010 .......... . S S S S S . 12 6 6 6 6 movec 32 rc . 0100111001111011 .......... . S S S S S . 10 12 12 12 12 movem 16 re pd 0100100010100... .......... U U U U U U 8 8 4 4 4 4 movem 16 re . 0100100010...... A..DXWL... U U U U U U 8 8 4 4 4 4 @@ -708,7 +708,7 @@ neg 32 . d 0100010010000... .......... U U U U U U 6 6 2 neg 32 . . 0100010010...... A+-DXWL... U U U U U U 12 12 4 4 4 4 negx 8 . d 0100000000000... .......... U U U U U U 4 4 2 2 2 2 negx 8 . . 0100000000...... A+-DXWL... U U U U U U 8 8 4 4 4 4 -negx 16 . d 0100000001000... .......... U U U U U U 4 4 2 2 2 2 +negx 16 . d 0100000001000... .......... U U U U U U 4 4 2 2 2 2 negx 16 . . 0100000001...... A+-DXWL... U U U U U U 8 8 4 4 4 4 negx 32 . d 0100000010000... .......... U U U U U U 6 6 2 2 2 2 negx 32 . . 0100000010...... A+-DXWL... U U U U U U 12 12 4 4 4 4 @@ -754,7 +754,7 @@ ror 32 r . 1110...010111... .......... U U U U U U 8 8 8 ror 16 . . 1110011011...... A+-DXWL... U U U U U U 8 8 7 7 7 7 rol 8 s . 1110...100011... .......... U U U U U U 6 6 8 8 8 8 rol 16 s . 1110...101011... .......... U U U U U U 6 6 8 8 8 8 -rol 32 s . 1110...110011... .......... U U U U U U 8 8 8 8 8 8 +rol 32 s . 1110...110011... .......... U U U U U U 8 8 8 8 8 8 rol 8 r . 1110...100111... .......... U U U U U U 6 6 8 8 8 8 rol 16 r . 1110...101111... .......... U U U U U U 6 6 8 8 8 8 rol 32 r . 1110...110111... .......... U U U U U U 8 8 8 8 8 8 @@ -782,7 +782,7 @@ sbcd 8 rr . 1000...100000... .......... U U U U U U 6 6 4 sbcd 8 mm ax7 1000111100001... .......... U U U U U U 18 18 16 16 16 16 sbcd 8 mm ay7 1000...100001111 .......... U U U U U U 18 18 16 16 16 16 sbcd 8 mm axy7 1000111100001111 .......... U U U U U U 18 18 16 16 16 16 -sbcd 8 mm . 1000...100001... .......... U U U U U U 18 18 16 16 16 16 +sbcd 8 mm . 1000...100001... .......... U U U U U U 18 18 16 16 16 16 st 8 . d 0101000011000... .......... U U U U U U 6 4 4 4 4 4 st 8 . . 0101000011...... A+-DXWL... U U U U U U 8 8 6 6 6 6 sf 8 . d 0101000111000... .......... U U U U U U 4 4 4 4 4 4 diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index 14c3bc07228..9b55b94710c 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -215,7 +215,7 @@ typedef struct _m68ki_cpu_core m68ki_cpu_core; #define REG_DA(M) (M)->dar /* easy access to data and address regs */ #define REG_D(M) (M)->dar #define REG_A(M) ((M)->dar+8) -#define REG_PPC(M) (M)->ppc +#define REG_PPC(M) (M)->ppc #define REG_PC(M) (M)->pc #define REG_SP_BASE(M) (M)->sp #define REG_USP(M) (M)->sp[0] diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/emu/cpu/m68000/m68kmake.c index 2d0d518c05e..dcee12cea4f 100644 --- a/src/emu/cpu/m68000/m68kmake.c +++ b/src/emu/cpu/m68000/m68kmake.c @@ -805,7 +805,7 @@ static void add_opcode_output_table_entry(opcode_struct* op, char* name) *ptr = *op; - sprintf( ptr->name, "_m68ki_cpu_core::%s", name); + sprintf( ptr->name, "_m68ki_cpu_core::%s", name); ptr->bits = num_bits(ptr->op_mask); } diff --git a/src/emu/diserial.c b/src/emu/diserial.c index 1ee83d548a3..5e4cdfa37da 100644 --- a/src/emu/diserial.c +++ b/src/emu/diserial.c @@ -49,7 +49,7 @@ void device_serial_interface::set_data_frame(int num_data_bits, int stop_bit_cou m_df_word_length = num_data_bits; m_df_stop_bit_count = stop_bit_count; m_df_parity = parity_code; - + m_rcv_bit_count = m_df_word_length + m_df_stop_bit_count; if (m_df_parity != SERIAL_PARITY_NONE) @@ -280,7 +280,7 @@ void device_serial_interface::transmit_register_send_bit() data = transmit_register_get_data_bit(); - /* set tx data bit */ + /* set tx data bit */ m_connection_state &=~SERIAL_STATE_TX_DATA; m_connection_state|=(data<<5); @@ -318,13 +318,13 @@ static UINT8 serial_connection_spin_bits(UINT8 input_status) void device_serial_interface::serial_connection_out() { - + if (m_other_connection!=NULL) { UINT8 state_at_other_end = serial_connection_spin_bits(m_connection_state); m_other_connection->input_callback(state_at_other_end); - } + } } bool device_serial_interface::is_receive_register_full() @@ -376,12 +376,12 @@ void serial_source_device::device_start() } void serial_source_device::input_callback(UINT8 state) -{ +{ m_input_state = state; } void serial_source_device::send_bit(UINT8 data) -{ +{ set_out_data_bit(data); serial_connection_out(); } diff --git a/src/emu/diserial.h b/src/emu/diserial.h index e76d1722e29..4b2482b6c22 100644 --- a/src/emu/diserial.h +++ b/src/emu/diserial.h @@ -81,51 +81,51 @@ public: // construction/destruction device_serial_interface(const machine_config &mconfig, device_t &device); virtual ~device_serial_interface(); - + virtual void input_callback(UINT8 state) = 0; - + void set_data_frame(int num_data_bits, int stop_bit_count, int parity_code); - void receive_register_reset(); + void receive_register_reset(); void receive_register_update_bit(int bit); void receive_register_extract(); - - + + void transmit_register_reset(); void transmit_register_add_bit(int bit); void transmit_register_setup(UINT8 data_byte); UINT8 transmit_register_get_data_bit(); void transmit_register_send_bit(); - + UINT8 serial_helper_get_parity(UINT8 data) { return m_serial_parity_table[data]; } UINT8 get_in_data_bit() { return ((m_input_state & SERIAL_STATE_RX_DATA)>>4) & 1; } void set_out_data_bit(UINT8 data) { m_connection_state &=~SERIAL_STATE_TX_DATA; m_connection_state |=(data<<5); } void serial_connection_out(); - + bool is_receive_register_full(); bool is_transmit_register_empty(); - + UINT8 get_received_char() { return m_rcv_byte_received; } - + void set_other_connection(device_serial_interface *other_connection); - + void connect(device_serial_interface *other_connection); protected: UINT8 m_input_state; UINT8 m_connection_state; -private: +private: UINT8 m_serial_parity_table[256]; - // Data frame + // Data frame // length of word in bits UINT8 m_df_word_length; // parity state UINT8 m_df_parity; // number of stop bits - UINT8 m_df_stop_bit_count; - + UINT8 m_df_stop_bit_count; + // Receive register /* data */ UINT16 m_rcv_register_data; @@ -137,7 +137,7 @@ private: UINT8 m_rcv_bit_count; /* the byte of data received */ UINT8 m_rcv_byte_received; - + // Transmit register /* data */ UINT16 m_tra_register_data; @@ -153,7 +153,7 @@ private: class serial_source_device : public device_t, - public device_serial_interface + public device_serial_interface { public: // construction/destruction @@ -163,7 +163,7 @@ public: void send_bit(UINT8 data); protected: // device-level overrides - virtual void device_start(); + virtual void device_start(); }; extern const device_type SERIAL_SOURCE; diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h index a06a4375c30..20d7e5db27f 100644 --- a/src/emu/imagedev/floppy.h +++ b/src/emu/imagedev/floppy.h @@ -18,7 +18,7 @@ struct floppy_interface { devcb_write_line m_out_idx_cb; /* index */ - const floppy_format_type *m_formats; + const floppy_format_type *m_formats; const char * m_interface; device_image_display_info_func m_device_displayinfo; device_image_load_func m_load_func; diff --git a/src/emu/imagedev/serial.c b/src/emu/imagedev/serial.c index df9b07d9a87..85714e5da07 100644 --- a/src/emu/imagedev/serial.c +++ b/src/emu/imagedev/serial.c @@ -71,7 +71,7 @@ static TIMER_CALLBACK(serial_device_baud_rate_callback) has updated state -------------------------------------------------*/ void serial_image_device::input_callback(UINT8 state) -{ +{ m_input_state = state; } @@ -82,7 +82,7 @@ void serial_image_device::input_callback(UINT8 state) void serial_image_device::device_start() { set_data_frame(m_data_bits, m_stop_bits,m_parity); - + m_timer = machine().scheduler().timer_alloc(FUNC(serial_device_baud_rate_callback), this); /* signal to other end it is clear to send! */ @@ -92,14 +92,14 @@ void serial_image_device::device_start() /* signal to other end data is ready to be accepted */ /* set /dtr */ m_connection_state |= SERIAL_STATE_DTR; - + set_out_data_bit(1); serial_connection_out(); transmit_register_reset(); receive_register_reset(); - + set_transmit_state(m_transmit_on_start ? 1 :0); - + device_serial_interface *intf = NULL; device_t *dev = machine().device(m_tag_connected); if (dev!=NULL && dev->interface(intf)) { @@ -283,7 +283,7 @@ int serial_image_device::load_internal(unsigned char **ptr, int *pDataSize) call_load -------------------------------------------------*/ bool serial_image_device::call_load() -{ +{ int data_length; unsigned char *data; /* load file and setup transmit data */ @@ -304,7 +304,7 @@ void serial_image_device::call_unload() { /* stop transmit */ set_transmit_state(0); - + /* free streams */ data_stream_free(&m_transmit); data_stream_free(&m_receive); diff --git a/src/emu/imagedev/serial.h b/src/emu/imagedev/serial.h index ce7c2614abc..ba494e8649d 100644 --- a/src/emu/imagedev/serial.h +++ b/src/emu/imagedev/serial.h @@ -75,7 +75,7 @@ public: void sent_char(); void set_transmit_state(int state); int load_internal(unsigned char **ptr, int *pDataSize); - + // data stream int data_stream_get_data_bit_from_data_byte(serial_data_stream *stream); void data_stream_reset(serial_data_stream *stream); @@ -85,17 +85,17 @@ protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); - + private: /* transmit data bit-stream */ serial_data_stream m_transmit; /* receive data bit-stream */ serial_data_stream m_receive; - + int m_transmit_state; /* baud rate timer */ - emu_timer *m_timer; + emu_timer *m_timer; }; diff --git a/src/emu/machine/6551acia.c b/src/emu/machine/6551acia.c index 28410abb94a..ed02358b391 100644 --- a/src/emu/machine/6551acia.c +++ b/src/emu/machine/6551acia.c @@ -41,7 +41,7 @@ acia6551_device::acia6551_device(const machine_config &mconfig, const char *tag, has updated state -------------------------------------------------*/ void acia6551_device::input_callback(UINT8 state) -{ +{ m_input_state = state; } @@ -230,7 +230,7 @@ READ8_MEMBER(acia6551_device::read) -------------------------------------------------*/ void acia6551_device::update_data_form() -{ +{ int word_length = 8-((m_control_register>>5) & 0x03); int stop_bit_count = (m_control_register>>7)+1; int parity = 0; @@ -242,7 +242,7 @@ void acia6551_device::update_data_form() { parity = SERIAL_PARITY_NONE; } - + set_data_frame(word_length, stop_bit_count, parity); } diff --git a/src/emu/machine/6551acia.h b/src/emu/machine/6551acia.h index 9f3ccb30dd3..ce09c0f1420 100644 --- a/src/emu/machine/6551acia.h +++ b/src/emu/machine/6551acia.h @@ -32,22 +32,22 @@ public: /* read data register */ DECLARE_READ8_MEMBER(read); - + /* write data register */ DECLARE_WRITE8_MEMBER(write); - + void receive_character(UINT8 ch); - + void timer_callback(); - + virtual void input_callback(UINT8 state); protected: // device-level overrides virtual void device_start(); - + void refresh_ints(); void update_data_form(); - + private: UINT8 m_transmit_data_register; UINT8 m_receive_data_register; diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c index d8553e3ecc8..f06d800d9eb 100644 --- a/src/emu/machine/i8251.c +++ b/src/emu/machine/i8251.c @@ -2,7 +2,7 @@ i8251.c - Intel 8251 Universal Synchronous/Asynchronous Receiver Transmitter code + Intel 8251 Universal Synchronous/Asynchronous Receiver Transmitter code *********************************************************************/ @@ -278,7 +278,7 @@ void i8251_device::update_tx_empty() //------------------------------------------------- void i8251_device::device_reset() -{ +{ LOG(("I8251: Reset\n")); /* what is the default setup when the 8251 has been reset??? */ diff --git a/src/emu/machine/i8251.h b/src/emu/machine/i8251.h index a0839e15bfb..359fa4a626e 100644 --- a/src/emu/machine/i8251.h +++ b/src/emu/machine/i8251.h @@ -14,12 +14,12 @@ CONSTANTS ***************************************************************************/ -#define I8251_EXPECTING_MODE 0x01 -#define I8251_EXPECTING_SYNC_BYTE 0x02 +#define I8251_EXPECTING_MODE 0x01 +#define I8251_EXPECTING_SYNC_BYTE 0x02 -#define I8251_STATUS_FRAMING_ERROR 0x20 -#define I8251_STATUS_OVERRUN_ERROR 0x10 -#define I8251_STATUS_PARITY_ERROR 0x08 +#define I8251_STATUS_FRAMING_ERROR 0x20 +#define I8251_STATUS_OVERRUN_ERROR 0x10 +#define I8251_STATUS_PARITY_ERROR 0x08 #define I8251_STATUS_TX_EMPTY 0x04 #define I8251_STATUS_RX_READY 0x02 #define I8251_STATUS_TX_READY 0x01 @@ -57,7 +57,7 @@ struct i8251_interface // ======================> i8251_device class i8251_device : public device_t, - public device_serial_interface, + public device_serial_interface, public i8251_interface { public: @@ -83,7 +83,7 @@ public: void receive_clock(); void receive_character(UINT8 ch); - + virtual void input_callback(UINT8 state); protected: // device-level overrides diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 55713848473..1a1c726a591 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -1893,7 +1893,7 @@ static DEVICE_START( ide_controller ) } else if (config->hardware != NULL) { ide->hardware = (ide_hardware *)config->hardware; ide->hardware->get_info(ide->device, ide->features, ide->num_cylinders, ide->num_sectors, ide->num_heads); - ide_generate_features (ide); + ide_generate_features (ide); } /* create a timer for timing status */ @@ -2003,7 +2003,7 @@ static DEVICE_RESET( ide_controller ) } } else if (ide->hardware != NULL) { ide->hardware->get_info(ide->device, ide->features, ide->num_cylinders, ide->num_sectors, ide->num_heads); - ide_generate_features (ide); + ide_generate_features (ide); } /* reset the drive state */ diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index eaa5dfa52ee..10ff3d81955 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -159,7 +159,7 @@ void es5503_device::sound_stream_update(sound_stream &stream, stream_sample_t ** { ES5503Osc *pOsc = &oscillators[osc]; - mixp = &mix[0]; + mixp = &mix[0]; if (!(pOsc->control & 1)) { diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h index 20ebc610945..0f4e9f03369 100644 --- a/src/emu/sound/es5503.h +++ b/src/emu/sound/es5503.h @@ -21,7 +21,7 @@ // ======================> es5503_device -class es5503_device : public device_t, +class es5503_device : public device_t, public device_sound_interface, public device_memory_interface { @@ -77,7 +77,7 @@ private: UINT32 wavetblpointer; UINT8 wavetblsize; UINT8 resolution; - + UINT32 accumulator; UINT8 irqpend; } ES5503Osc; diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c index b3e6e062b7e..fd764f4d140 100644 --- a/src/emu/sound/k051649.c +++ b/src/emu/sound/k051649.c @@ -194,7 +194,7 @@ READ8_DEVICE_HANDLER ( k051649_waveform_r ) if (info->test & 0xc0) { info->stream->update(); - + if (offset >= 0x60) offset += (info->channel_list[3 + (info->test >> 6 & 1)].counter >> FREQ_BITS); else if (info->test & 0x40) diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c index 2699843a943..5283733541e 100644 --- a/src/emu/video/psx.c +++ b/src/emu/video/psx.c @@ -3643,12 +3643,12 @@ void psxgpu_device::vblank(screen_device &screen, bool vblank_state) #if 1 /* HACK for sianniv - OG: sianniv does the bios startup, then loads the main program, clears the bss zone, - then starts it. More or less. Meanwhile, it somehow forgets to disable vblank, - and the vblank routine happens to be in said bss zone. 2-3 vbls happen during that - initialization, with insta-crash effects. - What happens on the real hardware? Screen turned off disabling vbl indirectly perhaps? - */ + OG: sianniv does the bios startup, then loads the main program, clears the bss zone, + then starts it. More or less. Meanwhile, it somehow forgets to disable vblank, + and the vblank routine happens to be in said bss zone. 2-3 vbls happen during that + initialization, with insta-crash effects. + What happens on the real hardware? Screen turned off disabling vbl indirectly perhaps? + */ if(!strcmp(machine().system().name, "sianniv")) { UINT32 pc = cpu_get_pc(machine().device("maincpu")); if((pc >= 0x80010018 && pc <= 0x80010028) || pc == 0x8002a4f0 || pc == 0x8002a4f4) diff --git a/src/lib/formats/ami_dsk.c b/src/lib/formats/ami_dsk.c index 16d1f73e5b5..1b889b5e182 100644 --- a/src/lib/formats/ami_dsk.c +++ b/src/lib/formats/ami_dsk.c @@ -77,7 +77,7 @@ bool adf_format::load(floppy_image *image) sectors[i].size = 512; } -// UINT8 *mfm = NULL; +// UINT8 *mfm = NULL; image->set_meta_data(80, 2); for(int track=0; track < 80; track++) { for(int side=0; side < 2; side++) { diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h index ff6a697eb94..5bd9924863d 100644 --- a/src/lib/formats/flopimg.h +++ b/src/lib/formats/flopimg.h @@ -236,7 +236,7 @@ public: floppy_image_format_t *next; void append(floppy_image_format_t *_next); - + protected: // Struct designed for easy track data description // Optional, you can always do things by hand, but useful nevertheless diff --git a/src/lib/formats/mfi_dsk.c b/src/lib/formats/mfi_dsk.c index 6b631a70978..8cd7a5cccb1 100644 --- a/src/lib/formats/mfi_dsk.c +++ b/src/lib/formats/mfi_dsk.c @@ -137,7 +137,7 @@ bool mfi_format::load(floppy_image *image) ent++; } - + if(compressed) global_free(compressed); diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c index 8e0c0dbacfe..6be871182a7 100644 --- a/src/mame/drivers/atari_s2.c +++ b/src/mame/drivers/atari_s2.c @@ -52,7 +52,7 @@ ROM_START(supermap) ROM_RELOAD(0xb800, 0x0800) ROM_RELOAD(0xf800, 0x0800) ROM_REGION(0x1000, "sound1", 0) - ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) + ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) ROM_END /*------------------------------------------------------------------- @@ -68,7 +68,7 @@ ROM_START(hercules) ROM_RELOAD(0xb800, 0x0800) ROM_RELOAD(0xf800, 0x0800) ROM_REGION(0x1000, "sound1", 0) - ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) + ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) ROM_END GAME( 1979, supermap, 0, atari_s2, atari_s2, atari_s2, ROT0, "Atari","Superman (Pinball)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/atari_s3.c b/src/mame/drivers/atari_s3.c index 292ea47bf01..4bcc6dea354 100644 --- a/src/mame/drivers/atari_s3.c +++ b/src/mame/drivers/atari_s3.c @@ -52,7 +52,7 @@ ROM_START(roadrunr) ROM_RELOAD(0xb800, 0x0800) ROM_RELOAD(0xf800, 0x0800) ROM_REGION(0x1000, "sound1", 0) - ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) + ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b)) ROM_END GAME( 1979, roadrunr, 0, atari_s3, atari_s3, atari_s3, ROT0, "Atari","Road Runner", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c index e8261863e3d..337b9d98b85 100644 --- a/src/mame/drivers/bfm_sc4.c +++ b/src/mame/drivers/bfm_sc4.c @@ -6064,7 +6064,7 @@ ROM_START( sc_gcb ) ROM_LOAD16_BYTE( "95417253.hi", 0x00000, 0x080000, CRC(47f03742) SHA1(11eeee14240d4e9ff0dd924e1df457ad6e08f329) ) ROM_LOAD16_BYTE( "g_b_cash.hi", 0x0000, 0x080000, CRC(1620b7f9) SHA1(67b7f805a7a7c95b27938710158ca5cb070503d0) ) ROM_LOAD16_BYTE( "g_b_cash.lo", 0x0000, 0x080000, CRC(3471962b) SHA1(45579c4e7fca4eef46488fc4e16cbd76af9a7cae) ) - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_END @@ -10410,7 +10410,7 @@ ROM_START( sc_rich ) ROM_LOAD16_BYTE( "r_geez.hi", 0x00000, 0x080000, CRC(c1c510bf) SHA1(6b4483e2b732f6b212087c019de2e870b777dd97) ) ROM_LOAD16_BYTE( "r_geez.lo", 0x00001, 0x080000, CRC(c34f5939) SHA1(a2b0ebafee568ff1a9534c59afe50495c1815d2f) ) - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_LOAD( "95008084.lo", 0x00001, 0x100000, CRC(2231c842) SHA1(2180109949281b053313c8a8de33496d31d4279e) ) ROM_LOAD( "95008085.hi", 0x00000, 0x100000, CRC(eb748aa3) SHA1(b81acfbceb5ff9df8bb30d3da82deea70bfce2fe) ) diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c index d31efc561b2..51a9902943e 100644 --- a/src/mame/drivers/bingo.c +++ b/src/mame/drivers/bingo.c @@ -186,7 +186,7 @@ ROM_START(michigan) ROM_LOAD16_BYTE( "c9925_1.o", 0x80001, 0x10000, CRC(7a0d6c70) SHA1(1d410b9f5df69cc9cbf17dbc9c73fee928e167d7)) ROM_RELOAD(0xe0001, 0x10000) ROM_END - + ROM_START(montana) ROM_REGION(0x100000, "maincpu", 0) ROM_LOAD16_BYTE( "m0128.e", 0x80000, 0x20000, CRC(51a56929) SHA1(4a1d9939ff441f82661e1adcb0d698061f383429)) @@ -253,7 +253,7 @@ ROM_START(ggate) ROM_LOAD( "13006-1.epr", 0x8000, 0x8000, CRC(6a451fc6) SHA1(93287937c8a679dfca1a162977a62357134673b6)) ROM_LOAD( "13006-2.epr", 0x0000, 0x4000, CRC(217299b0) SHA1(ef3ee8811183dca43699a7c2d75fb99bc3668ae2)) ROM_END - + ROM_START(ggatea) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD( "12906-1.epr", 0x8000, 0x8000, CRC(3792fc4c) SHA1(4ab88b6c73ce1b49e1a4d12cc9fa61c7d74ed780)) @@ -265,7 +265,7 @@ ROM_START(tripjok) ROM_LOAD( "13006-1", 0x8000, 0x8000, CRC(5682ac90) SHA1(c9fa13c56e9178eb861991fcad6b09fd27cca3cb)) ROM_LOAD( "13006-2", 0x0000, 0x4000, CRC(c7104e8f) SHA1(a3737f70cb9c97df24b5da915ef53b6d30f2470d)) ROM_END - + GAME(1980, cntinntl, 0, bingo, bingo, bingo, ROT0, "Bally", "Continental (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(19??, goldgame, 0, splin, splin, splin, ROT0, "Splin", "Golden Game (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(19??, goldgkitb, goldgame, splin, splin, splin, ROT0, "Splin", "Golden Game Kit Bingo Stake 6/10 (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c index 595ba76a4ac..55b947b574c 100644 --- a/src/mame/drivers/cobra.c +++ b/src/mame/drivers/cobra.c @@ -99,23 +99,23 @@ static void render_texture_scan(void *dest, INT32 scanline, const poly_extent *e { int iu, iv; UINT32 texel; - + iu = (int)(u * texture_width); iv = (int)(v * texture_height); texel = gfx_texture[((iv * texture_width) + iu) / 2]; - + if (iu & 1) { texel &= 0xffff; } else { - texel >>= 16; + texel >>= 16; } fb[x] = texel ? 0xffffffff : 0xff000000; - + u += du; v += dv; } @@ -135,7 +135,7 @@ VIDEO_START( cobra ) cobra->poly = poly_alloc(machine, 4000, 10, POLYFLAG_ALLOW_QUADS); machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(cobra_video_exit), &machine)); - + cobra->framebuffer = auto_bitmap_alloc(machine, 64*8, 32*8, BITMAP_FORMAT_RGB32); } @@ -149,13 +149,13 @@ SCREEN_UPDATE( cobra ) for (i=0; i < cobra->polybuffer_ptr; i++) { - poly_render_triangle(cobra->poly, cobra->framebuffer, &screen->machine().primary_screen->visible_area(), render_texture_scan, 2, + poly_render_triangle(cobra->poly, cobra->framebuffer, &screen->machine().primary_screen->visible_area(), render_texture_scan, 2, &cobra->polybuffer[i].v[0], &cobra->polybuffer[i].v[1], &cobra->polybuffer[i].v[2]); poly_wait(cobra->poly, "Finished render"); } cobra->polybuffer_ptr = 0; } - + copybitmap_trans(bitmap, cobra->framebuffer, 0, 0, 0, 0, cliprect, 0); return 0; } @@ -203,7 +203,7 @@ static int decode_debug_state_value(int v) case 0xb0: return 14; case 0xb8: return 15; default: return 0; - } + } } @@ -238,7 +238,7 @@ static void fifo_init(running_machine &machine, int id, int size, const char *na fifo[id].fifo_rpos = 0; fifo[id].fifo_num = 0; fifo[id].fifo_size = size; - + fifo[id].verbose = verbose; fifo[id].name = (char*)name; } @@ -249,7 +249,7 @@ static void fifo_push(const device_t *cpu, int id, UINT64 data) { char accessor_location[50]; if (cpu != NULL) - { + { // cpu has a name and a PC sprintf(accessor_location, "(%s) %08X", cpu->tag(), cpu_get_pc((device_t *)cpu)); } @@ -258,7 +258,7 @@ static void fifo_push(const device_t *cpu, int id, UINT64 data) // non-cpu sprintf(accessor_location, "(non-cpu)"); } - + printf("%s: push %08X%08X (%d) at %s\n", fifo[id].name, (UINT32)(data >> 32), (UINT32)(data), fifo[id].fifo_num, accessor_location); } @@ -267,7 +267,7 @@ static void fifo_push(const device_t *cpu, int id, UINT64 data) int i, j; char accessor_location[50]; if (cpu != NULL) - { + { // cpu has a name and a PC sprintf(accessor_location, "(%s) %08X", cpu->tag(), cpu_get_pc((device_t *)cpu)); } @@ -279,7 +279,7 @@ static void fifo_push(const device_t *cpu, int id, UINT64 data) printf("%s overflow at %s\n", fifo[id].name, accessor_location); printf("%s dump:\n", fifo[id].name); - + for (j=0; j < 128; j+=4) { printf(" "); @@ -291,20 +291,20 @@ static void fifo_push(const device_t *cpu, int id, UINT64 data) } printf("\n"); } - + logerror("\n"); return; } - + fifo[id].data[fifo[id].fifo_wpos] = data; - + fifo[id].fifo_wpos++; - + if (fifo[id].fifo_wpos == fifo[id].fifo_size) { fifo[id].fifo_wpos = 0; } - + fifo[id].fifo_num++; } @@ -316,7 +316,7 @@ static int fifo_pop(const device_t *cpu, int id, UINT64 *result) { char accessor_location[50]; if (cpu != NULL) - { + { // cpu has a name and a PC sprintf(accessor_location, "(%s) %08X", cpu->tag(), cpu_get_pc((device_t *)cpu)); } @@ -331,12 +331,12 @@ static int fifo_pop(const device_t *cpu, int id, UINT64 *result) } r = fifo[id].data[fifo[id].fifo_rpos]; - + if (fifo[id].verbose) { char accessor_location[50]; if (cpu != NULL) - { + { // cpu has a name and a PC sprintf(accessor_location, "(%s) %08X", cpu->tag(), cpu_get_pc((device_t *)cpu)); } @@ -345,10 +345,10 @@ static int fifo_pop(const device_t *cpu, int id, UINT64 *result) // non-cpu sprintf(accessor_location, "(non-cpu)"); } - + printf("%s: pop %08X%08X (%d) at %s\n", fifo[id].name, (UINT32)(r >> 32), (UINT32)(r), fifo[id].fifo_num-1, accessor_location); } - + fifo[id].fifo_rpos++; if (fifo[id].fifo_rpos == fifo[id].fifo_size) @@ -373,19 +373,19 @@ static int fifo_pop_float(const device_t *cpu, int id, float *result) /*static UINT64 fifo_peek_top(int id) { - return fifo[id].data[fifo[id].fifo_rpos]; + return fifo[id].data[fifo[id].fifo_rpos]; } static UINT64 fifo_peek_next(int id) { - int pos = fifo[id].fifo_rpos + 1; - - if (pos == fifo[id].fifo_size) - { - pos = 0; - } - - return fifo[id].data[pos]; + int pos = fifo[id].fifo_rpos + 1; + + if (pos == fifo[id].fifo_size) + { + pos = 0; + } + + return fifo[id].data[pos]; }*/ static int fifo_current_num(int id) @@ -395,29 +395,29 @@ static int fifo_current_num(int id) static int fifo_space_left(int id) { - return fifo[id].fifo_size - fifo[id].fifo_num; + return fifo[id].fifo_size - fifo[id].fifo_num; } static int fifo_is_empty(int id) { - return (fifo[id].fifo_num == 0) ? 1 : 0; + return (fifo[id].fifo_num == 0) ? 1 : 0; } static int fifo_is_half_full(int id) { - return (fifo[id].fifo_num > (fifo[id].fifo_size / 2)) ? 1 : 0; + return (fifo[id].fifo_num > (fifo[id].fifo_size / 2)) ? 1 : 0; } static int fifo_is_full(int id) { - return (fifo[id].fifo_num >= fifo[id].fifo_size) ? 1 : 0; + return (fifo[id].fifo_num >= fifo[id].fifo_size) ? 1 : 0; } static void fifo_flush(int id) { fifo[id].fifo_num = 0; fifo[id].fifo_rpos = 0; - fifo[id].fifo_wpos = 0; + fifo[id].fifo_wpos = 0; } @@ -449,14 +449,14 @@ static void fifo_flush(int id) // Bank 6: start 0x86, end 0x86 // Bank 7: start 0x87, end 0x87 -// IBAT0 U: 0xfff00003 L: 0xfff00001 (0xfff00000, 128K) -// IBAT1 U: 0x0000007f L: 0x00000001 (0x00000000, 4MB) -// IBAT2 U: 0x0040007f L: 0x07c00001 (0x07c00000, 4MB) -// IBAT3 U: 0x00000000 L: 0x00000001 unused -// DBAT0 U: 0xfff0001f L: 0xfff0002a (0xfff00000, 1MB) -// DBAT1 U: 0x0000007f L: 0x00000002 (0x00000000, 4MB) -// DBAT2 U: 0x0040007f L: 0x07c00002 (0x07c00000, 4MB) -// DBAT3 U: 0xc0000fff L: 0xc0000002 (0xc0000000, 128MB) +// IBAT0 U: 0xfff00003 L: 0xfff00001 (0xfff00000, 128K) +// IBAT1 U: 0x0000007f L: 0x00000001 (0x00000000, 4MB) +// IBAT2 U: 0x0040007f L: 0x07c00001 (0x07c00000, 4MB) +// IBAT3 U: 0x00000000 L: 0x00000001 unused +// DBAT0 U: 0xfff0001f L: 0xfff0002a (0xfff00000, 1MB) +// DBAT1 U: 0x0000007f L: 0x00000002 (0x00000000, 4MB) +// DBAT2 U: 0x0040007f L: 0x07c00002 (0x07c00000, 4MB) +// DBAT3 U: 0xc0000fff L: 0xc0000002 (0xc0000000, 128MB) // RPA: 0x8010C000 @@ -498,7 +498,7 @@ static WRITE64_DEVICE_HANDLER(main_mpc106_w) READ64_MEMBER(cobra_state::main_fifo_r) { UINT64 r = 0; - + if (ACCESSING_BITS_56_63) { // Register 0xffff0000: @@ -507,24 +507,24 @@ READ64_MEMBER(cobra_state::main_fifo_r) // // 7 6 5 4 3 2 1 0 //---------------- - // x M2S FIFO full flag + // x M2S FIFO full flag // x M2S FIFO empty flag // x M2S FIFO half-full flag // x S2M FIFO full flag // x S2M FIFO empty flag // x S2M FIFO half-full flag - + int value = 0x00; value |= fifo_is_full(M2SFIFO) ? 0x00 : 0x01; value |= fifo_is_empty(M2SFIFO) ? 0x00 : 0x02; value |= fifo_is_half_full(M2SFIFO) ? 0x00 : 0x04; - + value |= fifo_is_full(S2MFIFO) ? 0x00 : 0x10; value |= fifo_is_empty(S2MFIFO) ? 0x00 : 0x20; value |= fifo_is_half_full(S2MFIFO) ? 0x00 : 0x40; - + value |= comram_page ? 0x80 : 0x00; - + r |= (UINT64)(value) << 56; } if (ACCESSING_BITS_48_55) @@ -536,19 +536,19 @@ READ64_MEMBER(cobra_state::main_fifo_r) { // Register 0xffff0002: // Sub-to-Main FIFO read data - + UINT64 value; fifo_pop(&space.device(), S2MFIFO, &value); - + if (fifo_is_empty(S2MFIFO)) { s2mfifo_unk_flag = 1; } else if (fifo_is_full(S2MFIFO)) { - s2mfifo_unk_flag = 0; + s2mfifo_unk_flag = 0; } - + r |= (UINT64)(value & 0xff) << 40; } if (ACCESSING_BITS_32_39) @@ -560,26 +560,26 @@ READ64_MEMBER(cobra_state::main_fifo_r) // x S2M FIFO unknown flag // x Graphics board/FIFO busy flag // x M2S FIFO unknown flag - + int value = 0x01; //value |= s2mfifo_unk_flag ? 0x2 : 0x0; - + if (fifo_is_empty(S2MFIFO)) { value |= 0x2; } else if (!fifo_is_full(S2MFIFO) && !fifo_is_half_full(S2MFIFO)) { - //value |= s2mfifo_unk_flag ? 0x2 : 0x0; + //value |= s2mfifo_unk_flag ? 0x2 : 0x0; } - + value |= m2sfifo_unk_flag ? 0x8 : 0x0; - + value |= (gfx_unk_flag & 0x80) ? 0x00 : 0x04; - + r |= (UINT64)(value) << 32; } - + return r; } @@ -589,13 +589,13 @@ WRITE64_MEMBER(cobra_state::main_fifo_w) { // Register 0xffff0002: // Main-to-Sub FIFO write data - + //printf("MAIN: M2S FIFO data write %02X\n", (UINT8)(data >> 40) & 0xff); - + fifo_push(&space.device(), M2SFIFO, (UINT8)(data >> 40)); - + cputag_set_input_line(space.machine(), "subcpu", INPUT_LINE_IRQ0, ASSERT_LINE); - + // this is a hack... // MAME has a small interrupt latency, which prevents the IRQ bit from being set in // the EXISR at the same time as the FIFO status updates..... @@ -605,12 +605,12 @@ WRITE64_MEMBER(cobra_state::main_fifo_w) { // Register 0xffff0003: // Main-to-Sub FIFO unknown - + if (!fifo_is_empty(M2SFIFO)) { if (fifo_is_half_full(M2SFIFO)) { - m2sfifo_unk_flag = 0x8; + m2sfifo_unk_flag = 0x8; } else { @@ -619,15 +619,15 @@ WRITE64_MEMBER(cobra_state::main_fifo_w) } else { - m2sfifo_unk_flag = 0x0; + m2sfifo_unk_flag = 0x0; } - + comram_page = ((data >> 32) & 0x80) ? 1 : 0; } - + // Register 0xffff0000,1 // Debug state write - + if (ACCESSING_BITS_56_63) { main_debug_state |= decode_debug_state_value((data >> 56) & 0xff) << 4; @@ -638,14 +638,14 @@ WRITE64_MEMBER(cobra_state::main_fifo_w) main_debug_state |= decode_debug_state_value((data >> 48) & 0xff); main_debug_state_wc++; } - + if (main_debug_state_wc >= 2) { if (main_debug_state != 0) { printf("MAIN: debug state %02X\n", main_debug_state); } - + main_debug_state = 0; main_debug_state_wc = 0; } @@ -655,7 +655,7 @@ READ64_MEMBER(cobra_state::main_comram_r) { UINT64 r = 0; int page = comram_page; - + if (ACCESSING_BITS_32_63) { r |= (UINT64)(comram[page][(offset << 1) + 0]) << 32; @@ -664,21 +664,21 @@ READ64_MEMBER(cobra_state::main_comram_r) { r |= (UINT64)(comram[page][(offset << 1) + 1]); } - + return r; } WRITE64_MEMBER(cobra_state::main_comram_w) -{ +{ int page = comram_page; - + UINT32 w1 = comram[page][(offset << 1) + 0]; UINT32 w2 = comram[page][(offset << 1) + 1]; UINT32 d1 = (UINT32)(data >> 32); UINT32 d2 = (UINT32)(data); UINT32 m1 = (UINT32)(mem_mask >> 32); UINT32 m2 = (UINT32)(mem_mask); - + comram[page][(offset << 1) + 0] = (w1 & m1) | (d1 & ~m1); comram[page][(offset << 1) + 1] = (w2 & m2) | (d2 & ~m2); } @@ -710,54 +710,54 @@ static UINT8 sub_interrupt = 0xff; READ32_MEMBER(cobra_state::sub_unk1_r) { UINT32 r = 0; - + if (ACCESSING_BITS_16_23) { r |= 0x10000; } - + return r; } WRITE32_MEMBER(cobra_state::sub_unk1_w) { /* - if (!(mem_mask & 0xff000000)) - { - printf("%02X", data >> 24); - ucount++; - - if (ucount >= 4) - { - ucount = 0; - printf("\n"); - } - } - */ + if (!(mem_mask & 0xff000000)) + { + printf("%02X", data >> 24); + ucount++; + + if (ucount >= 4) + { + ucount = 0; + printf("\n"); + } + } + */ } READ32_MEMBER(cobra_state::sub_mainbd_r) { UINT32 r = 0; - + if (ACCESSING_BITS_24_31) { // Register 0x7E380000 // M2S FIFO read - + UINT64 value; fifo_pop(&space.device(), M2SFIFO, &value); - + if (fifo_is_empty(M2SFIFO)) { cputag_set_input_line(space.machine(), "subcpu", INPUT_LINE_IRQ0, CLEAR_LINE); - + // this is a hack... // MAME has a small interrupt latency, which prevents the IRQ bit from being cleared in // the EXISR at the same time as the FIFO status updates..... cpu_set_reg(m_subcpu, PPC_EXISR, cpu_get_reg(m_subcpu, PPC_EXISR) & ~0x10); } - + r |= (value & 0xff) << 24; } if (ACCESSING_BITS_16_23) @@ -774,21 +774,21 @@ READ32_MEMBER(cobra_state::sub_mainbd_r) // x M2S FIFO full flag // x M2S FIFO empty flag // x M2S FIFO half-full flag - + UINT32 value = 0x00; value |= fifo_is_full(S2MFIFO) ? 0x00 : 0x01; value |= fifo_is_empty(S2MFIFO) ? 0x00 : 0x02; value |= fifo_is_half_full(S2MFIFO) ? 0x00 : 0x04; - + value |= fifo_is_full(M2SFIFO) ? 0x00 : 0x10; value |= fifo_is_empty(M2SFIFO) ? 0x00 : 0x20; value |= fifo_is_half_full(M2SFIFO) ? 0x00 : 0x40; - + value |= comram_page ? 0x80 : 0x00; - - r |= (value) << 16; + + r |= (value) << 16; } - + return r; } @@ -798,13 +798,13 @@ WRITE32_MEMBER(cobra_state::sub_mainbd_w) { // Register 0x7E380000 // Sub-to-Main FIFO data - - fifo_push(&space.device(), S2MFIFO, (UINT8)(data >> 24)); + + fifo_push(&space.device(), S2MFIFO, (UINT8)(data >> 24)); } if (ACCESSING_BITS_16_23) { // Register 0x7E380001 - + if (!fifo_is_empty(S2MFIFO)) { if (fifo_is_half_full(S2MFIFO)) @@ -820,11 +820,11 @@ WRITE32_MEMBER(cobra_state::sub_mainbd_w) { s2mfifo_unk_flag = 0; } - + if (!s2mfifo_unk_flag) { cputag_set_input_line(space.machine(), "subcpu", INPUT_LINE_IRQ1, ASSERT_LINE); - + // this is a hack... // MAME has a small interrupt latency, which prevents the IRQ bit from being set in // the EXISR at the same time as the FIFO status updates..... @@ -833,7 +833,7 @@ WRITE32_MEMBER(cobra_state::sub_mainbd_w) else { cputag_set_input_line(space.machine(), "subcpu", INPUT_LINE_IRQ1, CLEAR_LINE); - + // this is a hack... // MAME has a small interrupt latency, which prevents the IRQ bit from being cleared in // the EXISR at the same time as the FIFO status updates..... @@ -854,14 +854,14 @@ WRITE32_MEMBER(cobra_state::sub_debug_w) sub_debug_state |= decode_debug_state_value((data >> 16) & 0xff); sub_debug_state_wc++; } - + if (sub_debug_state_wc >= 2) { if (sub_debug_state != 0) { printf("SUB: debug state %02X\n", sub_debug_state); } - + sub_debug_state = 0; sub_debug_state_wc = 0; } @@ -870,7 +870,7 @@ WRITE32_MEMBER(cobra_state::sub_debug_w) READ32_MEMBER(cobra_state::sub_config_r) { UINT32 r = 0; - + if (ACCESSING_BITS_8_15) { r |= (0x2) << 8; // if bit 0x2 is zero, maskrom boot @@ -879,19 +879,19 @@ READ32_MEMBER(cobra_state::sub_config_r) { r |= sub_interrupt; } - + return r; } WRITE32_MEMBER(cobra_state::sub_config_w) { - + } static READ32_DEVICE_HANDLER(sub_ata_r) { UINT32 r = 0; - + if (ACCESSING_BITS_16_31) { UINT16 v = ide_bus_r(device, 0, (offset << 1) + 0); @@ -902,66 +902,66 @@ static READ32_DEVICE_HANDLER(sub_ata_r) UINT16 v = ide_bus_r(device, 0, (offset << 1) + 1); r |= ((v << 8) | (v >> 8)) << 0; } - - return r; + + return r; } static WRITE32_DEVICE_HANDLER(sub_ata_w) { if (ACCESSING_BITS_16_31) { - ide_bus_w(device, 0, (offset << 1) + 0, (UINT16)(data >> 24)); + ide_bus_w(device, 0, (offset << 1) + 0, (UINT16)(data >> 24)); } if (ACCESSING_BITS_0_15) { - ide_bus_w(device, 0, (offset << 1) + 1, (UINT16)(data >> 8)); + ide_bus_w(device, 0, (offset << 1) + 1, (UINT16)(data >> 8)); } } READ32_MEMBER(cobra_state::sub_comram_r) { int page = comram_page ^ 1; - - return comram[page][offset]; + + return comram[page][offset]; } WRITE32_MEMBER(cobra_state::sub_comram_w) { int page = comram_page ^ 1; - + COMBINE_DATA(comram[page] + offset); } READ32_MEMBER(cobra_state::sub_sound_r) { UINT32 r = 0; - + /* - if (!(mem_mask & 0xffff0000)) - { - r |= RF5C400_0_r((offset << 1) + 0, 0x0000); - } - if (!(mem_mask & 0x0000ffff)) - { - r |= RF5C400_0_r((offset << 1) + 1, 0x0000); - } - */ - + if (!(mem_mask & 0xffff0000)) + { + r |= RF5C400_0_r((offset << 1) + 0, 0x0000); + } + if (!(mem_mask & 0x0000ffff)) + { + r |= RF5C400_0_r((offset << 1) + 1, 0x0000); + } + */ + return r; } WRITE32_MEMBER(cobra_state::sub_sound_w) { /* - if (!(mem_mask & 0xffff0000)) - { - RF5C400_0_w((offset << 1) + 0, (UINT16)(data >> 16), 0x0000); - } - if (!(mem_mask & 0x0000ffff)) - { - RF5C400_0_w((offset << 1) + 1, (UINT16)(data), 0x0000); - } - */ + if (!(mem_mask & 0xffff0000)) + { + RF5C400_0_w((offset << 1) + 0, (UINT16)(data >> 16), 0x0000); + } + if (!(mem_mask & 0x0000ffff)) + { + RF5C400_0_w((offset << 1) + 1, (UINT16)(data), 0x0000); + } + */ } static ADDRESS_MAP_START( cobra_sub_map, AS_PROGRAM, 32, cobra_state ) @@ -991,16 +991,16 @@ ADDRESS_MAP_END // Bank 6: start 0x180, end 0x1bf // Bank 7: start 0x1e0, end 0x1ef -// IBAT0 U: 0xfff00003 L: 0xfff00001 (0xfff00000, 0xfff00000, 128KB) -// IBAT1 U: 0x0000007f L: 0x00000001 (0x00000000, 0x00000000, 4MB) -// IBAT2 U: 0x0040007f L: 0x07c00001 (0x00400000, 0x07c00000, 4MB) -// IBAT3 U: 0x00000000 L: 0x00000001 unused -// DBAT0 U: 0xfff0001f L: 0xfff0002a (0xfff00000, 0xfff00000, 1MB) -// DBAT1 U: 0x0000007f L: 0x00000002 (0x00000000, 0x00000000, 4MB) -// DBAT2 U: 0x0040007f L: 0x07c00002 (0x00400000, 0x07c00000, 4MB) -// DBAT3 U: 0xf8fe0003 L: 0xf8fe002a (0xf8fe0000, 0xf8fe0000, 128KB) +// IBAT0 U: 0xfff00003 L: 0xfff00001 (0xfff00000, 0xfff00000, 128KB) +// IBAT1 U: 0x0000007f L: 0x00000001 (0x00000000, 0x00000000, 4MB) +// IBAT2 U: 0x0040007f L: 0x07c00001 (0x00400000, 0x07c00000, 4MB) +// IBAT3 U: 0x00000000 L: 0x00000001 unused +// DBAT0 U: 0xfff0001f L: 0xfff0002a (0xfff00000, 0xfff00000, 1MB) +// DBAT1 U: 0x0000007f L: 0x00000002 (0x00000000, 0x00000000, 4MB) +// DBAT2 U: 0x0040007f L: 0x07c00002 (0x00400000, 0x07c00000, 4MB) +// DBAT3 U: 0xf8fe0003 L: 0xf8fe002a (0xf8fe0000, 0xf8fe0000, 128KB) -// DBAT3 U: 0x10001fff L: 0x1000000a (0x10000000, 0x10000000, 256MB) +// DBAT3 U: 0x10001fff L: 0x1000000a (0x10000000, 0x10000000, 256MB) // SR0: 0x00000000 SR1: 0x00000001 SR2: 0x00000002 SR3: 0x00000003 // SR4: 0x00000004 SR5: 0x00000005 SR6: 0x00000006 SR7: 0x00000007 @@ -1034,18 +1034,18 @@ static void push_poly(cobra_state *cobra, poly_vertex *v1, poly_vertex *v2, poly memcpy(&cobra->polybuffer[cobra->polybuffer_ptr].v[0], v1, sizeof(poly_vertex)); memcpy(&cobra->polybuffer[cobra->polybuffer_ptr].v[1], v2, sizeof(poly_vertex)); memcpy(&cobra->polybuffer[cobra->polybuffer_ptr].v[2], v3, sizeof(poly_vertex)); - + cobra->polybuffer_ptr++; - + if (cobra->polybuffer_ptr >= 4096) { - logerror("push_poly() overflow\n"); + logerror("push_poly() overflow\n"); } } static void cobra_gfx_init(running_machine *machine) { - //gfx_gram = auto_malloc(0x100000); + //gfx_gram = auto_malloc(0x100000); gfx_gram = auto_alloc_array(*machine, UINT8, 0x100000); } @@ -1053,23 +1053,23 @@ static void gfx_fifo_exec(cobra_state *cobra) { if (gfx_fifo_loopback != 0) return; - + while (fifo_current_num(GFXFIFO_IN) >= 2) { UINT64 in1, in2; UINT32 w1, w2; - + if (gfx_re_status == RE_STATUS_IDLE) { fifo_pop(NULL, GFXFIFO_IN, &in1); fifo_pop(NULL, GFXFIFO_IN, &in2); w1 = (UINT32)(in1); w2 = (UINT32)(in2); - + gfx_re_command_word1 = w1; gfx_re_command_word2 = w2; gfx_re_word_count = 0; - + gfx_re_status = RE_STATUS_COMMAND; } else @@ -1077,47 +1077,47 @@ static void gfx_fifo_exec(cobra_state *cobra) w1 = gfx_re_command_word1; w2 = gfx_re_command_word2; } - - // fifo_pop(GFXFIFO_IN, &in1); - // fifo_pop(GFXFIFO_IN, &in2); - - // in1 = fifo_peek_top(GFXFIFO_IN); - // in2 = fifo_peek_next(GFXFIFO_IN); - - // w1 = (UINT32)(in1); - // w2 = (UINT32)(in2); - + + // fifo_pop(GFXFIFO_IN, &in1); + // fifo_pop(GFXFIFO_IN, &in2); + + // in1 = fifo_peek_top(GFXFIFO_IN); + // in2 = fifo_peek_next(GFXFIFO_IN); + + // w1 = (UINT32)(in1); + // w2 = (UINT32)(in2); + switch ((w1 >> 24) & 0xff) { case 0x00: { UINT64 param[6]; UINT32 w[6]; - + if (fifo_current_num(GFXFIFO_IN) < 6) { // wait until there's enough data in FIFO return; } - + fifo_pop(NULL, GFXFIFO_IN, ¶m[0]); fifo_pop(NULL, GFXFIFO_IN, ¶m[1]); fifo_pop(NULL, GFXFIFO_IN, ¶m[2]); fifo_pop(NULL, GFXFIFO_IN, ¶m[3]); fifo_pop(NULL, GFXFIFO_IN, ¶m[4]); fifo_pop(NULL, GFXFIFO_IN, ¶m[5]); - + w[0] = (UINT32)param[0]; w[1] = (UINT32)param[1]; w[2] = (UINT32)param[2]; w[3] = (UINT32)param[3]; w[4] = (UINT32)param[4]; w[5] = (UINT32)param[5]; - + // mbuslib_pumpkin(): 0x00600000 0x10500010 // 0x00600000 0x10500018 - + if (w2 == 0x10500010) { // GFX register select? gfx_register_select = w[3]; // word 3 is the only non-zero so far... - + printf("GFX: register select %04X\n", gfx_register_select); } else if (w2 == 0x10500018) @@ -1125,7 +1125,7 @@ static void gfx_fifo_exec(cobra_state *cobra) // register write to the register selected above? // 64-bit registers, top 32-bits in word 2, low 32-bit in word 3 printf("GFX: register write %04X: %08X %08X\n", gfx_register_select, w[2], w[3]); - + gfx_register[gfx_register_select] = ((UINT64)(w[2]) << 32) | w[3]; } else if (w2 == 0x10521000) @@ -1137,37 +1137,37 @@ static void gfx_fifo_exec(cobra_state *cobra) { logerror("gfxfifo_exec: unknown %08X %08X\n", w1, w2); } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0x0f: case 0xf0: { UINT64 in3, in4, ignore; - + // check_mergebus_self(): 0x0F600000 0x10520C00 - + if (fifo_current_num(GFXFIFO_IN) < 6) { // wait until there's enough data in FIFO return; } - + if (w1 != 0x0f600000 && w1 != 0xf0600000) { logerror("gfxfifo_exec: unknown %08X %08X\n", w1, w2); } - + printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - + fifo_pop(NULL, GFXFIFO_IN, &in3); fifo_pop(NULL, GFXFIFO_IN, &in4); fifo_pop(NULL, GFXFIFO_IN, &ignore); fifo_pop(NULL, GFXFIFO_IN, &ignore); fifo_pop(NULL, GFXFIFO_IN, &ignore); fifo_pop(NULL, GFXFIFO_IN, &ignore); - + if (w1 == 0x0f600000 && w2 == 0x10520c00) { fifo_push(NULL, GFXFIFO_OUT, w1); @@ -1175,9 +1175,9 @@ static void gfx_fifo_exec(cobra_state *cobra) fifo_push(NULL, GFXFIFO_OUT, in3); fifo_push(NULL, GFXFIFO_OUT, in4); } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0x80: case 0xa4: @@ -1185,35 +1185,35 @@ static void gfx_fifo_exec(cobra_state *cobra) case 0xac: { // 0xAxxxxxxx is different form in mbuslib_regwrite() - + // mbuslib_regwrite(): 0x800000FF 0x00000001 // 0xa40000FF 0x00000001 - + int reg = (w1 >> 8) & 0xfffff; - + gfx_gram[reg + 0] = (w2 >> 24) & 0xff; gfx_gram[reg + 1] = (w2 >> 16) & 0xff; gfx_gram[reg + 2] = (w2 >> 8) & 0xff; gfx_gram[reg + 3] = (w2 >> 0) & 0xff; - + if (reg != 0x118 && reg != 0x114 && reg != 0x11c) { printf("gfxfifo_exec: ram write %05X: %08X\n", reg, w2); } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } - + case 0xf1: case 0xf4: { printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - + gfx_re_status = RE_STATUS_IDLE; break; } - + case 0xe0: case 0xe2: case 0xe3: @@ -1237,10 +1237,10 @@ static void gfx_fifo_exec(cobra_state *cobra) // E3400002 58C003C1 - 20 params // E0C00003 18F803C1 - 36 params // E0C00001 58F803C0 - 12 params - + // These seem to be 3d graphics polygon packets... // The low part of the first word could be number of vertices... - + int i; int num = 0; int units = w1 & 0xff; @@ -1251,7 +1251,7 @@ static void gfx_fifo_exec(cobra_state *cobra) } //else if (w2 == 0x18c003c1) //{ - // num = units * 12; + // num = units * 12; //} else if (w2 == 0x38c003c1 || w2 == 0x58c003c1 || w2 == 0x78c003c0) { @@ -1263,23 +1263,23 @@ static void gfx_fifo_exec(cobra_state *cobra) } else if (w2 == 0x78f803c1) { - num = units * 14; + num = units * 14; } else { int c = 0; - printf("gfxfifo_exec: E0 unhandled %08X %08X\n", w1, w2); + printf("gfxfifo_exec: E0 unhandled %08X %08X\n", w1, w2); while (fifo_current_num(GFXFIFO_IN) > 0) { UINT64 param; fifo_pop(NULL, GFXFIFO_IN, ¶m); - + if (c == 0) printf(" "); printf("%08X ", (UINT32)(param)); - + c++; - + if (c == 4) { printf("\n"); @@ -1288,47 +1288,47 @@ static void gfx_fifo_exec(cobra_state *cobra) }; logerror("\n"); } - + if (fifo_current_num(GFXFIFO_IN) < num) { // wait until there's enough data in FIFO return; } - + printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - + // make sure the FIFO has fresh data at top... fifo_flush(GFXFIFO_OUT); - + if (w1 == 0xe0c00004 && w2 == 0x18f803c1) { // Quad poly packet poly_vertex vert[4]; - + for (i=0; i < 4; i++) { UINT64 in; fifo_pop_float(NULL, GFXFIFO_IN, &vert[i].x); // X coord fifo_pop_float(NULL, GFXFIFO_IN, &vert[i].y); // Y coord - + fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); - + fifo_pop_float(NULL, GFXFIFO_IN, &vert[i].p[0]); // texture U coord fifo_pop_float(NULL, GFXFIFO_IN, &vert[i].p[1]); // texture V coord - + fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); } - + //poly_render_triangle(poly, framebuffer, video_screen_get_visible_area(machine->primary_screen), render_texture_scan, 2, &vert[0], &vert[1], &vert[2]); //poly_render_triangle(poly, framebuffer, video_screen_get_visible_area(machine->primary_screen), render_texture_scan, 2, &vert[2], &vert[1], &vert[3]); //poly_wait(poly, "Finished render"); - + push_poly(cobra, &vert[0], &vert[1], &vert[2]); push_poly(cobra, &vert[2], &vert[1], &vert[3]); } @@ -1336,31 +1336,31 @@ static void gfx_fifo_exec(cobra_state *cobra) { // Triangle poly packet? poly_vertex vert[3]; - + for (i=0; i < 3; i++) { UINT64 in; - fifo_pop(NULL, GFXFIFO_IN, &in); - fifo_pop(NULL, GFXFIFO_IN, &in); - + + fifo_pop(NULL, GFXFIFO_IN, &in); + vert[i].x = (u2f((UINT32)(in)) / 8.0f) + 256.0f; - + fifo_pop(NULL, GFXFIFO_IN, &in); - + vert[i].y = (u2f((UINT32)(in)) / 8.0f) + 192.0f; - - fifo_pop(NULL, GFXFIFO_IN, &in); - + + fifo_pop(NULL, GFXFIFO_IN, &in); + fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); fifo_pop(NULL, GFXFIFO_IN, &in); } - + //poly_render_triangle(poly, framebuffer, video_screen_get_visible_area(machine->primary_screen), render_scan, 0, &vert[0], &vert[1], &vert[2]); //poly_wait(poly, "Finished render"); - + push_poly(cobra, &vert[0], &vert[1], &vert[2]); } else @@ -1371,140 +1371,140 @@ static void gfx_fifo_exec(cobra_state *cobra) fifo_pop(NULL, GFXFIFO_IN, &in3); fifo_pop(NULL, GFXFIFO_IN, &in4); printf(" %08X %08X (%f, %f)\n", (UINT32)(in3), (UINT32)(in4), u2f((UINT32)(in3)), u2f((UINT32)(in4))); - + fifo_push(NULL, GFXFIFO_OUT, (UINT32)(in3)); fifo_push(NULL, GFXFIFO_OUT, (UINT32)(in4)); } } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } - + case 0xe8: { int num = w2; int i; - // int c=0; - + // int c=0; + if (fifo_current_num(GFXFIFO_IN) < num) { // wait until there's enough data in FIFO return; } - + /* + printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); + + for (i=0; i < num; i++) + { + UINT64 in3; + fifo_pop(GFXFIFO_IN, &in3); + printf(" %08X\n", (UINT32)(in3)); + }*/ + printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - - for (i=0; i < num; i++) - { - UINT64 in3; - fifo_pop(GFXFIFO_IN, &in3); - printf(" %08X\n", (UINT32)(in3)); - }*/ - - printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - + for (i=0; i < num; i++) { UINT64 param; fifo_pop(NULL, GFXFIFO_IN, ¶m); - + /*if (c == 0) - printf(" "); - printf("%08X ", (UINT32)(param)); - - c++; - - if (c == 8) - { - printf("\n"); - c = 0; - }*/ + printf(" "); + printf("%08X ", (UINT32)(param)); + + c++; + + if (c == 8) + { + printf("\n"); + c = 0; + }*/ } //printf("\n"); - + gfx_re_status = RE_STATUS_IDLE; break; } - + case 0xe9: - { - // printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); - + { + // printf("gfxfifo_exec: unhandled %08X %08X\n", w1, w2); + /*{ - int y = (gfx_gram[0x11c] << 8) | (gfx_gram[0x11d]); - int x = (gfx_gram[0x11e] << 8) | (gfx_gram[0x11f]); - printf("GFX: E9 on X: %d, Y: %d\n", x, y); - }*/ - + int y = (gfx_gram[0x11c] << 8) | (gfx_gram[0x11d]); + int x = (gfx_gram[0x11e] << 8) | (gfx_gram[0x11f]); + printf("GFX: E9 on X: %d, Y: %d\n", x, y); + }*/ + fifo_push(NULL, GFXFIFO_OUT, 0); fifo_push(NULL, GFXFIFO_OUT, 0); fifo_push(NULL, GFXFIFO_OUT, 0); fifo_push(NULL, GFXFIFO_OUT, 0); - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } - + case 0x8f: { // buf_flush(): 0x8FFF0000 0x00000000 - + if (w1 != 0x8fff0000 || w2 != 0x00000000) { - logerror("gfxfifo_exec: buf_flush: %08X %08X\n", w1, w2); + logerror("gfxfifo_exec: buf_flush: %08X %08X\n", w1, w2); } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0xb0: { // mbuslib_pip_ints(): 0xB0300800 0x000001FE - + int reg = (w1 >> 8) & 0xfffff; int num = w2; int i; - + if (fifo_current_num(GFXFIFO_IN) < num) { return; } - + printf("gfxfifo_exec: pip_ints %d\n", num); - + /* - if (reg != 0x3008) - { - fatalerror("gfxfifo_exec: pip_ints: %08X %08X\n", w1, w2); - } - - printf("gfxfifo_exec: pip_ints %d\n", num); - - for (i = 0; i < num; i++) - { - UINT64 value; - fifo_pop(GFXFIFO_IN, &value); - - gfx_unk_reg[i] = value; - } - */ - + if (reg != 0x3008) + { + fatalerror("gfxfifo_exec: pip_ints: %08X %08X\n", w1, w2); + } + + printf("gfxfifo_exec: pip_ints %d\n", num); + + for (i = 0; i < num; i++) + { + UINT64 value; + fifo_pop(GFXFIFO_IN, &value); + + gfx_unk_reg[i] = value; + } + */ + // writes to n ram location starting from x? for (i = 0; i < num; i++) { UINT64 value; fifo_pop(NULL, GFXFIFO_IN, &value); - + gfx_gram[reg + (i*4) + 0] = (value >> 24) & 0xff; gfx_gram[reg + (i*4) + 1] = (value >> 16) & 0xff; gfx_gram[reg + (i*4) + 2] = (value >> 8) & 0xff; gfx_gram[reg + (i*4) + 3] = (value >> 0) & 0xff; } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0xc0: case 0xc4: @@ -1512,104 +1512,104 @@ static void gfx_fifo_exec(cobra_state *cobra) case 0xcc: { // mbuslib_regread(): 0xC0300800 0x00000000 - + /* - if (reg == 0x3008) - { - // TODO... - fifo_push(GFXFIFO_OUT, gfx_unk_reg[0]); - - } - else if (reg == 0x300c) - { - // TODO... - fifo_push(GFXFIFO_OUT, gfx_unk_reg[1]); - } - else - { - fatalerror("gfxfifo_exec: regread: %08X %08X\n", w1, w2); - } - */ - + if (reg == 0x3008) + { + // TODO... + fifo_push(GFXFIFO_OUT, gfx_unk_reg[0]); + + } + else if (reg == 0x300c) + { + // TODO... + fifo_push(GFXFIFO_OUT, gfx_unk_reg[1]); + } + else + { + fatalerror("gfxfifo_exec: regread: %08X %08X\n", w1, w2); + } + */ + // returns ram location x? - + int reg = (w1 >> 8) & 0xfffff; UINT32 ret = 0; - + ret |= gfx_gram[reg + 0] << 24; ret |= gfx_gram[reg + 1] << 16; ret |= gfx_gram[reg + 2] << 8; ret |= gfx_gram[reg + 3] << 0; - + fifo_push(NULL, GFXFIFO_OUT, ret); - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0xd0: { // register readback of some sort - + // 0xD0301000 0x000001FC - + int reg = (w1 >> 8) & 0xfffff; int num = w2; int i; - + if (fifo_space_left(GFXFIFO_OUT) < num) { - return; + return; } - + /* - if (reg == 0x3010) - { - for (i = 0; i < num; i++) - { - fifo_push(GFXFIFO_OUT, gfx_unk_reg[2+i]); - } - } - else - { - fatalerror("gfxfifo_exec: 0xD0: %08X %08X\n", w1, w2); - } - */ - + if (reg == 0x3010) + { + for (i = 0; i < num; i++) + { + fifo_push(GFXFIFO_OUT, gfx_unk_reg[2+i]); + } + } + else + { + fatalerror("gfxfifo_exec: 0xD0: %08X %08X\n", w1, w2); + } + */ + // reads back n ram locations starting from x? for (i=0; i < num; i++) { UINT32 value = 0; - + value |= gfx_gram[reg + (i*4) + 0] << 24; value |= gfx_gram[reg + (i*4) + 1] << 16; value |= gfx_gram[reg + (i*4) + 2] << 8; value |= gfx_gram[reg + (i*4) + 3] << 0; - + fifo_push(NULL, GFXFIFO_OUT, value); } - + gfx_re_status = RE_STATUS_IDLE; - break; + break; } case 0xed: { // mbuslib_tex_ints()? - + //int reg = (w1 >> 8) & 0xff; int num = w2; - + int c = 0; int i; - + int num_left = num - gfx_re_word_count; int start = gfx_re_word_count; - + if (fifo_current_num(GFXFIFO_IN) < num_left) { num_left = fifo_current_num(GFXFIFO_IN); } - - + + if (num >= 0x100000) { printf("gfxfifo_exec: tex_ints %d words left\n", num-gfx_re_word_count); @@ -1621,23 +1621,23 @@ static void gfx_fifo_exec(cobra_state *cobra) } } else - { + { printf("gfxfifo_exec: tex_ints %08X %08X\n", w1, w2); - + for (i=0; i < num_left; i++) { UINT64 param; fifo_pop(NULL, GFXFIFO_IN, ¶m); gfx_re_word_count++; - + gfx_texture[start+i] = (UINT32)(param); - + if (c == 0) printf(" "); printf("%08X ", (UINT32)(param)); - + c++; - + if (c == 4) { printf("\n"); @@ -1646,7 +1646,7 @@ static void gfx_fifo_exec(cobra_state *cobra) } printf("\n"); } - + if (gfx_re_word_count >= num) { gfx_re_status = RE_STATUS_IDLE; @@ -1658,23 +1658,23 @@ static void gfx_fifo_exec(cobra_state *cobra) int k = 0; int c = 0; printf("gfxfifo_exec: unknown command %08X %08X\n", w1, w2); - + if (fifo_current_num(GFXFIFO_IN) < 0) { return; } - + while (fifo_current_num(GFXFIFO_IN) > 0) { UINT64 param; fifo_pop(NULL, GFXFIFO_IN, ¶m); - + if (c == 0) printf(" "); printf("%08X ", (UINT32)(param)); - + c++; - + if (c == 4) { printf("\n"); @@ -1685,37 +1685,37 @@ static void gfx_fifo_exec(cobra_state *cobra) logerror("\n"); } } - -// printf("gfxfifo_exec: %08X %08X\n", w1, w2); + +// printf("gfxfifo_exec: %08X %08X\n", w1, w2); }; } READ64_MEMBER(cobra_state::gfx_fifo_r) { UINT64 r = 0; - + gfx_fifo_exec(this); - + if (ACCESSING_BITS_32_63) { UINT64 data; fifo_pop(&space.device(), GFXFIFO_OUT, &data); - + data &= 0xffffffff; - + r |= (UINT64)(data) << 32; } if (ACCESSING_BITS_0_31) { UINT64 data; fifo_pop(&space.device(), GFXFIFO_OUT, &data); - + data &= 0xffffffff; - + r |= (UINT64)(data); } -// printf("GFX FIFO read %08X%08X\n", (UINT32)(r >> 32), (UINT32)(r)); - +// printf("GFX FIFO read %08X%08X\n", (UINT32)(r >> 32), (UINT32)(r)); + return r; } @@ -1743,67 +1743,67 @@ static int gfx_status_byte = 0; READ64_MEMBER(cobra_state::gfx_unk1_r) { UINT64 r = 0; - + if (ACCESSING_BITS_56_63) { UINT64 v = 0; // mbuslib_init fails if bits 3-7 (0x78) are not set - - v |= 0x78; - + + v |= 0x78; + // the low 2 bits are vblank flags // bit 3 (0x8) may be graphics engine idle flag - + v |= gfx_status_byte; gfx_status_byte ^= 1; - + r |= v << 56; } if (ACCESSING_BITS_40_47) { // mbuslib_init fails if this is not 0x7f - + r |= U64(0x7f) << 40; } if (ACCESSING_BITS_24_31) { r |= (gfx_unknown_v1 & 3) << 24; } - + return r; } WRITE64_MEMBER(cobra_state::gfx_unk1_w) { -// printf("gfx_unk1_w: %08X %08X, %08X%08X\n", (UINT32)(data >> 32), (UINT32)(data), (UINT32)(mem_mask >> 32), (UINT32)(mem_mask)); - +// printf("gfx_unk1_w: %08X %08X, %08X%08X\n", (UINT32)(data >> 32), (UINT32)(data), (UINT32)(mem_mask >> 32), (UINT32)(mem_mask)); + if (ACCESSING_BITS_56_63) { if ((data >> 63) & 1) { - gfx_fifo_loopback = 0; + gfx_fifo_loopback = 0; } } - + if (ACCESSING_BITS_24_31) { UINT64 in1, in2; int value = (data >> 24) & 0xff; // used in check_fifo(). fifo loopback or something? - + if (value == 0xc0) - { + { fifo_pop(&space.device(), GFXFIFO_IN, &in1); fifo_pop(&space.device(), GFXFIFO_IN, &in2); gfx_unknown_v1 = (UINT32)(in1 >> 32); - + fifo_push(&space.device(), GFXFIFO_OUT, in1 & 0xffffffff); fifo_push(&space.device(), GFXFIFO_OUT, in2 & 0xffffffff); } else if (value == 0x80) { // used in check_fifo() before the fifo test... - gfx_fifo_loopback = 1; + gfx_fifo_loopback = 1; } else { @@ -1814,23 +1814,23 @@ WRITE64_MEMBER(cobra_state::gfx_unk1_w) WRITE64_MEMBER(cobra_state::gfx_buf_w) { -// printf("buf_w: top = %08X\n", gfxfifo_get_top()); +// printf("buf_w: top = %08X\n", gfxfifo_get_top()); // buf_prc_read: 0x00A00001 0x10520200 // 0x00A00001 0x10500018 - - // teximage_load() / mbuslib_prc_read(): 0x00A00001 0x10520800 -// printf("prc_read %08X%08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data), activecpu_get_pc()); - + // teximage_load() / mbuslib_prc_read(): 0x00A00001 0x10520800 + +// printf("prc_read %08X%08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data), activecpu_get_pc()); + gfx_fifo_exec(this); - + if (data == U64(0x00a0000110500018)) { fifo_flush(GFXFIFO_OUT); - + // reads back the register selected by gfx register select - + fifo_push(&space.device(), GFXFIFO_OUT, (UINT32)((gfx_register[gfx_register_select] >> 32))); fifo_push(&space.device(), GFXFIFO_OUT, (UINT32)(gfx_register[gfx_register_select])); } @@ -1838,15 +1838,15 @@ WRITE64_MEMBER(cobra_state::gfx_buf_w) { // in teximage_load() // some kind of busy flag for mbuslib_tex_ints()... - + // the code waits for bit 0x400 to be set - - fifo_push(&space.device(), GFXFIFO_OUT, 0x400); + + fifo_push(&space.device(), GFXFIFO_OUT, 0x400); } else if (data != U64(0x00a0000110520200)) { // prc_read always expects a value... - + fifo_push(&space.device(), GFXFIFO_OUT, 0); } } @@ -1856,7 +1856,7 @@ static void gfx_cpu_dc_store(const device_t *device, UINT32 address) if (address == 0x10000000 || address == 0x18000000 || address == 0x1e000000) { UINT64 i = (UINT64)(gfx_fifo_cache_addr) << 32; - + fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[0] >> 32) | i); fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[0] >> 0) | i); fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[1] >> 32) | i); @@ -1865,7 +1865,7 @@ static void gfx_cpu_dc_store(const device_t *device, UINT32 address) fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[2] >> 0) | i); fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[3] >> 32) | i); fifo_push(device, GFXFIFO_IN, (UINT32)(gfx_fifo_mem[3] >> 0) | i); - + gfx_fifo_exec(); } else @@ -1875,12 +1875,12 @@ static void gfx_cpu_dc_store(const device_t *device, UINT32 address) } #endif WRITE64_MEMBER(cobra_state::gfx_debug_state_w) -{ +{ if (ACCESSING_BITS_40_47) { gfx_unk_flag = (UINT8)(data >> 40); } - + if (ACCESSING_BITS_56_63) { gfx_debug_state |= decode_debug_state_value((data >> 56) & 0xff) << 4; @@ -1891,14 +1891,14 @@ WRITE64_MEMBER(cobra_state::gfx_debug_state_w) gfx_debug_state |= decode_debug_state_value((data >> 48) & 0xff); gfx_debug_state_wc++; } - + if (gfx_debug_state_wc >= 2) { if (gfx_debug_state != 0) { printf("GFX: debug state %02X\n", gfx_debug_state); } - + gfx_debug_state = 0; gfx_debug_state_wc = 0; } @@ -1936,32 +1936,32 @@ INPUT_PORTS_END //static struct RF5C400interface rf5c400_interface = //{ -// REGION_SOUND1 +// REGION_SOUND1 //}; /* #if ENABLE_MAIN_CPU static ppc_config main_ppc_cfg = { - PPC_MODEL_603EV, - 0x40, - BUS_FREQUENCY_33MHZ + PPC_MODEL_603EV, + 0x40, + BUS_FREQUENCY_33MHZ }; #endif #if ENABLE_SUB_CPU static ppc_config sub_ppc_cfg = { - PPC_MODEL_403GA + PPC_MODEL_403GA }; #endif #if ENABLE_GFX_CPU static ppc_config gfx_ppc_cfg = { - PPC_MODEL_604, - 0x40, - BUS_FREQUENCY_33MHZ, + PPC_MODEL_604, + 0x40, + BUS_FREQUENCY_33MHZ, }; #endif */ @@ -1970,11 +1970,11 @@ static void ide_interrupt(int state) { if (state) { - sub_interrupt &= ~0x80; + sub_interrupt &= ~0x80; } else { - sub_interrupt |= 0x80; + sub_interrupt |= 0x80; } } @@ -2001,13 +2001,13 @@ static MACHINE_CONFIG_START( cobra, cobra_state ) MCFG_CPU_PROGRAM_MAP(cobra_main_map) MCFG_CPU_VBLANK_INT("screen", cobra_vblank) #endif - + #if ENABLE_SUB_CPU MCFG_CPU_ADD("subcpu", PPC403GA, 33000000) /* 403GA, 33? MHz */ //MCFG_CPU_CONFIG(sub_ppc_cfg) MCFG_CPU_PROGRAM_MAP(cobra_sub_map) #endif - + #if ENABLE_GFX_CPU MCFG_CPU_ADD("gfxcpu", PPC604, 100000000) /* 604, 100? MHz */ //MCFG_CPU_CONFIG(gfx_ppc_cfg) @@ -2017,13 +2017,13 @@ static MACHINE_CONFIG_START( cobra, cobra_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) MCFG_MACHINE_RESET( cobra ) - + MCFG_PCI_BUS_ADD("pcibus", 0) MCFG_PCI_BUS_DEVICE(0, NULL, mpc106_pci_r, mpc106_pci_w) - + MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt) - /* video hardware */ + /* video hardware */ MCFG_VIDEO_START(cobra) MCFG_SCREEN_ADD("screen", RASTER) @@ -2036,10 +2036,10 @@ static MACHINE_CONFIG_START( cobra, cobra_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") -// MCFG_SOUND_ADD(RF5C400, 64000000/4) -// MCFG_SOUND_CONFIG(rf5c400_interface) -// MCFG_SOUND_ROUTE(0, "left", 1.0) -// MCFG_SOUND_ROUTE(1, "right", 1.0) +// MCFG_SOUND_ADD(RF5C400, 64000000/4) +// MCFG_SOUND_CONFIG(rf5c400_interface) +// MCFG_SOUND_ROUTE(0, "left", 1.0) +// MCFG_SOUND_ROUTE(1, "right", 1.0) MACHINE_CONFIG_END @@ -2049,33 +2049,33 @@ MACHINE_CONFIG_END static DRIVER_INIT(cobra) { -// cobra_state *cobra = machine.driver_data(); +// cobra_state *cobra = machine.driver_data(); fifo_init(machine, GFXFIFO_IN, 8192, "GFXFIFO_IN", GFXFIFO_IN_VERBOSE); fifo_init(machine, GFXFIFO_OUT, 8192, "GFXFIFO_OUT", GFXFIFO_OUT_VERBOSE); fifo_init(machine, M2SFIFO, 2048, "M2SFIFO", M2SFIFO_VERBOSE); fifo_init(machine, S2MFIFO, 2048, "S2MFIFO", S2MFIFO_VERBOSE); - + #if ENABLE_GFX_CPU -// ppc_set_dcstore_handler(cobra->m_gfxcpu, gfx_cpu_dc_store); - +// ppc_set_dcstore_handler(cobra->m_gfxcpu, gfx_cpu_dc_store); + cobra_gfx_init(&machine); #endif comram[0] = auto_alloc_array(machine, UINT32, 0x40000/4); comram[1] = auto_alloc_array(machine, UINT32, 0x40000/4); - + // rom hacks for main board... { int i; UINT32 sum = 0; UINT32 *rom = (UINT32*)machine.region("user1")->base(); - - //rom[(0x02218^4) / 4] = 0x60000000; // skip connect_grphcpu()... - + + //rom[(0x02218^4) / 4] = 0x60000000; // skip connect_grphcpu()... + rom[(0x2b7c^4) / 4] = 0x60000000; // this fails because the value in ram gets changed too soon... rom[(0x3de8^4) / 4] = 0x48000020; // same here... - + // calculate the checksum of the patched rom... for (i=0; i < 0x20000/4; i++) { @@ -2084,16 +2084,16 @@ static DRIVER_INIT(cobra) sum += (UINT8)((rom[i] >> 8) & 0xff); sum += (UINT8)((rom[i] >> 0) & 0xff); } - + rom[(0x0001fff0^4) / 4] = sum; rom[(0x0001fff4^4) / 4] = ~sum; } - + // rom hacks for sub board... { UINT32 *rom = (UINT32*)machine.region("user2")->base(); - + rom[0x62094 / 4] = 0x60000000; // skip hardcheck()... } @@ -2102,11 +2102,11 @@ static DRIVER_INIT(cobra) { int i; UINT32 sum = 0; - + UINT32 *rom = (UINT32*)machine.region("user3")->base(); - + rom[(0x022d4^4) / 4] = 0x60000000; // skip init_raster() for now ... - + // calculate the checksum of the patched rom... for (i=0; i < 0x20000/4; i++) { @@ -2115,7 +2115,7 @@ static DRIVER_INIT(cobra) sum += (UINT8)((rom[i] >> 8) & 0xff); sum += (UINT8)((rom[i] >> 0) & 0xff); } - + rom[(0x0001fff0^4) / 4] = sum; rom[(0x0001fff4^4) / 4] = ~sum; } @@ -2126,10 +2126,10 @@ static DRIVER_INIT(cobra) ROM_START(bujutsu) ROM_REGION64_BE(0x80000, "user1", 0) /* Main CPU program (PPC603) */ ROM_LOAD("645a01.33d", 0x00000, 0x80000, CRC(cb1a8683) SHA1(77b7dece84dc17e9d63242347b7202e879b9a10e) ) - + ROM_REGION32_BE(0x80000, "user2", 0) /* Sub CPU program (PPC403) */ ROM_LOAD("645a02.24r", 0x00000, 0x80000, CRC(7d1c31bd) SHA1(94907c4068a488a74b2fa9a486c832d380c5b184) ) - + ROM_REGION64_BE(0x80000, "user3", 0) /* Gfx CPU program (PPC604) */ ROM_LOAD("645a03.u17", 0x00000, 0x80000, CRC(086abd0b) SHA1(24df439eb9828ed3842f43f5f4014a3fc746e1e3) ) diff --git a/src/mame/drivers/ecoinf3.c b/src/mame/drivers/ecoinf3.c index d7d9d73dc58..9b18c6ad19d 100644 --- a/src/mame/drivers/ecoinf3.c +++ b/src/mame/drivers/ecoinf3.c @@ -22,13 +22,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pyramid_portmap, AS_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - + AM_RANGE(0x58, 0x58) AM_WRITE(py_port58_out_w) ADDRESS_MAP_END /* static ADDRESS_MAP_START( pyramid_submap, AS_PROGRAM, 8 ) - AM_RANGE(0xe000, 0xffff) AM_ROM + AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END */ @@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( ecoinf3_pyramid, ecoinf3_state ) MCFG_CPU_ADD("maincpu", Z180,4000000) // certainly not a plain z80 at least, invalid opcodes for that MCFG_CPU_PROGRAM_MAP(pyramid_memmap) MCFG_CPU_IO_MAP(pyramid_portmap) - + // sphinx and pyramid on this hw contain a weird rom, looks almost like half a pair for a 16-bit cpu, but contains // what looks like vectors at the end, no idea what it is. //MCFG_CPU_ADD("subcpu", HD6301, 4000000) // ?? diff --git a/src/mame/drivers/ecoinfr.c b/src/mame/drivers/ecoinfr.c index a9845eeb6d4..060dab79d10 100644 --- a/src/mame/drivers/ecoinfr.c +++ b/src/mame/drivers/ecoinfr.c @@ -1,5 +1,5 @@ /* Electrocoin Fruit Machines - + This seems to be the most common Electrocoin hardware type, used extensively by Electrocoin with a number of 3rd party sets running on the same boards / same cabinets to provide different gameplay features. @@ -68,13 +68,13 @@ TIMER_DEVICE_CALLBACK( ecoinfr_irq_timer ) //printf("blah %d\n", state->irq_toggle); /* What are the IRQ sources / freq? - It runs in IM2 - 0xe0 / 0xe4 seem to be the valid interrupts - 0xf0 / 0xf4 mirror those + It runs in IM2 + 0xe0 / 0xe4 seem to be the valid interrupts + 0xf0 / 0xf4 mirror those + + NMI is also valid - NMI is also valid - - */ + */ if (state->irq_toggle==0) { @@ -280,7 +280,7 @@ WRITE8_HANDLER( ec_port15_out_w ) if ((state->port15_value&0x80) != (old_port15_value&0x80)) printf("port15 0x80 changed %02x\n", state->port15_value&0x80); // some 3rd party stuff has VDF - // printf("ec_port15_out_w data %02x - VDF reset %02x clock %02x\n", data, data & 0x80, data & 0x40); + // printf("ec_port15_out_w data %02x - VDF reset %02x clock %02x\n", data, data & 0x80, data & 0x40); } WRITE8_HANDLER( ec_port16_out_w ) @@ -315,7 +315,7 @@ WRITE8_HANDLER( ec_port17_out_w ) if ((state->port17_value&0x80) != (old_port17_value&0x80)) printf("port17 0x80 changed %02x\n", state->port17_value&0x80); // some 3rd party stuff has VDF - // printf("ec_port17_out_w data %02x - VDF data %02x\n", data, data & 0x40); + // printf("ec_port17_out_w data %02x - VDF data %02x\n", data, data & 0x40); } WRITE8_HANDLER( ec_port18_out_w ) @@ -329,7 +329,7 @@ static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xa000) AM_DEVREADWRITE_MODERN(UPD8251_TAG, i8251_device, data_r, data_w) - AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE_MODERN(UPD8251_TAG, i8251_device, status_r, control_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE_MODERN(UPD8251_TAG, i8251_device, status_r, control_w) ADDRESS_MAP_END @@ -587,22 +587,22 @@ static MACHINE_RESET( ecoinfr ) { ecoinfr_state *state = machine.driver_data(); -// state->port00_value = 0x00; -// state->port01_value = 0x00; -// state->port02_value = 0x00; -// state->port03_value = 0x00; -// state->port04_value = 0x00; -// state->port05_value = 0x00; -// state->port06_value = 0x00; -// state->port07_value = 0x00; -// state->port08_value = 0x00; +// state->port00_value = 0x00; +// state->port01_value = 0x00; +// state->port02_value = 0x00; +// state->port03_value = 0x00; +// state->port04_value = 0x00; +// state->port05_value = 0x00; +// state->port06_value = 0x00; +// state->port07_value = 0x00; +// state->port08_value = 0x00; state->port09_value = 0x00; -// state->port0a_value = 0x00; -// state->port0b_value = 0x00; -// state->port0c_value = 0x00; -// state->port0d_value = 0x00; -// state->port0e_value = 0x00; -// state->port0f_value = 0x00; +// state->port0a_value = 0x00; +// state->port0b_value = 0x00; +// state->port0c_value = 0x00; +// state->port0d_value = 0x00; +// state->port0e_value = 0x00; +// state->port0f_value = 0x00; state->port10_value = 0x00; state->port11_value = 0x00; state->port12_value = 0x00; @@ -640,7 +640,7 @@ MACHINE_CONFIG_END ROM_START( ec_barx ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_LOAD( "iss354.rom", 0x0000, 0x008000, CRC(0da15b8e) SHA1(435451f7c428beaacf182d112214482503dec483) ) -// ROM_LOAD( "rom1.bin", 0x0000, 0x008000, CRC(1) SHA1(1) ) // testing only +// ROM_LOAD( "rom1.bin", 0x0000, 0x008000, CRC(1) SHA1(1) ) // testing only ROM_REGION( 0x200000, "altrevs", 0 ) @@ -885,7 +885,7 @@ ROM_START( ec_big7 ) ROM_LOAD( "iss3238.rom", 0x0000, 0x008000, CRC(c7d1d398) SHA1(3b37b9596bc3771a6f1a698bee4dce8d642d982f) ) ROM_LOAD( "iss3239.rom", 0x0000, 0x008000, CRC(f62450a6) SHA1(d2c88483cb0d3a83a2974550e8e8e71642bb28ce) ) -// ROM_LOAD( "sbig7_5_3025.bin", 0x0000, 0x008000, CRC(26c9382a) SHA1(8c4fe06a8e5171e6f2c91b0aee14484aca386a9c) ) // 'Super Big 7' ? +// ROM_LOAD( "sbig7_5_3025.bin", 0x0000, 0x008000, CRC(26c9382a) SHA1(8c4fe06a8e5171e6f2c91b0aee14484aca386a9c) ) // 'Super Big 7' ? ROM_LOAD( "iss3240.rom", 0x0000, 0x008000, CRC(e8e56ca4) SHA1(d16390b600f9966b779638e3bc2e7f9a72e8d1be) ) // 'Super Big 7' ? // No Header - Taken from a Super Big 7 Set @@ -1260,7 +1260,7 @@ ROM_START( ec_supbxmab ) ROM_REGION( 0x200000, "maincpu", 0 ) // use the MAB scramble ROM_LOAD( "sbx1.3v", 0x0000, 0x020000, CRC(375795fb) SHA1(3dbc95aba850ef3e307e6b4c6d58a40a1e8ee8f1) ) - + ROM_REGION( 0x200000, "altrevs", 0 ) ROM_LOAD( "sbx1.6", 0x0000, 0x020000, CRC(e8cfb340) SHA1(d37f0a72c7b59836c5abec8b58066ff4bbd85723) ) ROM_LOAD( "sbx1.9", 0x0000, 0x020000, CRC(521098a1) SHA1(b8e5a05b085015c7b3b5964471a5ee784a3362d7) ) diff --git a/src/mame/drivers/jeutel.c b/src/mame/drivers/jeutel.c index 0ffac4f5c56..65f27d9c329 100644 --- a/src/mame/drivers/jeutel.c +++ b/src/mame/drivers/jeutel.c @@ -12,7 +12,7 @@ public: static ADDRESS_MAP_START( jeutel_map, AS_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( jeutel ) INPUT_PORTS_END @@ -28,7 +28,7 @@ static MACHINE_CONFIG_START( jeutel, jeutel_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 3300000) MCFG_CPU_PROGRAM_MAP(jeutel_map) - + MCFG_MACHINE_RESET( jeutel ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 3437f197845..c425124d6e5 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -5440,7 +5440,7 @@ DRIVER_INIT( j6fbcrz ) GAME( 1995, cluedo, 0, jpmimpct, cluedo, 0, ROT0, "JPM", "Cluedo (prod. 2D)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) GAME( 1995, cluedod, cluedo, jpmimpct, cluedo, 0, ROT0, "JPM", "Cluedo (prod. 2D) (Protocol)",GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) GAME( 1995, cluedo2c, cluedo, jpmimpct, cluedo, 0, ROT0, "JPM", "Cluedo (prod. 2C)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) -GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, 0, ROT0, "JPM", "Cluedo (prod. 2)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) +GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, 0, ROT0, "JPM", "Cluedo (prod. 2)", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE ) GAME( 1996, trivialp, 0, jpmimpct, trivialp, 0, ROT0, "JPM", "Trivial Pursuit (prod. 1D)", GAME_SUPPORTS_SAVE ) GAME( 1996, trivialpd,trivialp,jpmimpct, trivialp, 0, ROT0, "JPM", "Trivial Pursuit (prod. 1D) (Protocol)",GAME_SUPPORTS_SAVE ) GAME( 1997, scrabble, 0, jpmimpct, scrabble, 0, ROT0, "JPM", "Scrabble (rev. F)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c index 79d64a45cdf..d49b5e7d5d1 100644 --- a/src/mame/drivers/maygayep.c +++ b/src/mame/drivers/maygayep.c @@ -4487,9 +4487,9 @@ ROM_START( ep_goldf ) ROM_LOAD16_BYTE( "gfev_arc.g0", 0x00000, 0x020000, CRC(4a9e8304) SHA1(a28938702fdb760185b42a0d6e24bfdb3df4d757) ) ROM_LOAD16_BYTE( "gfev_arc.g1", 0x00001, 0x020000, CRC(96415731) SHA1(3e40358914af0efe1237bd83a48f9e3323e61dea) ) -// ROM_REGION( 0x200000, "altrevs", 0 ) -// ROM_LOAD16_BYTE( "gold_fev.g0", 0x00000, 0x020000, CRC(4a9e8304) SHA1(a28938702fdb760185b42a0d6e24bfdb3df4d757) ) -// ROM_LOAD16_BYTE( "god_fev.g1", 0x00001, 0x020000, CRC(96415731) SHA1(3e40358914af0efe1237bd83a48f9e3323e61dea) ) +// ROM_REGION( 0x200000, "altrevs", 0 ) +// ROM_LOAD16_BYTE( "gold_fev.g0", 0x00000, 0x020000, CRC(4a9e8304) SHA1(a28938702fdb760185b42a0d6e24bfdb3df4d757) ) +// ROM_LOAD16_BYTE( "god_fev.g1", 0x00001, 0x020000, CRC(96415731) SHA1(3e40358914af0efe1237bd83a48f9e3323e61dea) ) MISSING_SOUND ROM_END diff --git a/src/mame/drivers/maygaysw.c b/src/mame/drivers/maygaysw.c index 86765bb6812..0e309dc086b 100644 --- a/src/mame/drivers/maygaysw.c +++ b/src/mame/drivers/maygaysw.c @@ -85,9 +85,9 @@ Guiness Book of Records Risk - London Underground + London Underground Big Break (except the PICs) - Aladdins Cave (except the PICs) + Aladdins Cave (except the PICs) Incomplete dumps? @@ -253,12 +253,12 @@ ROM_START( mg_alad ) ROM_REGION( 0x100000, "snd", 0 ) ROM_LOAD( "d1g1-144.u3", 0x0000, 0x080000, CRC(30941180) SHA1(cafcddcec359c217016bfd86b84b358fc0b1e618) ) - + ROM_REGION( 0x100000, "sound_16c55", 0 ) ROM_LOAD( "sound_16c55.u5", 0x0000, 0x080000, NO_DUMP ) ROM_REGION( 0x100000, "io_16c64", 0 ) ROM_LOAD( "io_16c64.u6", 0x0000, 0x080000, NO_DUMP ) - + ROM_END /* @@ -272,28 +272,28 @@ Dumped by Andy Welburn on a sunny morning 10/03/07 **Do not seperate this text file from the roms.** ************************************************* -filename: label: location type +filename: label: location type ============================================================ -M2_U9.bin Final 4 M2 I/O IOB U9 27C512 -VMB_U6.bin DQ8-002-4 U6 VMB U6 even 27C040 -VMB_U12.bin DQ8-002-4 U12 VMB U12 odd 27C040 -VMB_U4.bin DG8-001-4 U4 VMB U4 even 27C040 -VMB_U10.bin DG8-001-4 U10 VMB U10 odd 27C040 -VMB_U3.bin DG8-001-4 U3 VMB U3 even 27C040 -VMB_U9.bin DG8-001-4 U9 VMB U9 odd 27C040 -VMB_U2.bin DG8-001-4 U2 VMB U2 even 27C040 -VMB_U1.bin DG8-001-4 U1 VMB U1 even 27C040 -VMB_U7.bin DG8-001-4 U7 VMB U7 odd 27C040 -VC_U27.bin SW8-232 NON DATA U27 VC U27 27C010 -VC_U28.bin SW8-232 NON DATA U28 VC U28 27C010 -MSB_U3.bin DIG1-155 U3 MSB U3 27C040 -MSB_U2.bin DIG1-155 U2 MSB U2 27C040 -MSB_U5.bin M2 SOUND PIC Ver 1.0 MSB U5 PIC16C55 -CPU_U6.bin M2 CPU I/O PIC Ver 2.2 CPU U6 PIC16C64 +M2_U9.bin Final 4 M2 I/O IOB U9 27C512 +VMB_U6.bin DQ8-002-4 U6 VMB U6 even 27C040 +VMB_U12.bin DQ8-002-4 U12 VMB U12 odd 27C040 +VMB_U4.bin DG8-001-4 U4 VMB U4 even 27C040 +VMB_U10.bin DG8-001-4 U10 VMB U10 odd 27C040 +VMB_U3.bin DG8-001-4 U3 VMB U3 even 27C040 +VMB_U9.bin DG8-001-4 U9 VMB U9 odd 27C040 +VMB_U2.bin DG8-001-4 U2 VMB U2 even 27C040 +VMB_U1.bin DG8-001-4 U1 VMB U1 even 27C040 +VMB_U7.bin DG8-001-4 U7 VMB U7 odd 27C040 +VC_U27.bin SW8-232 NON DATA U27 VC U27 27C010 +VC_U28.bin SW8-232 NON DATA U28 VC U28 27C010 +MSB_U3.bin DIG1-155 U3 MSB U3 27C040 +MSB_U2.bin DIG1-155 U2 MSB U2 27C040 +MSB_U5.bin M2 SOUND PIC Ver 1.0 MSB U5 PIC16C55 +CPU_U6.bin M2 CPU I/O PIC Ver 2.2 CPU U6 PIC16C64 location: -IOB = M2 Active I/O Board +IOB = M2 Active I/O Board VMB = Video Memory Board VC = Video Card MSB = MPEG Sound Board @@ -301,8 +301,8 @@ CPU = M2 Active CPU Board NOTES: -- Video Memory Board and MPEG Sound Board rom labels were prefixed - with "L/UNDERGROUND", these have been omitted in the table above +- Video Memory Board and MPEG Sound Board rom labels were prefixed + with "L/UNDERGROUND", these have been omitted in the table above to keep it brief. - All Videocard roms were prefixed with LONDON UNDERGROUND - se enclosed jpegs for pictures of the pcb and roms in situ. diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c index 9c1f9ec796d..8b716b7df96 100644 --- a/src/mame/drivers/mpu5.c +++ b/src/mame/drivers/mpu5.c @@ -1784,7 +1784,7 @@ ROM_START( m5gstrik ) ROM_LOAD( "gold_st.p1", 0x0000, 0x080000, CRC(3bb4032f) SHA1(30d9b2160e9fc55b9691abbdfe32be3a548e94fa) ) ROM_LOAD( "gold_st.p2", 0x0000, 0x080000, CRC(b890145f) SHA1(3351fe5926a30bf5b665ebd8bbcaaf5c74b4a218) ) - + ROM_END ROM_START( m5gsstrk ) @@ -3146,7 +3146,7 @@ ROM_START( m5qdraw ) ROM_LOAD16_BYTE( "q_draw_pound8.p1", 0x0000, 0x080000, CRC(e093cb39) SHA1(d1de5249ee72c3ef589c08b712a2bf12b5d77785) ) ROM_LOAD16_BYTE( "q_draw_pound8.p2", 0x0000, 0x080000, CRC(42fad134) SHA1(79d51b4fc3196b7c24ea2ce8bc4b4d3ef0326aa8) ) - + ROM_END ROM_START( m5rainrn ) @@ -3215,7 +3215,7 @@ ROM_START( m5ratpk ) ROM_REGION( 0x400000, "altrevs", 0 ) ROM_LOAD( "rat pack.p1", 0x0000, 0x080000, CRC(1f35dd38) SHA1(2767b168957b6c6eb906137a3d3f19b45f351ada) ) ROM_LOAD( "ratpack.p2", 0x0000, 0x080000, CRC(b038b966) SHA1(b272f741ac3bc0e9c65829246ea28b2384b5f7c0) ) - + ROM_END @@ -5370,7 +5370,7 @@ ROM_START( m5sec7 ) ROM_LOAD16_BYTE( "se__sjh1.8d2", 0x000000, 0x080000, CRC(43a2a1a5) SHA1(3d56a64dc3a8b6625e2590b37df2bfe7b5f7b536) ) ROM_LOAD16_BYTE( "sec_7s.p1", 0x0000, 0x080000, CRC(c0b3b295) SHA1(450af7c534cc7e21ecf8712f77160114925ffaf1) ) ROM_LOAD16_BYTE( "sec_7s.p2", 0x0000, 0x080000, CRC(bd0fa3b8) SHA1(ed5ca97d2f3c5af283db79ee67b3607ebeddb777) ) - + ROM_END diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index b0565cf6f20..8c86ca0e256 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1147,7 +1147,7 @@ #define SS22_MASTER_CLOCK (XTAL_49_152MHz) /* info from Guru */ -#define MCU_SPEEDUP 1 /* mcu idle skipping */ +#define MCU_SPEEDUP 1 /* mcu idle skipping */ /** * helper function used to read a byte from a chunk of 32 bit memory diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index 486767c857e..f7ec5c13f5f 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -1073,7 +1073,7 @@ ROM_END ROM_START( ridheroh ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD16_WORD_SWAP( "006-pg1.p1", 0x000000, 0x080000, BAD_DUMP CRC(52445646) SHA1(647bb31f2f68453c1366cb6e2e867e37d1df7a54) ) /* MB834200 */ - /* Chip label p1h doesn´t exist, renamed temporarly to pg1, marked BAD_DUMP. This needs to be verified. */ + /* Chip label p1h doesn?t exist, renamed temporarly to pg1, marked BAD_DUMP. This needs to be verified. */ ROM_REGION( 0x1000, "mcu", 0 ) /* Hitachi HD6301V1 MCU */ ROM_LOAD( "hd6301v1p.com", 0x0000, 0x1000, NO_DUMP ) @@ -4179,16 +4179,16 @@ ROM_END /* ID range from 100 - 199 is used for Korean (some) and Neo Print carts */ /* - The following ID's are used by Korean releases: - - ID-0122 - Pae Wang Jeon Seol / Legend of a Warrior (Korean censored Samurai Shodown IV) - ID-0123 - Quiz Daisousa Sen - The Last Count Down (Korean release) - ID-0124 - Real Bout Fatal Fury Special / Real Bout Garou Densetsu Special (Korean release) - ID-0134 - The Last Soldier (Korean release of The Last Blade) - ID-0152 - The King of Fighters '99 - Millennium Battle (Korean release) - ID-0163 - Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II) - ID-0187 - Fighters Swords (Korean release of Samurai Shodown III) - ID-0196 - Art of Fighting 3 - The Path of the Warrior (Korean release) + The following ID's are used by Korean releases: + + ID-0122 - Pae Wang Jeon Seol / Legend of a Warrior (Korean censored Samurai Shodown IV) + ID-0123 - Quiz Daisousa Sen - The Last Count Down (Korean release) + ID-0124 - Real Bout Fatal Fury Special / Real Bout Garou Densetsu Special (Korean release) + ID-0134 - The Last Soldier (Korean release of The Last Blade) + ID-0152 - The King of Fighters '99 - Millennium Battle (Korean release) + ID-0163 - Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II) + ID-0187 - Fighters Swords (Korean release of Samurai Shodown III) + ID-0196 - Art of Fighting 3 - The Path of the Warrior (Korean release) */ diff --git a/src/mame/drivers/pluto5.c b/src/mame/drivers/pluto5.c index f29942a1b19..a40dc8e9bd0 100644 --- a/src/mame/drivers/pluto5.c +++ b/src/mame/drivers/pluto5.c @@ -9,8 +9,8 @@ 68340 based system like MPU5/SC4? used by JPM? + Others? Manufactuered by Heber Ltd. - this seems very close to astrafr.c - (although these contain more text) + this seems very close to astrafr.c + (although these contain more text) Known games Club DNA? diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 5fa32ee7920..5cf83305bb3 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -1824,11 +1824,11 @@ YM2151 OKI M6295 VOI2 Z8400A */ -/* Note: some raiden 2 fabtek usa boards (the one Hammad sent to LN and Balrog, at least) have the - ROM_LOAD( "seibu5.u1110", 0x000000, 0x08000, CRC(8f130589) SHA1(e58c8beaf9f27f063ffbcb0ab4600123c25ce6f3) ) - z80 sound rom as used in raiden2a instead of the - ROM_LOAD( "snd.u1110", 0x000000, 0x08000, CRC(f51a28f9) SHA1(7ae2e2ba0c8159a544a8fd2bb0c2c694ba849302) ) - rom from raiden2. Slight version difference, and I don't know which is older/newer. - LN +/* Note: some raiden 2 fabtek usa boards (the one Hammad sent to LN and Balrog, at least) have the + ROM_LOAD( "seibu5.u1110", 0x000000, 0x08000, CRC(8f130589) SHA1(e58c8beaf9f27f063ffbcb0ab4600123c25ce6f3) ) + z80 sound rom as used in raiden2a instead of the + ROM_LOAD( "snd.u1110", 0x000000, 0x08000, CRC(f51a28f9) SHA1(7ae2e2ba0c8159a544a8fd2bb0c2c694ba849302) ) + rom from raiden2. Slight version difference, and I don't know which is older/newer. - LN */ ROM_START( raiden2 ) diff --git a/src/mame/drivers/spectra.c b/src/mame/drivers/spectra.c index 6e7d369d911..3b56b86065a 100644 --- a/src/mame/drivers/spectra.c +++ b/src/mame/drivers/spectra.c @@ -18,7 +18,7 @@ public: static ADDRESS_MAP_START( spectra_map, AS_PROGRAM, 8 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END - + static INPUT_PORTS_START( spectra ) INPUT_PORTS_END @@ -34,7 +34,7 @@ static MACHINE_CONFIG_START( spectra, spectra_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 3579545/4) MCFG_CPU_PROGRAM_MAP(spectra_map) - + MCFG_MACHINE_RESET( spectra ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index eb6c7c0d76a..0b6df18ffe6 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -258,7 +258,7 @@ static WRITE16_HANDLER( lineram_w ) state->m_line_ram[offset] = data; //if(offset == 0x3fff) - // printf("LineRAM go %d\n",(int)space->machine().primary_screen->frame_number()); + // printf("LineRAM go %d\n",(int)space->machine().primary_screen->frame_number()); } static READ16_HANDLER( dspram_r ) @@ -445,7 +445,7 @@ Air Inferno: write to 0x3404 - almost always 0x00fd / 0xff38 (253, -200) write to 0x3408 / -write to 0x341b - May not be numeric - it's weird. stays stable, +write to 0x341b - May not be numeric - it's weird. stays stable, then freaks out just before "quad: unknown value 0066" This function seems to break things up into different polygon 'classes' @@ -477,15 +477,15 @@ static ADDRESS_MAP_START( DSP_map_data, AS_DATA, 16 ) AM_RANGE(0x3404, 0x3404) AM_WRITE(dsp_frustum_left_w) AM_RANGE(0x3405, 0x3405) AM_WRITE(dsp_x_eyecoord_w) AM_RANGE(0x3406, 0x3406) AM_WRITE(dsp_z_eyecoord_w) -// AM_RANGE(0x3407, 0x3407) AM_READ(?) +// AM_RANGE(0x3407, 0x3407) AM_READ(?) AM_RANGE(0x3408, 0x3408) AM_WRITE(dsp_frustum_bottom_w) AM_RANGE(0x3409, 0x3409) AM_WRITE(dsp_y_eyecoord_w) AM_RANGE(0x340a, 0x340a) AM_WRITE(dsp_rasterize_w) /* Just a (lame) guess */ -// AM_RANGE(0x340b, 0x340b) AM_READ(dsp_projection_y_r) -// AM_RANGE(0x3418, 0x341a) AM_WRITE(dsp_sqrt_w) -// AM_RANGE(0x341b, 0x341b) AM_WRITE(dsp_sqrt_r) -// AM_RANGE(0x341c, 0x341c) AM_READ(dsp_sqrt_flags1_r) -// AM_RANGE(0x341d, 0x341d) AM_READ(dsp_sqrt_flags2_r) +// AM_RANGE(0x340b, 0x340b) AM_READ(dsp_projection_y_r) +// AM_RANGE(0x3418, 0x341a) AM_WRITE(dsp_sqrt_w) +// AM_RANGE(0x341b, 0x341b) AM_WRITE(dsp_sqrt_r) +// AM_RANGE(0x341c, 0x341c) AM_READ(dsp_sqrt_flags1_r) +// AM_RANGE(0x341d, 0x341d) AM_READ(dsp_sqrt_flags2_r) AM_RANGE(0x4000, 0x7fff) AM_READWRITE(lineram_r, lineram_w) AM_RANGE(0x8000, 0xffff) AM_READWRITE(dspram_r, dspram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/unkfr.c b/src/mame/drivers/unkfr.c index 0966d87d996..776deca8fa5 100644 --- a/src/mame/drivers/unkfr.c +++ b/src/mame/drivers/unkfr.c @@ -56,10 +56,10 @@ MACHINE_CONFIG_END ROM_START( unkfr ) ROM_REGION( 0x800000, "unkroms", 0 ) -// 3 Of A Kind (Unk) +// 3 Of A Kind (Unk) ROM_LOAD( "3ofakind.bin", 0x0000, 0x008000, CRC(46883c38) SHA1(ab1ffbc437a919e991443d1f5c1b6378b0c8fd53) ) ROM_LOAD( "3ofakindhacked.bin", 0x0000, 0x008000, CRC(94acff35) SHA1(d0e3c7666fb655b1fc20542527e4f55bc25abe0c) ) -// Club 21 (Unk) [c] +// Club 21 (Unk) [c] ROM_LOAD( "club21_1.bin", 0x0000, 0x080000, CRC(826e047c) SHA1(1da8a86688148c184c42ce213239ea2e57cb9e29) ) ROM_LOAD( "club21_2.bin", 0x0000, 0x080000, CRC(75297a19) SHA1(1c7e2b3fccfc79b3fbfbc979d06aef3405fa2aad) ) ROM_LOAD( "club21snd-0.bin", 0x0000, 0x080000, CRC(673551c6) SHA1(d7540388ccc8df6be2ec7a3fa90765f7e6ac49f7) ) @@ -68,19 +68,19 @@ ROM_START( unkfr ) ROM_LOAD( "classic-cops-and-robbers_mtx_ass.bin", 0x0000, 0x010000, CRC(3f40a2c9) SHA1(f73731171c56add1329f3a9d2f84303311d87884) ) // Crystal Maze SWP (Barcrest) [c] (just a bad dump?) ROM_LOAD( "cr2.p8", 0x0000, 0x080000, CRC(9196fc2f) SHA1(844581f2380045019f65b42051535972e6cf21ca) ) -// Each Way Shifter (Barcrest) +// Each Way Shifter (Barcrest) ROM_LOAD( "ews3_3.bin", 0x0000, 0x010000, CRC(fb05345f) SHA1(72183743ec8955b12724471494f19d6af778e4b1) ) // MPU? ROM_LOAD( "ews8.a2", 0x0000, 0x000400, CRC(ee4a4809) SHA1(292a12a5ddc5a22c8568016b34dfec7959f49027) ) //ROM_LOAD( "ews8.az", 0x0000, 0x000400, CRC(ee4a4809) SHA1(292a12a5ddc5a22c8568016b34dfec7959f49027) ) ROM_LOAD( "ews8.b1", 0x0000, 0x000400, CRC(52e9709a) SHA1(0b437834f48ca7718e0b30303916eed00c7fb4c9) ) -// Golden Shot (Empire) +// Golden Shot (Empire) ROM_LOAD( "game_sec.mot", 0x0000, 0x161880, CRC(81ea2ee4) SHA1(8d5fe57c46054c23afdbb3c5c67fd7a7e9161646) ) // Hells Bells Club (Jpm) [c] (looks like it should be sys5 or impact, but code crashes early?) ROM_LOAD( "hbl200p1", 0x0000, 0x010000, CRC(1f893dd8) SHA1(c2dd957f65ff6ed7f7ac027e4edb6b6a36871f88) ) ROM_LOAD( "hbl200p2", 0x0000, 0x010000, CRC(ea470cf6) SHA1(2f64a8aac3bc01245cb4938bb01a5078c360c8d4) ) ROM_LOAD( "hbl200p3", 0x0000, 0x010000, CRC(05c09717) SHA1(25fe309513daef262099aa1f0266f96eafb22d2c) ) ROM_LOAD( "hbl200p4", 0x0000, 0x010000, CRC(a1d299db) SHA1(58f35ecbc524c41f4a39d3374f73f44fc54c751b) ) -// Jokers (MA Leisure) +// Jokers (MA Leisure) ROM_LOAD( "jokers 1v3 (27256)", 0x0000, 0x008000, CRC(8d4222c1) SHA1(d7edc1338448436044c9fbf4448819c7ba1a9cb3) ) // Knight Fever (Empire) (corrupt? ascii/binary mode?) ROM_LOAD( "knight_n_vr105game.bin", 0x0000, 0x04094d, CRC(7a59e3ca) SHA1(fa44dd0fceb53dff38386f81f1e79b605adfbe6a) ) @@ -91,19 +91,19 @@ ROM_START( unkfr ) ROM_LOAD( "knightc_p_vr101.bin", 0x0000, 0x0412e9, CRC(46d57021) SHA1(05a640ca5b7a10e9ae96a02b3ac1f2bc6497f052) ) // LED (Test Rom) (test rom for what?) ROM_LOAD( "ledtest.bin", 0x0000, 0x020000, CRC(c74a0002) SHA1(e475d5c6b3077a2b8e76322c6d0848c622fbd76c) ) -// Lucky Spin (DNCL) +// Lucky Spin (DNCL) ROM_LOAD( "luckyspin.bin", 0x0000, 0x002000, CRC(765bb41b) SHA1(d3f02494c35cce4dfa79dab14a1416ac7e86683c) ) -// Magic Moments (Unk) +// Magic Moments (Unk) ROM_LOAD( "magicmoments20p-6.bin", 0x0000, 0x008000, CRC(c0986a11) SHA1(0333d37d11f8b03e0507ddcefc4a67ea2cba5bd8) ) // Millionaires Row (Bellfruit) (bad?) ROM_LOAD( "millionaires row s16 sound (8meg)", 0x0000, 0x100000, CRC(4086df3f) SHA1(7fd358d901db48d1f8edc4b22789c73b5fb84874) ) ROM_LOAD( "millionaires row s16 v1-0 hi (4meg)", 0x0000, 0x080000, CRC(6b879665) SHA1(79fa91721375f0f968ecbd07fe9e9695344b7cd6) ) ROM_LOAD( "millionaires row s16 v1-0 lo (4meg)", 0x0000, 0x080000, CRC(8436aab9) SHA1(815000121e93c9a8e4f6c6d6d12a06c4484eb50c) ) -// Money Matrix (Bellfruit) +// Money Matrix (Bellfruit) ROM_LOAD( "957179.02.bin", 0x0000, 0x008000, CRC(ee215e94) SHA1(249d16a3ed7b9b6c99b1135f350efcb2ed130865) ) -// More Money (VFS) +// More Money (VFS) ROM_LOAD( "mmchancs.bin", 0x0000, 0x002000, CRC(3eaede51) SHA1(6914fcaed6e51736c6dc725ba82b691803571222) ) -// Nudge Accumulator (Summit Coin) +// Nudge Accumulator (Summit Coin) ROM_LOAD( "na10.bin", 0x0000, 0x000800, CRC(720c747c) SHA1(f371de01d7066ffc9c10e0088dc7c73aa3f7c0be) ) ROM_LOAD( "na11.bin", 0x0000, 0x000800, CRC(993b64b9) SHA1(39c2bdef52a21f91772b06a07a73631ba3f82edc) ) // Oceans Eleven (Empire) (corrupt? ascii/binary mode?) @@ -111,31 +111,31 @@ ROM_START( unkfr ) ROM_LOAD( "oceansb3_p_vr102.bin", 0x0000, 0x03f046, CRC(71824b03) SHA1(540c5497217de70fa4e297a9e866b3311a12d6d6) ) ROM_LOAD( "oceansc_n_vr102.bin", 0x0000, 0x03e88a, CRC(2807cad1) SHA1(4bda5060ce60a3e7ee72f3f50cab2abc00c6ae12) ) ROM_LOAD( "oceansc_p_vr102.bin", 0x0000, 0x03e88a, CRC(14db1bb5) SHA1(be5986aa1340fd21d22f55627e6049b0011be564) ) -// Power Game (Jpm) +// Power Game (Jpm) ROM_LOAD( "pog5.3p1", 0x0000, 0x020000, CRC(62ea507f) SHA1(ea1e2057f3b51ab3f13c7b91467ed3142c64b76a) ) // unmatched 68k rom? ROM_LOAD( "powgam41.bin", 0x0000, 0x004000, CRC(304ccf8c) SHA1(96370bd7d6f7c7218be18e9be2fb87a58a9ac9d4) ) // looks like it should be MPS, but is bad? ROM_LOAD( "powgam42.bin", 0x0000, 0x004000, CRC(a71cc455) SHA1(324a0ef33d0e0fc8bd8a5d1309a3b2e6f13926d6) ) ROM_LOAD( "powgam43.bin", 0x0000, 0x004000, CRC(0661cbcc) SHA1(1d14ec7321e00e837f9cb0da6f660f1a7625b139) ) -// Rainbow Gambler (Unk) +// Rainbow Gambler (Unk) ROM_LOAD( "rambow gambler 2p2 25-7.bin", 0x0000, 0x004000, CRC(4205d5ca) SHA1(ced743a1dee0a6dd1f5a2be8e4bddcd2ec875d23) ) ROM_LOAD( "rambowgambler320.bin", 0x0000, 0x004000, CRC(72415a35) SHA1(822393f300d5fe3932e546dd1f7ec8feda57ebed) ) -// Scoop (Peter Simper) +// Scoop (Peter Simper) ROM_LOAD( "scoopv-2.p1", 0x0000, 0x001000, CRC(e937e298) SHA1(edb4dfb5afd6c2640b6bbd83be591987225bd8fc) ) ROM_LOAD( "scoopv-2.p2", 0x0000, 0x001000, CRC(2a97a254) SHA1(a249e013d86f7e65e43b07ff916c4d0fd5099f44) ) ROM_LOAD( "scoopv-2.p3", 0x0000, 0x001000, CRC(34ab1805) SHA1(1e389e9b47c4b3305ec70c94f49a4e3ca0a6f439) ) -// Shogun (Bellfruit) +// Shogun (Bellfruit) ROM_LOAD( "shogun.bin", 0x0000, 0x008000, CRC(38d25549) SHA1(50ac02b6fdaa0b4960f0de4ed28c8c4d8d23cbcf) ) -// Stars 'n' Bars (Unk) +// Stars 'n' Bars (Unk) ROM_LOAD( "snbars.bin", 0x0000, 0x008000, CRC(199cb8c9) SHA1(08c123f8eb7a239a397558945b00a61a45cb2154) ) -// Talk Of The Town (Unk) +// Talk Of The Town (Unk) ROM_LOAD( "ttown1.bin", 0x0000, 0x001000, CRC(996c435b) SHA1(1fcf5a637cddacd6660da752a1fe10e56a7653c7) ) ROM_LOAD( "ttown2.bin", 0x0000, 0x001000, CRC(93bd6446) SHA1(ef271bb45d27844f0ef1437bbc7f4847f4c0c6ee) ) ROM_LOAD( "ttown3.bin", 0x0000, 0x001000, CRC(0ca34690) SHA1(1734692d82af89272a2243e2c5f584965bfe197f) ) -// Universal Programmer (Unk) +// Universal Programmer (Unk) //ROM_LOAD( "job15r", 0x0000, 0x0092ac, CRC(3c39e49f) SHA1(d45e4c490cf90b707551fd3df21f6e35d326eaf6) ) // text file -// zzz-unk ee2_519a (Unk) +// zzz-unk ee2_519a (Unk) ROM_LOAD( "ee2_519a", 0x0000, 0x030050, CRC(11af495c) SHA1(b035dd622ed8fa8d2e28f05a559c25049e042f67) ) -// zzz_unk 001 (Unk) +// zzz_unk 001 (Unk) ROM_LOAD( "rom1", 0x0000, 0x000400, CRC(1a1f0d76) SHA1(a47addd727460e379f6106e059d43b3fd4e4a34e) ) ROM_LOAD( "rom2", 0x0000, 0x000400, CRC(66ac392f) SHA1(b0e841669fe97c6edbd0b0830dd7dd84e354ef29) ) ROM_LOAD( "rom3", 0x0000, 0x000400, CRC(d02d2983) SHA1(9e9e106083dfea44228ae56e73a3fe7184fdb473) ) @@ -183,59 +183,59 @@ ROM_START( unkfr ) ROM_LOAD( "rom45", 0x0000, 0x000400, CRC(331762cd) SHA1(3cd9f54c18416b626fb0450fb0609ac126306ff0) ) //rom46 = 6.bn galaxbsf Galaxian (bootleg) //rom47 = 5.bn galaxbsf Galaxian (bootleg) -// zzz_unk 017 (Unk) +// zzz_unk 017 (Unk) ROM_LOAD( "misc2.bin", 0x0000, 0x010000, CRC(f9b9cd85) SHA1(ca16f4c8b95d3625918756b9c26a0995f9161dab) ) -// zzz_unk 94cd910 (Unk) +// zzz_unk 94cd910 (Unk) ROM_LOAD( "94cd910", 0x0000, 0x004000, CRC(0340ef85) SHA1(f55dbe86a0d6b16aa62ab7ed922ff83d4fbecb04) ) -// zzz_unk aa31 (Unk) +// zzz_unk aa31 (Unk) ROM_LOAD( "aa31", 0x0000, 0x010000, CRC(2086f3a2) SHA1(13a75b5e0c1533af3e5d255182a7e6ec88d59826) ) -// zzz_unk aladdinprm (Unk) +// zzz_unk aladdinprm (Unk) ROM_LOAD( "aladdinprm", 0x0000, 0x010000, CRC(1a618500) SHA1(4af077bf8f6a74eae20aedf39c2df447670128f4) ) -// zzz_unk all32 (Unk) +// zzz_unk all32 (Unk) ROM_LOAD( "all32", 0x0000, 0x020000, CRC(1d56097c) SHA1(aab18041b39c904113f5f11dc81149abec871a56) ) -// zzz_unk all41meg (Unk) +// zzz_unk all41meg (Unk) ROM_LOAD( "all41meg", 0x0000, 0x020000, CRC(317b61d2) SHA1(52fb22744efda5d236af030bb18f8248a4c19cf8) ) -// zzz_unk all4512 (Unk) +// zzz_unk all4512 (Unk) ROM_LOAD( "all4512", 0x0000, 0x010000, CRC(bf34acb0) SHA1(290307f2bed9d11adb7e91a403c973d3266e04c7) ) -// zzz_unk alladin2 (Unk) +// zzz_unk alladin2 (Unk) ROM_LOAD( "alladin2", 0x0000, 0x020000, CRC(bb8b253b) SHA1(b604a3bcd9db16e84cb5c501cd625ad05a8607dd) ) -// zzz_unk astros_1 (Unk) +// zzz_unk astros_1 (Unk) ROM_LOAD( "07c1t0.400", 0x0000, 0x0271d4, CRC(1c3236c7) SHA1(c6179fff16f9d8472675c307d9ab0bce5a4e17c1) ) ROM_LOAD( "07c1t1.400", 0x0000, 0x027357, CRC(b2cac9b3) SHA1(d39266e68bdbca8ac7f19dd617d8c43670cbbe01) ) ROM_LOAD( "g07n0227.144", 0x0000, 0x0d5676, CRC(b332820b) SHA1(871a6af360c089948082b8859bbd688812425ca6) ) ROM_LOAD( "g07t0227.145", 0x0000, 0x0d581c, CRC(1385cb9f) SHA1(5ecc2854fb82f3a5c17eca381b6f0c02ae0a0e42) ) ROM_LOAD( "g26n0227.242", 0x0000, 0x0d5676, CRC(82679c2f) SHA1(5f45e51b3a5f5f2eea93ace6e9c1c120c9e9c8bb) ) ROM_LOAD( "g26t0227.243", 0x0000, 0x0d5c12, CRC(ab0760b7) SHA1(9dcad1e21d2d7d0e17baca3e20d375dfdcbbbb8a) ) -// zzz_unk bgl01 (Unk) +// zzz_unk bgl01 (Unk) ROM_LOAD( "bgl01", 0x0000, 0x013ee2, CRC(dcc23e51) SHA1(5883c3d0c1cb7a8e11647218310a3f34c9c7c661) ) -// zzz_unk bre (Unk) +// zzz_unk bre (Unk) ROM_LOAD( "bre01", 0x0000, 0x013ee2, CRC(c1abf402) SHA1(526c30271227479877075dd259d20b3ede558d05) ) ROM_LOAD( "bre02", 0x0000, 0x00f6e2, CRC(b7bb7d4c) SHA1(2b9860a6880259d5e96007d09289d30c543cf545) ) ROM_LOAD( "bre03", 0x0000, 0x010ee2, CRC(2ccd60be) SHA1(056611af30fc39b437aca4e81f0d961834b4a6a3) ) ROM_LOAD( "bre04", 0x0000, 0x00f6e2, CRC(2cf7f87c) SHA1(546ac9aae295ce389ecddb87253b6c3e9a6c81ce) ) ROM_LOAD( "bre05", 0x0000, 0x013ee2, CRC(6747a021) SHA1(18f1e671cacdcbbe50289529f3f51446234d794b) ) -// zzz_unk ccc (Unk) +// zzz_unk ccc (Unk) ROM_LOAD( "ccc2", 0x0000, 0x010000, CRC(2df7f687) SHA1(1ee92678944d72577e024ea948c86e89b2035722) ) ROM_LOAD( "ccc3", 0x0000, 0x020000, CRC(7b02d860) SHA1(e3f879f031135bb6f64de3c44022982e4c321cb2) ) -// zzz_unk cdvnv (Unk) +// zzz_unk cdvnv (Unk) ROM_LOAD( "cdvnv12", 0x0000, 0x004000, CRC(f49bb59c) SHA1(21184d068a38556ee06ba046ce5181b86c18234b) ) ROM_LOAD( "cdvr92", 0x0000, 0x004000, CRC(61a8372e) SHA1(74290a034964f921a58a90b497345b4dd271a431) ) -// zzz_unk chf (Unk) +// zzz_unk chf (Unk) ROM_LOAD( "chf01", 0x0000, 0x013ee2, CRC(13fb2a42) SHA1(6f5434136a420d94f51c721fd03c65f268ee238b) ) ROM_LOAD( "chf02", 0x0000, 0x00c6e2, CRC(bb9be889) SHA1(a23bfc224f1d9d5c13d3ef16419c46dde28531f2) ) ROM_LOAD( "chf03", 0x0000, 0x00f6e2, CRC(79fa2dac) SHA1(2ec56feb8d2c38c4c0b59b4bc650daf0d5873f30) ) ROM_LOAD( "chf04", 0x0000, 0x0036e2, CRC(ad6b71d2) SHA1(eec495b25b38e15f2a2bd35d2db8f0a6ecf98d62) ) -// zzz_unk classicsnd (Unk) +// zzz_unk classicsnd (Unk) ROM_LOAD( "classicsnd0.bin", 0x0000, 0x020000, CRC(e23bd795) SHA1(8297256b0ee0c15d304c74ab2b7f8eb4891ff1fa) ) ROM_LOAD( "classicsnd1.bin", 0x0000, 0x020000, CRC(c18ed56f) SHA1(36c2d6df2bf65c6d47500bcd0cfd0e45b5dfeaf4) ) ROM_LOAD( "classicsnd2.bin", 0x0000, 0x020000, CRC(bee8cc32) SHA1(8d8e0087221710476ec9221ec335545739a926f3) ) // zzz_unk classv (Unk) [Rom] SCORPION ROM_LOAD( "classv1.2a.bin", 0x0000, 0x008000, CRC(26930c24) SHA1(2c634171d7e63839b4f8e7f9efcd2924bd38e375) ) ROM_LOAD( "classv1.2b.bin", 0x0000, 0x008000, CRC(9d98d723) SHA1(afc1ae0bfcf6ecfc6eee2583e6fa31aca6e30550) ) -// zzz_unk cro (Unk) +// zzz_unk cro (Unk) ROM_LOAD( "cro01", 0x0000, 0x00f6e2, CRC(58b9481d) SHA1(9bdc54b5ef37fb818a02eb5c839667e0b883852e) ) ROM_LOAD( "cro02", 0x0000, 0x007ee2, CRC(9a6dd9ec) SHA1(a173d65f78d133d319cbc4ac7311f3bbadef0a8d) ) -// zzz_unk csk (Unk) +// zzz_unk csk (Unk) ROM_LOAD( "csk01", 0x0000, 0x00aee2, CRC(8f5eb65c) SHA1(011ffaf8cb1af461688b992e6d161234cf90af78) ) ROM_LOAD( "csk04", 0x0000, 0x007ee2, CRC(d461662c) SHA1(50713d62a67d972d6e47371afe436a4c7f7ea9d5) ) ROM_LOAD( "csk05", 0x0000, 0x0066e2, CRC(dc73a53b) SHA1(85bb964231187fcf38fd0ad83f0cd6f024387331) ) @@ -245,41 +245,41 @@ ROM_START( unkfr ) ROM_LOAD( "csk10", 0x0000, 0x0072e2, CRC(043846e3) SHA1(b55964b71630f14c127412c4c74d85a5de86b287) ) ROM_LOAD( "csk11", 0x0000, 0x008ae2, CRC(7d64ab44) SHA1(2d0e9bc59652a76af2ce75f108f78e45d337b16b) ) ROM_LOAD( "csk12", 0x0000, 0x007ee2, CRC(f77e2605) SHA1(379fa9bdf90f348de453f94a469a505c914cfc30) ) -// zzz_unk ddav (Unk) +// zzz_unk ddav (Unk) ROM_LOAD( "ddav12", 0x0000, 0x002000, CRC(aceba7f4) SHA1(b1e5ae8932fc8fd8ac3eb06b67911fb112fbf808) ) ROM_LOAD( "ddav12&2", 0x0000, 0x002000, CRC(aceba7f4) SHA1(b1e5ae8932fc8fd8ac3eb06b67911fb112fbf808) ) -// zzz_unk dem (Unk) +// zzz_unk dem (Unk) ROM_LOAD( "dem01", 0x0000, 0x00dee2, CRC(71829408) SHA1(cba53dc8882ed0fe7ff06dcf6d8f08ef7668952a) ) ROM_LOAD( "dem02", 0x0000, 0x0066e2, CRC(8887388b) SHA1(72eb781b2ec785db9dcb981643007586bf628c23) ) ROM_LOAD( "dem03", 0x0000, 0x00aee2, CRC(a32ea48d) SHA1(e607e97766f76dd74476815a5248e21f11e8f92e) ) ROM_LOAD( "dem04", 0x0000, 0x0036e2, CRC(86387b3c) SHA1(24021823b135e813a24589a1b81be3c811a3d51f) ) -// zzz_unk demats01 (Unk) +// zzz_unk demats01 (Unk) ROM_LOAD( "demats01", 0x0000, 0x00b4e2, CRC(0c65c583) SHA1(df97306745f7147016e1b85204f3c858d7dc760f) ) -// zzz_unk demgbp01 (Unk) +// zzz_unk demgbp01 (Unk) ROM_LOAD( "demgbp01", 0x0000, 0x00dee2, CRC(d99f7e8b) SHA1(61abbc50353acedc0e99e76d227d6c4c23af3b53) ) -// zzz_unk denlgb01 (Unk) +// zzz_unk denlgb01 (Unk) ROM_LOAD( "denlgb01", 0x0000, 0x016ee2, CRC(afbef1db) SHA1(3a528b80bbbfcb7894df05bc0a7b0d885660f280) ) -// zzz_unk esp (Unk) +// zzz_unk esp (Unk) ROM_LOAD( "esp01", 0x0000, 0x0090e2, CRC(e7ca0bca) SHA1(35591d1d04a0c5edc0a41b07b59579304af07632) ) ROM_LOAD( "esp03", 0x0000, 0x0060e2, CRC(df1322ed) SHA1(a6be1a73dabef045cddd3eef215686d411358cc4) ) ROM_LOAD( "esp04", 0x0000, 0x0060e2, CRC(ebcb9337) SHA1(bf58afd874e7a710ff2c36f242d24f73a8041686) ) ROM_LOAD( "esp05", 0x0000, 0x0030e2, CRC(e4ce8ee7) SHA1(19f253fa47406a98bdf115dcf4607023d2eb0202) ) -// zzz_unk g26n0233 (Unk) +// zzz_unk g26n0233 (Unk) ROM_LOAD( "g26n0233.253", 0x0000, 0x0f3cf6, CRC(d3d98cd7) SHA1(2500dc34b39399cad22b2cff0dd83239b4652790) ) -// zzz_unk game1 (Unk) +// zzz_unk game1 (Unk) ROM_LOAD( "game1", 0x0000, 0x009a0d, CRC(89f6fd63) SHA1(7e87740138a6c6e9502e654dc27ad828fe9b793a) ) -// zzz_unk game2 (Unk) +// zzz_unk game2 (Unk) ROM_LOAD( "game2", 0x0000, 0x009a0d, CRC(bf1f1f02) SHA1(be85da267470435d23f9d61c52a4fc446b73d7e7) ) -// zzz_unk hazelgrove_superleague (Unk) +// zzz_unk hazelgrove_superleague (Unk) ROM_LOAD( "hazelgrove_superleague.bin", 0x0000, 0x002000, CRC(01c09d5e) SHA1(be4c00391c150ef2d7ce56c5e39836fd2d0b92ec) ) -// zzz_unk hgmwb43 (Unk) +// zzz_unk hgmwb43 (Unk) ROM_LOAD( "hgmwb43", 0x0000, 0x008000, CRC(f929fd3a) SHA1(33cc3169eb0bd82d81086aa09679aaaa95fbc6b1) ) -// zzz_unk hog0-03 (Unk) +// zzz_unk hog0-03 (Unk) ROM_LOAD( "hog0-03.u1", 0x0000, 0x080000, CRC(eaa26ab0) SHA1(ee7d76b92c3274ba8c5ba59184bb3334fbbc64c4) ) -// zzz_unk jjrv102 (Unk) +// zzz_unk jjrv102 (Unk) ROM_LOAD( "jjrv1-02.u1", 0x0000, 0x080000, CRC(0f05e392) SHA1(64c885c92fb26c0ed64b8283793cdf86d2bc0e35) ) ROM_LOAD( "jjrv1-02.u2", 0x0000, 0x080000, CRC(1d86f26c) SHA1(e7db51b217e9fb8a0440b7c7591c5ea4142540bc) ) -// zzz_unk jst (Unk) +// zzz_unk jst (Unk) ROM_LOAD( "jst0-05.u1", 0x0000, 0x080000, CRC(38f2d7b0) SHA1(11ccb5b5a35e43f505a7d3ebc36a0694111fed11) ) ROM_LOAD( "jst0-05.u2", 0x0000, 0x080000, CRC(97c14933) SHA1(8515601fbacf76a78a95e4a46a47809fcec021bc) ) ROM_LOAD( "jst0-05d.u1", 0x0000, 0x080000, CRC(31094803) SHA1(b7b5fd97681c38de5e877ca7b09909c82316d4d8) ) @@ -291,77 +291,77 @@ ROM_START( unkfr ) // zzz_unk l7 (Unk) [Rom] LUCKY 7 ASTRA ROM_LOAD( "l7v1-03.bin", 0x0000, 0x080000, CRC(878d1a3d) SHA1(fd7cb08f698bb6bbfed1c57486e53dce062d22e4) ) ROM_LOAD( "l7v1-03d.bin", 0x0000, 0x080000, CRC(91a81e50) SHA1(6086861bd5a53fa17df8b155acd47e9aa45a032d) ) -// zzz_unk ld3_11i (Unk) +// zzz_unk ld3_11i (Unk) ROM_LOAD( "ld3_11i", 0x0000, 0x040000, CRC(b9e7e0a9) SHA1(8cfafa8ec24be030179cc1983586bb03cb4ed44e) ) -// zzz_unk link 3 (Maygay) +// zzz_unk link 3 (Maygay) ROM_LOAD( "oxo_mk3-1.bin", 0x0000, 0x000400, CRC(f20a9cf4) SHA1(c97a125904e96e37e3c54a1ffd3617d7d4e0d48c) ) ROM_LOAD( "oxo_mk3-2.bin", 0x0000, 0x000400, CRC(915c9513) SHA1(7c584fd4c0ae035446cec4515c525a0d0ddb1fd7) ) ROM_LOAD( "oxo_mk3-3.bin", 0x0000, 0x000400, CRC(9d1479d5) SHA1(128bfc1e49a8ca65aa7bea6fc83f781140bfe18d) ) ROM_LOAD( "oxo_mk3-4.bin", 0x0000, 0x000400, CRC(2796991f) SHA1(4bba50509719fff9184cf110cf06394eae880f59) ) -// zzz_unk mal01 (Unk) +// zzz_unk mal01 (Unk) ROM_LOAD( "mal01", 0x0000, 0x007ee2, CRC(4e984428) SHA1(149fc45c4ca183521edf9c03f3e428d92bf1da95) ) -// zzz_unk mc2 (Unk) +// zzz_unk mc2 (Unk) ROM_LOAD( "mc2", 0x0000, 0x008000, CRC(3cf1eba4) SHA1(275d7c8865f80b95f01d7c8eb143aa9f7a918077) ) -// zzz_unk mota-51 (Unk) +// zzz_unk mota-51 (Unk) ROM_LOAD( "mota-51a.p1", 0x0000, 0x020000, CRC(1057ad83) SHA1(5df0bc3956c22ae14699607cebc7003152011a54) ) // zzz_unk nbn 5p (Unk) [Rom] MPU ROM_LOAD( "nbn 5p 1_6_95.bin", 0x0000, 0x010000, CRC(89e960be) SHA1(f97c9062d4d67c11ef4b8b6a97a8d2cc403038b0) ) -// zzz_unk pbm (Unk) +// zzz_unk pbm (Unk) ROM_LOAD( "pbmv0-06.u1", 0x0000, 0x080000, CRC(d0283320) SHA1(472f0e0dd45da61081ca12e466ac02dc82eb4431) ) ROM_LOAD( "pbmv0-06.u2", 0x0000, 0x080000, CRC(38fb2ff6) SHA1(628dcdcbf4767db62b4bdee7b7feff32715e6a2d) ) -// zzz_unk pbs (Unk) +// zzz_unk pbs (Unk) ROM_LOAD( "pbs0-06d.u1", 0x0000, 0x080000, CRC(f24e84d2) SHA1(d54e787c91c79a26383971249f935529e2a492f4) ) ROM_LOAD( "pbs0-06g.u1", 0x0000, 0x080000, CRC(937af673) SHA1(88f33fd3921440a99b662fec7291c8b9845210a5) ) ROM_LOAD( "pbsv0-06.u1", 0x0000, 0x080000, CRC(fbb51b61) SHA1(c1459f8f2d9f182e5be55bbcaf143315f7efc3b0) ) ROM_LOAD( "pbsv0-06.u2", 0x0000, 0x080000, CRC(2f0934de) SHA1(915a16898087f396457d712e3847f4f7c0bd5c06) ) -// zzz_unk pgm (Unk) +// zzz_unk pgm (Unk) ROM_LOAD( "pgm0-04.u1", 0x0000, 0x040000, CRC(2885367c) SHA1(c33cb554889b1f7390baa416a77953f45a80044f) ) ROM_LOAD( "pgm0-04.u2", 0x0000, 0x040000, CRC(c5eed515) SHA1(9b832a6ef301a25bccf2d97cca0c9a012ca0090a) ) ROM_LOAD( "pgm1-00.u1", 0x0000, 0x040000, CRC(1fa4e10f) SHA1(787ec967a9aba5934db79fe67efb32370d2c0258) ) ROM_LOAD( "pgm1-00.u2", 0x0000, 0x040000, CRC(8b5a6178) SHA1(e1f9898ef37877ce50630a468b3c187a4fe253fa) ) -// zzz_unk pgs (Unk) +// zzz_unk pgs (Unk) ROM_LOAD( "pgs0-04d.u1", 0x0000, 0x040000, CRC(1f5ede2c) SHA1(ac67536a021b531efe18027806f1f86504d72493) ) ROM_LOAD( "pgsv0-04.u1", 0x0000, 0x040000, CRC(cb3387be) SHA1(2add224a8839e83cc04901274acc7ca4a781b7d9) ) ROM_LOAD( "pgsv0-04.u2", 0x0000, 0x040000, CRC(63054bd6) SHA1(59cf8dd7efdaf2491a2aca8fbcda2d3b8b70fbf7) ) ROM_LOAD( "pgsv1-00.u1", 0x0000, 0x040000, CRC(725dd2af) SHA1(f8ecd1282809c0906497c62a68429152c10e2da0) ) ROM_LOAD( "pgsv1-00.u2", 0x0000, 0x040000, CRC(067dd0c2) SHA1(ac36aeb63b33969dc0a49150e41bfdd8624072de) ) ROM_LOAD( "pgsv100d.u1", 0x0000, 0x040000, CRC(a6308b3d) SHA1(125ed244bcb7a515dfc9c34c12bc74f8cd50e8dd) ) -// zzz_unk pp (Unk) [Rom] Z80? +// zzz_unk pp (Unk) [Rom] Z80? ROM_LOAD( "pp.p1", 0x0000, 0x001000, CRC(2ab92b46) SHA1(1486751885d832ceb7e936447a9332d69011f62c) ) ROM_LOAD( "pp.p2", 0x0000, 0x001000, CRC(babf8ffa) SHA1(bb148243eac513de83634203393c2e91c9cf98c9) ) ROM_LOAD( "pp.p3", 0x0000, 0x001000, CRC(72cde502) SHA1(c0401810dbc04a6eff5a7795120471f3016ff3bf) ) -// zzz_unk ptm (Unk) +// zzz_unk ptm (Unk) ROM_LOAD( "ptmv0-02.bin", 0x0000, 0x080000, CRC(e9dd8674) SHA1(ace543bc7fea8d09661e76c1ade4e1f27db5a116) ) ROM_LOAD( "ptmv1-04.bin", 0x0000, 0x080000, CRC(32af5358) SHA1(bd61c396824bb2b6845126162c4ff797564ebdf2) ) ROM_LOAD( "ptmv1-13.bin", 0x0000, 0x080000, CRC(4f321735) SHA1(3f9b0b64c42011d948291cd774a922393793a4b1) ) -// zzz_unk ptp (Unk) +// zzz_unk ptp (Unk) ROM_LOAD( "ptp003d.u1", 0x0000, 0x100000, CRC(2b2c05b6) SHA1(541a53c84c07bd7e1f09d4d033cf652ab838b4ef) ) ROM_LOAD( "ptp003g.u1", 0x0000, 0x100000, CRC(d9d0e151) SHA1(35fb4412602b9fd3b66e7170cc1984693b9c9ebd) ) ROM_LOAD( "ptpv003.u1", 0x0000, 0x100000, CRC(07c189da) SHA1(c4574cdedba87058312db84c6ee7f4a7142eea65) ) ROM_LOAD( "ptpv003.u2", 0x0000, 0x100000, CRC(e1f78cf4) SHA1(5f72b2604fd7ee300f6bd5b5a12d98c77b03b9ba) ) -// zzz_unk pts (Unk) +// zzz_unk pts (Unk) ROM_LOAD( "pts1-04d.bin", 0x0000, 0x080000, CRC(95564b9f) SHA1(98091d4badd346578882db75a8d72ddaa810b3f5) ) ROM_LOAD( "pts1-13d.bin", 0x0000, 0x080000, CRC(876232cf) SHA1(5d2355f85bde636dcb6f3dbd87874294db8e1ded) ) ROM_LOAD( "ptsv0-02.bin", 0x0000, 0x080000, CRC(3cc9c022) SHA1(1eb3c237971cf407057d077fd08e4436c765ae43) ) ROM_LOAD( "ptsv1-04.bin", 0x0000, 0x080000, CRC(9cadd42c) SHA1(e6ead7112195a17797672112c7bbd4910ae6eb50) ) ROM_LOAD( "ptsv1-13.bin", 0x0000, 0x080000, CRC(8e99ad7c) SHA1(d4cfce825b4a718a12d80e79ed943797c6510ad6) ) -// zzz_unk r92rvcd (Unk) +// zzz_unk r92rvcd (Unk) ROM_LOAD( "r92rvcd", 0x0000, 0x004000, CRC(b723db47) SHA1(bda42bb79b9ff15d68dc9868a40f5de2481f129e) ) -// zzz_unk sburgf2 (Unk) +// zzz_unk sburgf2 (Unk) ROM_LOAD( "sburgf2", 0x0000, 0x008000, CRC(c94bb9b6) SHA1(d0b1e1c6152c1be30cba5790c2e984625822504b) ) -// zzz_unk sghost (Unk) +// zzz_unk sghost (Unk) ROM_LOAD( "sghost", 0x0000, 0x010000, CRC(7c453739) SHA1(05724cb23b711a0e4546435622eb6b6ef1ac6894) ) -// zzz_unk shuffle (Unk) +// zzz_unk shuffle (Unk) ROM_LOAD( "shuffle1.1", 0x0000, 0x000400, CRC(2eec7c4d) SHA1(a1740d27e60192659392ba7602b9b62947c4f6db) ) ROM_LOAD( "shuffle1.3", 0x0000, 0x000400, CRC(4084c605) SHA1(b75320c042d3df79fbd8256dc82267bce09b26cc) ) -// zzz_unk sl101a (Unk) +// zzz_unk sl101a (Unk) ROM_LOAD( "sl101a.p1", 0x0000, 0x020000, CRC(7f25fa07) SHA1(9d45993f518bd3a6e54ffd358bef937773ac595e) ) -// zzz_unk slcd31 (Unk) +// zzz_unk slcd31 (Unk) ROM_LOAD( "slcd31", 0x0000, 0x004000, CRC(e07d8a66) SHA1(9f7ed1566e7e4797a3c34d651c79d0fd8d0a8929) ) // zzz_unk smn (Unk) [Rom] SCP ROM_LOAD( "smn3v3ih", 0x0000, 0x010000, CRC(97956ceb) SHA1(c833b1efad6058bd7325a4312174bd182609617f) ) ROM_LOAD( "smn3v3il", 0x0000, 0x010000, CRC(ddde0b8c) SHA1(093c195bde8710b064be54f7913568fcc8834f6e) ) -// zzz_unk sov (Unk) +// zzz_unk sov (Unk) ROM_LOAD( "sov0-03.u1", 0x0000, 0x080000, CRC(4e2e7a79) SHA1(77f32b43d2e01cb0223feccb9e29c3fde0a6e9b7) ) ROM_LOAD( "sov0-03.u2", 0x0000, 0x080000, CRC(1ef8712a) SHA1(1a2ef378679384e720e5b20f1420454102f18258) ) ROM_LOAD( "sov0-03d.u1", 0x0000, 0x080000, CRC(47d5e5ca) SHA1(d3624a8b8545f67d14bee90bc3967c13b8497e5b) ) @@ -369,14 +369,14 @@ ROM_START( unkfr ) ROM_LOAD( "srat1d", 0x0000, 0x020000, CRC(46683be4) SHA1(2b4c04526f0124c239ec5653aaa49a3f11ba5000) ) ROM_LOAD( "srat5d", 0x0000, 0x020000, CRC(d0f20a9c) SHA1(b3666e8d1063fed05a7f10c99f33a4dce26bf670) ) ROM_LOAD( "srat6d", 0x0000, 0x020000, CRC(b023a84e) SHA1(f78a55348d0bbae59e10e47fedb30bdd27205b80) ) -// zzz_unk starltv2 (Unk) +// zzz_unk starltv2 (Unk) ROM_LOAD( "starltv2", 0x0000, 0x004000, CRC(b0d418b1) SHA1(c1363578130bf9d30afb71a4c9b3e6988feb1128) ) // zzz_unk tempson (Unk) [Rom] SOUND ROM_LOAD( "tempson.p1", 0x0000, 0x080000, CRC(6a3beebe) SHA1(66bc8e388003c597587fc5fab7653bb2d4b1c815) ) ROM_LOAD( "tempson.p2", 0x0000, 0x080000, CRC(3282bbfd) SHA1(2165a8a28cc6d47e99d84d660ba9ec3bb1a69aeb) ) -// zzz_unk turbowks (Unk) +// zzz_unk turbowks (Unk) ROM_LOAD( "turbowks", 0x0000, 0x000e92, CRC(0a828093) SHA1(ec755638bf25d4a38378cbbc5cf31a2c15f2cf98) ) -// zzz_unk wb (Unk) +// zzz_unk wb (Unk) ROM_LOAD( "wb10", 0x0000, 0x002000, CRC(4cdf2dc1) SHA1(06776428afe4f19c578f4167585d8183bfafb915) ) ROM_LOAD( "wb10&5wz", 0x0000, 0x002000, CRC(4cdf2dc1) SHA1(06776428afe4f19c578f4167585d8183bfafb915) ) ROM_LOAD( "wb11", 0x0000, 0x002000, CRC(4a16d4d2) SHA1(8e7fa08e769e88eaa429ae14f203f3b707897822) ) @@ -396,7 +396,7 @@ ROM_START( unkfr ) ROM_LOAD( "wishsound1.bin", 0x0000, 0x080000, CRC(4c8fe9e5) SHA1(9046413c885454e1942c0b92b647598a660f3487) ) ROM_LOAD( "wishsound2.bin", 0x0000, 0x080000, CRC(c5a91e30) SHA1(b7e4d78ce11bace2ae2bf30db7e5c6b4ebfe6c62) ) ROM_LOAD( "wishsound3.bin", 0x0000, 0x080000, CRC(b9911a66) SHA1(782513afa16c0efc71cff467a1f055f1590674d5) ) -// Accepter GBA (Jpm) +// Accepter GBA (Jpm) ROM_LOAD( "58c1.190", 0x0000, 0x0269fe, CRC(140592da) SHA1(0362d6b7d0e21a1593f3c89ce5c06072e93ec93c) ) ROM_LOAD( "58r1.190", 0x0000, 0x0269fe, CRC(73e09e0e) SHA1(be57518033bbc1492953d8552c5a617a9977294f) ) ROM_LOAD( "58s.190", 0x0000, 0x0269fe, CRC(e965c0a1) SHA1(dd0a377fbcb257d9a1de39ffc52a4c34fe17ba2e) ) @@ -405,34 +405,34 @@ ROM_START( unkfr ) ROM_LOAD( "showtime.bin", 0x0000, 0x010000, CRC(75cb4ebf) SHA1(24e56f00502628332130b56a93847436d7125f46) ) ROM_LOAD( "bt6-c4_0.bin", 0x0000, 0x010000, CRC(74070e83) SHA1(42ffffb62ea74eaa8d3938dee45b5beaca64a320) ) ROM_LOAD( "club-wild-west_std_ac_var_ffp_ass1.bin", 0x0000, 0x010000, CRC(2f639748) SHA1(95ddc75bd475789ff4bb48c678f72c081cc85f92) ) -// Brain Box (Bellfruit) +// Brain Box (Bellfruit) ROM_LOAD( "bbb10.bin", 0x0000, 0x010000, CRC(76d061ba) SHA1(d2d5cb9c24ef04a13c649781fe7c67b13415aa4b) ) -// Brain Box 2 (Bellfruit) +// Brain Box 2 (Bellfruit) ROM_LOAD( "39360122.p1", 0x0000, 0x008000, CRC(949778b3) SHA1(b40e2ca1bfe91b93165df38ddf84a1d5a6cf6ce2) ) ROM_LOAD( "39361122.p1", 0x0000, 0x008000, CRC(597bea46) SHA1(23cb9ce90508525c84befefafc171841989f6c38) ) ROM_LOAD( "bboxint", 0x0000, 0x008000, CRC(ecd2a1d1) SHA1(f9e77fb63f20748f644ab270b56a68e9e53b77f9) ) -// Cash Attraction (Bellfruit) +// Cash Attraction (Bellfruit) ROM_LOAD( "95727239.bin", 0x0000, 0x008000, CRC(e3f28981) SHA1(9e56a05fab5aad60d07e18ad1d2ef75cfeb41229) ) -// Flash Back (Bellfruit) +// Flash Back (Bellfruit) ROM_LOAD( "958400.54 20p 6.bin", 0x0000, 0x008000, CRC(13410929) SHA1(e5414ec8fef29de8c5ae3368aa6af22c03cdc592) ) ROM_LOAD( "958400.55 20p 6.bin", 0x0000, 0x008000, CRC(cc449195) SHA1(4b4b0263748657ca76607653e878938814569a89) ) -// Grid Runner (Global) +// Grid Runner (Global) ROM_LOAD( "gddl2-4n.p1", 0x0000, 0x020000, CRC(95e4e432) SHA1(ca3ce326da792a19075d89c957e5661513ed0e0d) ) -// Hi Noon (Jpm) +// Hi Noon (Jpm) ROM_LOAD( "hino-snd.bin", 0x0000, 0x080000, CRC(cf93186d) SHA1(5d190e24d702bbb396d69497b71e9a8ac51e6c6f) ) -// James Bond - Licence To Kill (Maygay) +// James Bond - Licence To Kill (Maygay) ROM_LOAD( "james_bond_1.1", 0x0000, 0x01681e, CRC(964d3721) SHA1(6a4e893e0dc0542a3ab81246a40392f927acaffe) ) -// Loto (Maygay) [Spain] +// Loto (Maygay) [Spain] ROM_LOAD( "sj6-586", 0x0000, 0x020641, CRC(853c0c9c) SHA1(42465d15336fe81885f32ea8522a5331fc2d49de) ) -// Lucky Strike (Barcrest) +// Lucky Strike (Barcrest) ROM_LOAD( "lstrikesnd-p1.bin", 0x0000, 0x020000, CRC(0c8f9dcd) SHA1(026be80620bd4afc3e45cb7a374b93fff4c13dd2) ) ROM_LOAD( "lstrikesnd-p2.bin", 0x0000, 0x020000, CRC(2a746ba5) SHA1(7f9d727a849a7a1ecfd750f214deef150ec3d9eb) ) -// Monte Carlo (Ace) +// Monte Carlo (Ace) ROM_LOAD( "monte_carlo_1.1", 0x0000, 0x168095, CRC(96f09fe9) SHA1(1fc2ad662c7e90d580cc9f9753fa6fc48f955636) ) ROM_LOAD( "monte_carlo_1.2", 0x0000, 0x168095, CRC(ea4a8a60) SHA1(dff6f043c0ee2921367689394b73b221336cdc98) ) ROM_LOAD( "monte_carlo_1.3", 0x0000, 0x168095, CRC(2628d037) SHA1(8754b9e40a5f815b68b4c341705e587d25db710d) ) ROM_LOAD( "monte_carlo_1.4", 0x0000, 0x168095, CRC(f9486358) SHA1(868aef1983855e028ed3d4f4996b393774427c13) ) -// Note Acceptor Firmware (Misc) +// Note Acceptor Firmware (Misc) ROM_LOAD( "ara01", 0x0000, 0x00f6e2, CRC(54ddfb81) SHA1(b1e84ff1afdce40925558d6e454bea7444e59851) ) ROM_LOAD( "ara02", 0x0000, 0x00c6e2, CRC(043f2326) SHA1(69deef6226c9a55c7ed3a404860de38785157add) ) ROM_LOAD( "ara05", 0x0000, 0x00c6e2, CRC(64c3051e) SHA1(0fdaa125f78476f67308ecb2ca3f89f709dc1bb7) ) @@ -583,41 +583,41 @@ ROM_START( unkfr ) ROM_LOAD( "veb01", 0x0000, 0x00c6e2, CRC(c3139d53) SHA1(274f80094682a041887ee8cade48ee76d6467950) ) ROM_LOAD( "zar03", 0x0000, 0x00f6e2, CRC(96a2a431) SHA1(7817bd3d53d62d6253068b2a14189a56d019dbc0) ) ROM_LOAD( "zwd01", 0x0000, 0x0066e2, CRC(d1897ea7) SHA1(1824d4e765216b5a1d62bcff70574dbebaf30c1d) ) -// Quintoon (Bellfruit) +// Quintoon (Bellfruit) ROM_LOAD( "95750231.bin", 0x0000, 0x010000, CRC(1227367f) SHA1(b6249db6b3a814fed1cf11713b70a17be8d6e3d0) ) ROM_LOAD( "qublcy351rp.bin", 0x0000, 0x080000, CRC(bd6b0c8b) SHA1(a79626de03e5e432f81eb93ff2dc38a7510733ba) ) -// Rhythm & Blues (Jpm) +// Rhythm & Blues (Jpm) ROM_LOAD( "rhythm_&_blues1.1", 0x0000, 0x01681e, CRC(d7092860) SHA1(765621bd4c487ff20cccd70c6d2d514109cb83c4) ) ROM_LOAD( "rhythm_&_blues1.2", 0x0000, 0x01681e, CRC(1fc40a07) SHA1(2d8f50fc1f01fcdc737c42608c98d4b6abccb3c1) ) -// Scrabble (Jpm) +// Scrabble (Jpm) ROM_LOAD( "scravfp1", 0x0000, 0x080000, CRC(e1941639) SHA1(ae8e5428eb28edba5bd25f496479d8e3e9b00d86) ) //Ver F. same as we already have? -// Terrance & Phillip (Bootleg) +// Terrance & Phillip (Bootleg) ROM_LOAD( "terranceandphillipsound.bin", 0x0000, 0x04fcc3, CRC(f614112e) SHA1(a628d785bb9e8e3747b1f55be3b23eca0dd058ab) ) -// Thriller (Jpm) +// Thriller (Jpm) ROM_LOAD( "thriller_2.1", 0x0000, 0x01681e, CRC(bff1defe) SHA1(83f95c7448ea2023bf640b59570b852c70c0ca08) ) -// Treble Top (Bellfruit) +// Treble Top (Bellfruit) ROM_LOAD( "ttpcob.pa", 0x0000, 0x010000, CRC(391181d4) SHA1(42c499ae78f38ccfec572701b3c99b7cf200ff98) ) -// zzz_unk 004 (Unk) +// zzz_unk 004 (Unk) ROM_LOAD( "nolabel.rom", 0x0000, 0x000800, CRC(273a140c) SHA1(ea4962e1c9aa3e593b8d5b2b3eed1b791cda74a6) ) -// zzz_unk 326s (Project) +// zzz_unk 326s (Project) ROM_LOAD( "326-s-01.001", 0x0000, 0x080000, CRC(5a23e17e) SHA1(e664da5213ca572288193101e4a33ac8bc3d553b) ) -// zzz_unk cmz (Barcrest) +// zzz_unk cmz (Barcrest) ROM_LOAD( "cmzic10", 0x0000, 0x080000, CRC(2a66564c) SHA1(52665fbc88a1e3e0fa2dfd1d846c99c1f8055bd8) ) ROM_LOAD( "cmzic9", 0x0000, 0x080000, CRC(5db969e0) SHA1(768ba1dbf014d8efceb9c63aeb0edd107c5753de) ) -// zzz_unk fred (Barcrest) +// zzz_unk fred (Barcrest) ROM_LOAD( "fred.bin", 0x0000, 0x000c1b, CRC(cf46223b) SHA1(dcf5d0c310b8ccc2783d4d7a80ce496d7ecd0d56) ) -// zzz_unk joker (Unk) +// zzz_unk joker (Unk) ROM_LOAD( "joker03.u1", 0x0000, 0x080000, CRC(a3dd15e8) SHA1(95d04de6c991b3c1ff43b0f477f03213e83f63f2) ) ROM_LOAD( "joker03.u2", 0x0000, 0x080000, CRC(57b3305a) SHA1(c38bc7db6c9a3f8f5371bb4c555333404fed6a9f) ) ROM_LOAD( "jokr03d.u1", 0x0000, 0x080000, CRC(aa268a5b) SHA1(cce89dbaaaf2d44daf127de1ad6d621c46d892fc) ) ROM_LOAD( "jokr03g.u1", 0x0000, 0x080000, CRC(cb12f8fa) SHA1(7a9c9fe72b70fe1b4a3be2edfde9d7a54d7a8219) ) -// zzz_unk lahroc5 (Electrocoin) +// zzz_unk lahroc5 (Electrocoin) ROM_LOAD( "lahroc5", 0x0000, 0x010000, CRC(94102fdd) SHA1(b741fe7a646225351148f5e675bd232881730221) ) -// zzz_unk pgsnd (Maygay) +// zzz_unk pgsnd (Maygay) ROM_LOAD( "pgsnd", 0x0000, 0x080000, CRC(c1d5a1f1) SHA1(8b7ded8aa4a84310d08c1438d0d91a28e1d95a21) ) -// zzz_unk sil (Barcrest) +// zzz_unk sil (Barcrest) ROM_LOAD( "sil", 0x0000, 0x002000, CRC(1f8a48d2) SHA1(143c2474af9469a753bbf0e82e8e6f4f88e4d38f) ) - ROM_LOAD( "sil.p4", 0x0000, 0x002000, CRC(72f49fe9) SHA1(d6bb31d830fe125912e73cfcdc6b4e32027c45cc) ) + ROM_LOAD( "sil.p4", 0x0000, 0x002000, CRC(72f49fe9) SHA1(d6bb31d830fe125912e73cfcdc6b4e32027c45cc) ) ROM_END @@ -656,7 +656,7 @@ ROM_START( unkfra ) //ROM_LOAD( "gia_gems.p2", 0x0000, 0x080000, CRC(7824adf5) SHA1(99b59d28adb80d5cf3d70691cc134eba72288f20) ) ROM_LOAD( "gimme_st.p1", 0x0000, 0x080000, CRC(d5df19b3) SHA1(3efdff2894f6edcae1121a63c654b7d58bd378c0) ) ROM_LOAD( "h hop.p1", 0x0000, 0x080000, CRC(71c3549f) SHA1(7b98acd3ce9d72dbbef573330d3206d9af60c15e) ) -// ROM_LOAD( "hbrk_hot.txt", 0x0000, 0x0000ff, CRC(c95eecc8) SHA1(fd3e5658028ab39622e761445d72ed110da3e091) ) +// ROM_LOAD( "hbrk_hot.txt", 0x0000, 0x0000ff, CRC(c95eecc8) SHA1(fd3e5658028ab39622e761445d72ed110da3e091) ) ROM_LOAD( "horn_0f.p1", 0x0000, 0x080000, CRC(c01732dd) SHA1(6b157ad01535d8c7bbf6c3b2db96e7fed271f5f9) ) ROM_LOAD( "horn_of.p2", 0x0000, 0x080000, CRC(8b270edf) SHA1(0d6011bdd4c38f97813dae187bf2c67f09066de5) ) ROM_LOAD( "hot_rock.p1", 0x0000, 0x080000, CRC(cef5b5ae) SHA1(1ed34ea307c40bdfd0ea7296b9a2be4d3ecc796c) ) diff --git a/src/mame/drivers/white_mod.c b/src/mame/drivers/white_mod.c index 1fb5f6673ee..d645c654942 100644 --- a/src/mame/drivers/white_mod.c +++ b/src/mame/drivers/white_mod.c @@ -3011,7 +3011,7 @@ ROM_START(sopranos) ROM_END ROM_START(sopranos_400) ROM_REGION(0x80000, "user1", 0) - ROM_LOAD("sopcpua.400", 0x00000, 0x20000, CRC(68efcf24) SHA1(9ef30808260f96fb19067ee473add0c43dd6180e)) + ROM_LOAD("sopcpua.400", 0x00000, 0x20000, CRC(68efcf24) SHA1(9ef30808260f96fb19067ee473add0c43dd6180e)) ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) @@ -3279,7 +3279,7 @@ ROM_START(sopranol) ROM_END ROM_START(sopranol_400) ROM_REGION(0x80000, "user1", 0) - ROM_LOAD( "sopcpul.400", 0x0000, 0x20000, CRC(7fe54359) SHA1(cb00318484ad1e30ab86c3a239fd2ea322aa945e)) + ROM_LOAD( "sopcpul.400", 0x0000, 0x20000, CRC(7fe54359) SHA1(cb00318484ad1e30ab86c3a239fd2ea322aa945e)) ROM_RELOAD(0x20000, 0x20000) ROM_RELOAD(0x40000, 0x20000) ROM_RELOAD(0x60000, 0x20000) diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 3a1e4cf4da1..bc80ec503a0 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -45,7 +45,7 @@ public: UINT16 * m_backregs; bitmap_t *m_framebuffer[2]; - + /* 3d info */ INT16 m_frustumLeft; INT16 m_frustumBottom; diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 7bea9c27504..eda26b70457 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -12656,6 +12656,7 @@ ep_cascz // Casino Crazy (Global) ep_wside // Wildside (Global) ep_goldf // Gold Fever (Impulse) ep_imj // I'm A Jackpot (Global) +ep_itj3a // MPU2 diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index c6b2539a1db..c206d822a4e 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -375,8 +375,8 @@ WRITE16_HANDLER( dsp_flags_w ) bitmap_fill(state->m_framebuffer[1], &cliprect, 0); /* copy buffer fb into screen fb (at this stage we are ready to draw) */ copybitmap_trans(state->m_framebuffer[1], state->m_framebuffer[0], 0, 0, 0, 0, &cliprect, 0); - /* now clear buffer fb */ - bitmap_fill(state->m_framebuffer[0], &cliprect, 0); + /* now clear buffer fb */ + bitmap_fill(state->m_framebuffer[0], &cliprect, 0); } /* if offset 0x3001 OR 0x3002 we put data in the buffer fb */ @@ -460,8 +460,8 @@ void multVecMtx(const INT16* vec4, const float* m, float* result) #undef M } -void projectEyeCoordToScreen(float* projectionMatrix, - const int xRes, const int yRes, +void projectEyeCoordToScreen(float* projectionMatrix, + const int xRes, const int yRes, INT16* eyePoint3d, int* result) { @@ -473,7 +473,7 @@ void projectEyeCoordToScreen(float* projectionMatrix, /* Coordinate system flip */ eyePoint3d[0] *= -1; - + /* Nothing fancy about this homogeneous worldspace coordinate */ eyePoint3d[3] = 1; @@ -525,8 +525,8 @@ WRITE16_HANDLER( dsp_rasterize_w ) airInfernoFrustum(state->m_frustumLeft, state->m_frustumBottom, m); int result[2]; - projectEyeCoordToScreen(m, - 32*16, /* These are defined in the machine ctor */ + projectEyeCoordToScreen(m, + 32*16, /* These are defined in the machine ctor */ 28*16, /* not sure how to get them here or if they're even correct */ state->m_eyecoordBuffer, result); diff --git a/src/version.c b/src/version.c index d98e20ccedf..0c0a2d669c3 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.143u4 ("__DATE__")"; +const char build_version[] = "0.143u5 ("__DATE__")"; -- cgit v1.2.3