Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups and version bump.

Browse Source
This commit is contained in:
Aaron Giles 2009-08-29 23:18:28 +00:00
parent a86f8758fc
commit 5df39c5473
20 changed files with 270 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/emu/cpu/superfx/superfx.c
View File

@ -619,19 +619,19 @@ static void superfx_add_clocks_internal(superfx_state *cpustate, INT32 clocks)
{ {
//printf( "superfx_add_clocks: %d\n", clocks); //printf( "superfx_add_clocks: %d\n", clocks);
/* /*
if(cpustate->romcl) if(cpustate->romcl)
{ {
printf( "ROM is accessing\n" ); printf( "ROM is accessing\n" );
printf( "romcl = %d, -= MIN(%d, %d) (= %d)\n", cpustate->romcl, clocks, cpustate->romcl, MIN(clocks, cpustate->romcl)); printf( "romcl = %d, -= MIN(%d, %d) (= %d)\n", cpustate->romcl, clocks, cpustate->romcl, MIN(clocks, cpustate->romcl));
cpustate->romcl -= MIN(clocks, cpustate->romcl); cpustate->romcl -= MIN(clocks, cpustate->romcl);
if(cpustate->romcl == 0) if(cpustate->romcl == 0)
{ {
cpustate->sfr &= ~SUPERFX_SFR_R; cpustate->sfr &= ~SUPERFX_SFR_R;
printf( "superfx_op_read: reading from rom, calling superfx_bus_read: %08x\n", (cpustate->rombr << 16) + cpustate->r[14] ); printf( "superfx_op_read: reading from rom, calling superfx_bus_read: %08x\n", (cpustate->rombr << 16) + cpustate->r[14] );
cpustate->romdr = superfx_bus_read(cpustate, (cpustate->rombr << 16) + cpustate->r[14]); cpustate->romdr = superfx_bus_read(cpustate, (cpustate->rombr << 16) + cpustate->r[14]);
} }
} }
*/ */
if(cpustate->ramcl) if(cpustate->ramcl)
{ {

2
src/emu/sound/discrete.h
View File

@ -4417,7 +4417,7 @@ enum
#define DISCRETE_TASK_END3(BNODE1,BNODE2,BNODE3) { NODE_SPECIAL, DSO_TASK_END , 3, { BNODE1,BNODE2,BNODE3 }, { BNODE1,BNODE2,BNODE3 }, NULL, "DISCRETE_TASK_END3" }, #define DISCRETE_TASK_END3(BNODE1,BNODE2,BNODE3) { NODE_SPECIAL, DSO_TASK_END , 3, { BNODE1,BNODE2,BNODE3 }, { BNODE1,BNODE2,BNODE3 }, NULL, "DISCRETE_TASK_END3" },
#define DISCRETE_TASK_END4(BNODE1,BNODE2,BNODE3,BNODE4) { NODE_SPECIAL, DSO_TASK_END , 4, { BNODE1,BNODE2,BNODE3,BNODE4 }, { BNODE1,BNODE2,BNODE3,BNODE4 }, NULL, "DISCRETE_TASK_END4" }, #define DISCRETE_TASK_END4(BNODE1,BNODE2,BNODE3,BNODE4) { NODE_SPECIAL, DSO_TASK_END , 4, { BNODE1,BNODE2,BNODE3,BNODE4 }, { BNODE1,BNODE2,BNODE3,BNODE4 }, NULL, "DISCRETE_TASK_END4" },
#define DISCRETE_TASK_END5(BNODE1,BNODE2,BNODE3,BNODE4,BNODE5) { NODE_SPECIAL, DSO_TASK_END , 5, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, NULL, "DISCRETE_TASK_END5" }, #define DISCRETE_TASK_END5(BNODE1,BNODE2,BNODE3,BNODE4,BNODE5) { NODE_SPECIAL, DSO_TASK_END , 5, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, { BNODE1,BNODE2,BNODE3,BNODE4,BNODE5 }, NULL, "DISCRETE_TASK_END5" },
//#define DISCRETE_TASK_SYNC() { NODE_SPECIAL, DSO_TASK_SYNC, 0, { 0 }, { 0 }, NULL, "DISCRETE_TASK_SYNC" }, //#define DISCRETE_TASK_SYNC() { NODE_SPECIAL, DSO_TASK_SYNC, 0, { 0 }, { 0 }, NULL, "DISCRETE_TASK_SYNC" },
/* output */ /* output */
#define DISCRETE_OUTPUT(OPNODE,GAIN) { NODE_SPECIAL, DSO_OUTPUT , 2, { OPNODE,NODE_NC }, { 0,GAIN }, NULL, "DISCRETE_OUTPUT" }, #define DISCRETE_OUTPUT(OPNODE,GAIN) { NODE_SPECIAL, DSO_OUTPUT , 2, { OPNODE,NODE_NC }, { 0,GAIN }, NULL, "DISCRETE_OUTPUT" },

4
src/mame/audio/bzone.c
View File

@ -327,7 +327,7 @@ DEVICE_GET_INFO( bzone_sound )
#define BZ_R8 RES_K(100) #define BZ_R8 RES_K(100)
#define BZ_R9 RES_K(22) #define BZ_R9 RES_K(22)
//#define RT (1.0/BZ_R5 + 1.0/BZ_R6 * 1.0/BZ_R7) //#define RT (1.0/BZ_R5 + 1.0/BZ_R6 * 1.0/BZ_R7)
#define BZ_R10 RES_K(100) #define BZ_R10 RES_K(100)
#define BZ_R11 RES_K(250) #define BZ_R11 RES_K(250)
@ -467,7 +467,7 @@ static DISCRETE_SOUND_START(bzone)
DISCRETE_INPUT_DATA(BZ_INPUT) DISCRETE_INPUT_DATA(BZ_INPUT)
/* decode the bits */ /* decode the bits */
DISCRETE_BITS_DECODE(NODE_10, BZ_INPUT, 0, 7, 5.7)// TTL_OUT) /* QA-QD 74393 */ DISCRETE_BITS_DECODE(NODE_10, BZ_INPUT, 0, 7, 5.7)// TTL_OUT) /* QA-QD 74393 */
DISCRETE_ADJUSTMENT_TAG(NODE_11, 0, RES_K(250), DISC_LINADJ, "R11") DISCRETE_ADJUSTMENT_TAG(NODE_11, 0, RES_K(250), DISC_LINADJ, "R11")

38
src/mame/drivers/kaneko16.c
View File

@ -2102,14 +2102,14 @@ static INTERRUPT_GEN( shogwarr_interrupt )
/* /*
unsigned char shogwarr_default_eeprom[128] = { unsigned char shogwarr_default_eeprom[128] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x4B, 0x41, 0x4E, 0x45, 0x4B, 0x4F, 0x2F, 0x41, 0x54, 0x4F, 0x50, 0x20, 0x31, 0x39, 0x39, 0x32, 0x4B, 0x41, 0x4E, 0x45, 0x4B, 0x4F, 0x2F, 0x41, 0x54, 0x4F, 0x50, 0x20, 0x31, 0x39, 0x39, 0x32,
0x46, 0x55, 0x4A, 0x49, 0xFF, 0xFF, 0x4D, 0x41, 0x20, 0x42, 0x55, 0x53, 0x54, 0x45, 0x52, 0x20, 0x46, 0x55, 0x4A, 0x49, 0xFF, 0xFF, 0x4D, 0x41, 0x20, 0x42, 0x55, 0x53, 0x54, 0x45, 0x52, 0x20,
0x20, 0x53, 0x48, 0x4F, 0xFF, 0xFF, 0x4E, 0x20, 0x57, 0x41, 0x52, 0x52, 0x49, 0x4F, 0x52, 0x53, 0x20, 0x53, 0x48, 0x4F, 0xFF, 0xFF, 0x4E, 0x20, 0x57, 0x41, 0x52, 0x52, 0x49, 0x4F, 0x52, 0x53,
0xFF, 0xFF, 0x70, 0x79, 0x72, 0x69, 0xFF, 0xFF, 0x74, 0x20, 0x4B, 0x41, 0x4E, 0x45, 0x4B, 0x4F, 0xFF, 0xFF, 0x70, 0x79, 0x72, 0x69, 0xFF, 0xFF, 0x74, 0x20, 0x4B, 0x41, 0x4E, 0x45, 0x4B, 0x4F,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF
}; };
*/ */
// the above eeprom looks corrupt, some of the text is wrong, the game never writes this text tho.. maybe it should be as below // the above eeprom looks corrupt, some of the text is wrong, the game never writes this text tho.. maybe it should be as below
@ -3803,20 +3803,20 @@ DRIVER_INIT( calc3 )
static DRIVER_INIT( brapboys ) static DRIVER_INIT( brapboys )
{ {
/* /*
Expand the OKI sample data Expand the OKI sample data
OKI 1: OKI 1:
Address space 0x00000-0x2ffff is fixed Address space 0x00000-0x2ffff is fixed
Address space 0x30000-0x3ffff is banked (13 banks) Address space 0x30000-0x3ffff is banked (13 banks)
OKI 2: OKI 2:
Address space 0x00000-0x1ffff is fixed Address space 0x00000-0x1ffff is fixed
Address space 0x20000-0x3ffff is banked (15 banks) Address space 0x20000-0x3ffff is banked (15 banks)
The current sound device implementation can't handle The current sound device implementation can't handle
the banking dynamically so we have to expand all the bank the banking dynamically so we have to expand all the bank
combinations here and use use okim6295_set_bank_base(). combinations here and use use okim6295_set_bank_base().
*/ */
int bank; int bank;
UINT8 *src = memory_region(machine, "samples"); UINT8 *src = memory_region(machine, "samples");
UINT8 *dst1 = memory_region(machine, "oki1"); UINT8 *dst1 = memory_region(machine, "oki1");

6
src/mame/drivers/tmaster.c
View File

@ -1461,9 +1461,9 @@ Galaxy Games StarPak 2
NAMCO 307 Cartridge, has surface mount Flash chips in it: NAMCO 307 Cartridge, has surface mount Flash chips in it:
.u1 am29f800BB .u1 am29f800BB
.u2 am29f800BB .u2 am29f800BB
.u4 pic 12c508 .u4 pic 12c508
Board silkscreened 237-0209-00 Board silkscreened 237-0209-00
REV.-C REV.-C

16
src/mame/machine/kaneko16.c
View File

@ -244,8 +244,8 @@ READ16_HANDLER(bloodwar_calc_r)
} }
/* /*
B Rap Boys B Rap Boys
Shogun Warriors Shogun Warriors
*/ */
@ -1373,16 +1373,16 @@ void calc3_mcu_run(running_machine *machine)
printf("Calc 3 Init Command - %04x ROM Checksum Address\n", cakc3_checkumaddress); printf("Calc 3 Init Command - %04x ROM Checksum Address\n", cakc3_checkumaddress);
printf("Calc 3 Init Command - %08x Data Write Address\n", calc3_writeaddress); printf("Calc 3 Init Command - %08x Data Write Address\n", calc3_writeaddress);
#endif #endif
// memory_write_byte(space, calc3_dsw_addr+0x200000, ( ~input_port_read(machine, "DSW1"))&0xff); // // DSW // dsw actually updates in realtime - mcu reads+writes it every frame // memory_write_byte(space, calc3_dsw_addr+0x200000, ( ~input_port_read(machine, "DSW1"))&0xff); // // DSW // dsw actually updates in realtime - mcu reads+writes it every frame
kaneko16_mcu_ram[cakc3_checkumaddress / 2] = calc3_mcu_crc; // MCU Rom Checksum! kaneko16_mcu_ram[cakc3_checkumaddress / 2] = calc3_mcu_crc; // MCU Rom Checksum!
/* /*
for (i=0;i<0x40;i++) for (i=0;i<0x40;i++)
{ {
kaneko16_mcu_ram[(calc3_eeprom_addr / 2)+i] = kaneko16_eeprom_data[i];//((eepromData[i]&0xff00)>>8) | ((eepromData[i]&0x00ff)<<8); kaneko16_mcu_ram[(calc3_eeprom_addr / 2)+i] = kaneko16_eeprom_data[i];//((eepromData[i]&0xff00)>>8) | ((eepromData[i]&0x00ff)<<8);
} }
*/ */
{ {
UINT32 length, size; UINT32 length, size;

2
src/mame/machine/midtunit.c
View File

@ -181,7 +181,7 @@ static WRITE16_HANDLER( mk_prot_w )
static READ16_HANDLER( mkturbo_prot_r ) static READ16_HANDLER( mkturbo_prot_r )
{ {
/* the security GAL overlays a counter of some sort at 0xfffff400 in ROM space. /* the security GAL overlays a counter of some sort at 0xfffff400 in ROM space.
* A startup protection check expects to read back two different values in succession */ * A startup protection check expects to read back two different values in succession */
return mame_rand(space->machine); return mame_rand(space->machine);
} }

4
src/mame/video/taito_f2.c
View File

@ -1210,8 +1210,8 @@ VIDEO_UPDATE( taitof2_driftout )
UINT16 pen; UINT16 pen;
/* send palette, workaround for bug http://www.mametesters.org/view.php?id=3356 (just for this game) /* send palette, workaround for bug http://www.mametesters.org/view.php?id=3356 (just for this game)
driftout writes twice per frame to the palette, this causes glitches on some setups due to driftout writes twice per frame to the palette, this causes glitches on some setups due to
VIDEO_UPDATE not being synced to renderer update when multithreading is on. */ VIDEO_UPDATE not being synced to renderer update when multithreading is on. */
for (pen=0;pen<4096;pen++) for (pen=0;pen<4096;pen++)
palette_set_color_rgb(screen->machine, pen, pal5bit(paletteram_buffer[pen] >> 10), pal5bit(paletteram_buffer[pen] >> 5), pal5bit(paletteram_buffer[pen] >> 0)); palette_set_color_rgb(screen->machine, pen, pal5bit(paletteram_buffer[pen] >> 10), pal5bit(paletteram_buffer[pen] >> 5), pal5bit(paletteram_buffer[pen] >> 0));

4
src/tools/unidasm.c
View File

@ -272,7 +272,7 @@ static const dasm_table_entry dasm_table[] =
{ "ssem", _32le, 0, CPU_DISASSEMBLE_NAME(ssem) }, { "ssem", _32le, 0, CPU_DISASSEMBLE_NAME(ssem) },
{ "ssp1601", _16be, -1, CPU_DISASSEMBLE_NAME(ssp1601) }, { "ssp1601", _16be, -1, CPU_DISASSEMBLE_NAME(ssp1601) },
{ "t11", _16le, 0, CPU_DISASSEMBLE_NAME(t11) }, { "t11", _16le, 0, CPU_DISASSEMBLE_NAME(t11) },
// { "t90", _8bit, 0, CPU_DISASSEMBLE_NAME(t90) }, // { "t90", _8bit, 0, CPU_DISASSEMBLE_NAME(t90) },
{ "tlcs900", _8bit, 0, CPU_DISASSEMBLE_NAME(tlcs900) }, { "tlcs900", _8bit, 0, CPU_DISASSEMBLE_NAME(tlcs900) },
{ "tms0980", _16be, 0, CPU_DISASSEMBLE_NAME(tms0980) }, { "tms0980", _16be, 0, CPU_DISASSEMBLE_NAME(tms0980) },
{ "tms1000", _8bit, 0, CPU_DISASSEMBLE_NAME(tms1000) }, { "tms1000", _8bit, 0, CPU_DISASSEMBLE_NAME(tms1000) },
@ -293,7 +293,7 @@ static const dasm_table_entry dasm_table[] =
{ "v70", _8bit, 0, CPU_DISASSEMBLE_NAME(v70) }, { "v70", _8bit, 0, CPU_DISASSEMBLE_NAME(v70) },
{ "v810", _16le, 0, CPU_DISASSEMBLE_NAME(v810) }, { "v810", _16le, 0, CPU_DISASSEMBLE_NAME(v810) },
{ "z180", _8bit, 0, CPU_DISASSEMBLE_NAME(z180) }, { "z180", _8bit, 0, CPU_DISASSEMBLE_NAME(z180) },
// { "z8000", _16be, 0, CPU_DISASSEMBLE_NAME(z8000) }, // { "z8000", _16be, 0, CPU_DISASSEMBLE_NAME(z8000) },
{ "z80", _8bit, 0, CPU_DISASSEMBLE_NAME(z80) }, { "z80", _8bit, 0, CPU_DISASSEMBLE_NAME(z80) },
}; };

2
src/version.c
View File

@ -10,4 +10,4 @@
***************************************************************************/ ***************************************************************************/
extern const char build_version[]; extern const char build_version[];
const char build_version[] = "0.133u3 ("__DATE__")"; const char build_version[] = "0.133u4 ("__DATE__")";