Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-16 17:29:27 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleanups and version bump

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-06-24 07:36:50 +02:00
parent 03a5bfa56f
commit d1583b9850
163 changed files with 4053 additions and 4077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/emu/bus/apricot/expansion.h
View File

@ -2,42 +2,42 @@
// copyright-holders:Dirk Best // copyright-holders:Dirk Best
/*************************************************************************** /***************************************************************************
ACT Apricot Expansion Slot ACT Apricot Expansion Slot
A B A B
-12V 32 +12V -12V 32 +12V
+5V 31 +5V +5V 31 +5V
DB0 30 DB1 DB0 30 DB1
DB2 29 DB3 DB2 29 DB3
DB4 28 DB5 DB4 28 DB5
DB6 27 DB7 DB6 27 DB7
AB10 26 AB9 AB10 26 AB9
AB11 25 AB12 AB11 25 AB12
/AMWC 24 /MRDC /AMWC 24 /MRDC
/DMA2 23 DT/R /DMA2 23 DT/R
/DMA1 22 /IORC /DMA1 22 /IORC
/MWTC 21 /RES /MWTC 21 /RES
/IOWC 20 /AIOWC /IOWC 20 /AIOWC
GND 19 GND GND 19 GND
/CLK5 18 DEN /CLK5 18 DEN
/IRDY 17 /MRDY /IRDY 17 /MRDY
/EXT1 16 /EXT2 /EXT1 16 /EXT2
/INT3 15 /ALE /INT3 15 /ALE
AB6 14 /INT2 AB6 14 /INT2
AB8 13 AB7 AB8 13 AB7
DB9 12 DB8 DB9 12 DB8
DB11 11 DB10 DB11 11 DB10
DB13 10 DB12 DB13 10 DB12
DB15 9 DB14 DB15 9 DB14
AB2 8 AB1 AB2 8 AB1
AB4 7 AB3 AB4 7 AB3
AB0 6 AB5 AB0 6 AB5
AB14 5 AB13 AB14 5 AB13
AB15 4 AB16 AB15 4 AB16
AB17 3 AB18 AB17 3 AB18
AB19 2 /BHE AB19 2 /BHE
NMI 1 CLK15 NMI 1 CLK15
***************************************************************************/ ***************************************************************************/

7
src/emu/bus/cpc/hd20.c
View File

@ -2,7 +2,7 @@
// copyright-holders:Barry Rodewald // copyright-holders:Barry Rodewald
/* /*
Dobbertin HD20 hard disk Dobbertin HD20 hard disk
*/ */
@ -123,7 +123,6 @@ WRITE8_MEMBER(cpc_hd20_device::hdc_w)
WRITE_LINE_MEMBER(cpc_hd20_device::irq_w) WRITE_LINE_MEMBER(cpc_hd20_device::irq_w)
{ {
// if(state) // if(state)
// m_hdc->set_ready(); // m_hdc->set_ready();
} }

8
src/emu/bus/cpc/hd20.h
View File

@ -2,12 +2,12 @@
// copyright-holders:Barry Rodewald // copyright-holders:Barry Rodewald
/* /*
Dobbertin HD20 hard disk Dobbertin HD20 hard disk
Fixed disk interface for the Amstrad CPC Fixed disk interface for the Amstrad CPC
Controller: Seagate ST11M XT HD Controller Controller: Seagate ST11M XT HD Controller
Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors) Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors)
*/ */

1392
src/emu/cpu/hphybrid/hphybrid.c
View File

File diff suppressed because it is too large Load Diff

108
src/emu/cpu/hphybrid/hphybrid.h
View File

@ -24,7 +24,7 @@
// Input lines // Input lines
#define HPHYBRID_IRH 0 // High-level interrupt #define HPHYBRID_IRH 0 // High-level interrupt
#define HPHYBRID_IRL 1 // Low-level interrupt #define HPHYBRID_IRL 1 // Low-level interrupt
#define HPHYBRID_INT_LVLS 2 // Levels of interrupt #define HPHYBRID_INT_LVLS 2 // Levels of interrupt
#define HPHYBRID_DMAR 2 // DMA request #define HPHYBRID_DMAR 2 // DMA request
#define HPHYBRID_HALT 3 // "Halt" input #define HPHYBRID_HALT 3 // "Halt" input
@ -66,76 +66,76 @@ class hp_hybrid_cpu_device : public cpu_device
{ {
public: public:
protected: protected:
hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname);
// device-level overrides // device-level overrides
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
// device_execute_interface overrides // device_execute_interface overrides
virtual UINT32 execute_min_cycles() const { return 6; } virtual UINT32 execute_min_cycles() const { return 6; }
virtual UINT32 execute_max_cycles() const { return 25; } virtual UINT32 execute_max_cycles() const { return 25; }
virtual UINT32 execute_input_lines() const { return 2; } virtual UINT32 execute_input_lines() const { return 2; }
virtual UINT32 execute_default_irq_vector() const { return 0xffff; } virtual UINT32 execute_default_irq_vector() const { return 0xffff; }
virtual void execute_run(); virtual void execute_run();
virtual void execute_set_input(int inputnum, int state); virtual void execute_set_input(int inputnum, int state);
UINT16 execute_one(UINT16 opcode); UINT16 execute_one(UINT16 opcode);
UINT16 execute_one_sub(UINT16 opcode); UINT16 execute_one_sub(UINT16 opcode);
// device_memory_interface overrides // device_memory_interface overrides
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); } virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); }
// device_state_interface overrides // device_state_interface overrides
void state_string_export(const device_state_entry &entry, std::string &str); void state_string_export(const device_state_entry &entry, std::string &str);
// device_disasm_interface overrides // device_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const { return 2; } virtual UINT32 disasm_min_opcode_bytes() const { return 2; }
virtual UINT32 disasm_max_opcode_bytes() const { return 2; } virtual UINT32 disasm_max_opcode_bytes() const { return 2; }
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
private: private:
address_space_config m_program_config; address_space_config m_program_config;
address_space_config m_io_config; address_space_config m_io_config;
address_space *m_program; address_space *m_program;
direct_read_data *m_direct; direct_read_data *m_direct;
address_space *m_io; address_space *m_io;
int m_icount; int m_icount;
// State of processor // State of processor
UINT16 m_reg_A; // Register A UINT16 m_reg_A; // Register A
UINT16 m_reg_B; // Register B UINT16 m_reg_B; // Register B
UINT16 m_reg_P; // Register P UINT16 m_reg_P; // Register P
UINT16 m_reg_R; // Register R UINT16 m_reg_R; // Register R
UINT16 m_reg_C; // Register C UINT16 m_reg_C; // Register C
UINT16 m_reg_D; // Register D UINT16 m_reg_D; // Register D
UINT16 m_reg_IV; // Register IV UINT16 m_reg_IV; // Register IV
UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long) UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long)
UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir) UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir)
UINT8 m_dmapa; // DMA peripheral address (4 bits) UINT8 m_dmapa; // DMA peripheral address (4 bits)
UINT16 m_dmama; // DMA address UINT16 m_dmama; // DMA address
UINT16 m_dmac; // DMA counter UINT16 m_dmac; // DMA counter
UINT16 m_reg_I; // Instruction register UINT16 m_reg_I; // Instruction register
UINT16 get_ea(UINT16 opcode); UINT16 get_ea(UINT16 opcode);
void do_add(UINT16& addend1 , UINT16 addend2); void do_add(UINT16& addend1 , UINT16 addend2);
UINT16 get_skip_addr(UINT16 opcode , bool condition) const; UINT16 get_skip_addr(UINT16 opcode , bool condition) const;
UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n); UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n);
void do_pw(UINT16 opcode); void do_pw(UINT16 opcode);
void check_for_interrupts(void); void check_for_interrupts(void);
UINT16 RM(UINT16 addr); UINT16 RM(UINT16 addr);
void WM(UINT16 addr , UINT16 v); void WM(UINT16 addr , UINT16 v);
void WMB(UINT32 addr , UINT8 v); void WMB(UINT32 addr , UINT8 v);
UINT16 RIO(UINT8 pa , UINT8 ic); UINT16 RIO(UINT8 pa , UINT8 ic);
void WIO(UINT8 pa , UINT8 ic , UINT16 v); void WIO(UINT8 pa , UINT8 ic , UINT16 v);
}; };
class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device
{ {
public: public:
hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
}; };
extern const device_type HP_5061_3011; extern const device_type HP_5061_3011;

390
src/emu/cpu/hphybrid/hphybrid_dasm.c
View File

@ -11,84 +11,84 @@
typedef void (*fn_dis_param)(char *buffer , offs_t pc , UINT16 opcode); typedef void (*fn_dis_param)(char *buffer , offs_t pc , UINT16 opcode);
typedef struct { typedef struct {
UINT16 m_op_mask; UINT16 m_op_mask;
UINT16 m_opcode; UINT16 m_opcode;
const char *m_mnemonic; const char *m_mnemonic;
fn_dis_param m_param_fn; fn_dis_param m_param_fn;
UINT32 m_dasm_flags; UINT32 m_dasm_flags;
} dis_entry_t; } dis_entry_t;
static void addr_2_str(char *buffer , UINT16 addr , bool indirect) static void addr_2_str(char *buffer , UINT16 addr , bool indirect)
{ {
char *s = buffer + strlen(buffer); char *s = buffer + strlen(buffer);
s += sprintf(s , "$%04x" , addr); s += sprintf(s , "$%04x" , addr);
switch (addr) { switch (addr) {
case HP_REG_A_ADDR: case HP_REG_A_ADDR:
strcpy(s , "(A)"); strcpy(s , "(A)");
break; break;
case HP_REG_B_ADDR: case HP_REG_B_ADDR:
strcpy(s , "(B)"); strcpy(s , "(B)");
break; break;
case HP_REG_P_ADDR: case HP_REG_P_ADDR:
strcpy(s , "(P)"); strcpy(s , "(P)");
break; break;
case HP_REG_R_ADDR: case HP_REG_R_ADDR:
strcpy(s , "(R)"); strcpy(s , "(R)");
break; break;
case HP_REG_R4_ADDR: case HP_REG_R4_ADDR:
strcpy(s , "(R4)"); strcpy(s , "(R4)");
break; break;
case HP_REG_R5_ADDR: case HP_REG_R5_ADDR:
strcpy(s , "(R5)"); strcpy(s , "(R5)");
break; break;
case HP_REG_R6_ADDR: case HP_REG_R6_ADDR:
strcpy(s , "(R6)"); strcpy(s , "(R6)");
break; break;
case HP_REG_R7_ADDR: case HP_REG_R7_ADDR:
strcpy(s , "(R7)"); strcpy(s , "(R7)");
break; break;
case HP_REG_IV_ADDR: case HP_REG_IV_ADDR:
strcpy(s , "(IV)"); strcpy(s , "(IV)");
break; break;
case HP_REG_PA_ADDR: case HP_REG_PA_ADDR:
strcpy(s , "(PA)"); strcpy(s , "(PA)");
break; break;
case HP_REG_DMAPA_ADDR: case HP_REG_DMAPA_ADDR:
strcpy(s , "(DMAPA)"); strcpy(s , "(DMAPA)");
break; break;
case HP_REG_DMAMA_ADDR: case HP_REG_DMAMA_ADDR:
strcpy(s , "(DMAMA)"); strcpy(s , "(DMAMA)");
break; break;
case HP_REG_DMAC_ADDR: case HP_REG_DMAC_ADDR:
strcpy(s , "(DMAC)"); strcpy(s , "(DMAC)");
break; break;
case HP_REG_C_ADDR: case HP_REG_C_ADDR:
strcpy(s , "(C)"); strcpy(s , "(C)");
break; break;
case HP_REG_D_ADDR: case HP_REG_D_ADDR:
strcpy(s , "(D)"); strcpy(s , "(D)");
break; break;
} }
if (indirect) { if (indirect) {
strcat(s , ",I"); strcat(s , ",I");
} }
} }
static void param_none(char *buffer , offs_t pc , UINT16 opcode) static void param_none(char *buffer , offs_t pc , UINT16 opcode)
@ -97,185 +97,185 @@ static void param_none(char *buffer , offs_t pc , UINT16 opcode)
static void param_loc(char *buffer , offs_t pc , UINT16 opcode) static void param_loc(char *buffer , offs_t pc , UINT16 opcode)
{ {
UINT16 base; UINT16 base;
UINT16 off; UINT16 off;
if (opcode & 0x0400) { if (opcode & 0x0400) {
// Current page // Current page
base = pc; base = pc;
} else { } else {
// Base page // Base page
base = 0; base = 0;
} }
off = opcode & 0x3ff; off = opcode & 0x3ff;
if (off & 0x200) { if (off & 0x200) {
off -= 0x400; off -= 0x400;
} }
addr_2_str(buffer , base + off , (opcode & 0x8000) != 0); addr_2_str(buffer , base + off , (opcode & 0x8000) != 0);
} }
static void param_addr32(char *buffer , offs_t pc , UINT16 opcode) static void param_addr32(char *buffer , offs_t pc , UINT16 opcode)
{ {
addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0); addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0);
} }
static void param_skip(char *buffer , offs_t pc , UINT16 opcode) static void param_skip(char *buffer , offs_t pc , UINT16 opcode)
{ {
UINT16 off = opcode & 0x3f; UINT16 off = opcode & 0x3f;
if (off & 0x20) { if (off & 0x20) {
off -= 0x40; off -= 0x40;
} }
addr_2_str(buffer , pc + off , false); addr_2_str(buffer , pc + off , false);
} }
static void param_skip_sc(char *buffer , offs_t pc , UINT16 opcode) static void param_skip_sc(char *buffer , offs_t pc , UINT16 opcode)
{ {
param_skip(buffer, pc, opcode); param_skip(buffer, pc, opcode);
if (opcode & 0x80) { if (opcode & 0x80) {
if (opcode & 0x40) { if (opcode & 0x40) {
strcat(buffer , ",S"); strcat(buffer , ",S");
} else { } else {
strcat(buffer , ",C"); strcat(buffer , ",C");
} }
} }
} }
static void param_ret(char *buffer , offs_t pc , UINT16 opcode) static void param_ret(char *buffer , offs_t pc , UINT16 opcode)
{ {
char *s = buffer + strlen(buffer); char *s = buffer + strlen(buffer);
int off = opcode & 0x3f; int off = opcode & 0x3f;
if (off & 0x20) { if (off & 0x20) {
off -= 0x40; off -= 0x40;
} }
s += sprintf(s , "%d" , off); s += sprintf(s , "%d" , off);
if (opcode & 0x40) { if (opcode & 0x40) {
strcpy(s , ",P"); strcpy(s , ",P");
} }
} }
static void param_n16(char *buffer , offs_t pc , UINT16 opcode) static void param_n16(char *buffer , offs_t pc , UINT16 opcode)
{ {
char *s = buffer + strlen(buffer); char *s = buffer + strlen(buffer);
sprintf(s , "%u" , (opcode & 0xf) + 1); sprintf(s , "%u" , (opcode & 0xf) + 1);
} }
static void param_reg_id(char *buffer , offs_t pc , UINT16 opcode) static void param_reg_id(char *buffer , offs_t pc , UINT16 opcode)
{ {
addr_2_str(buffer, opcode & 7, false); addr_2_str(buffer, opcode & 7, false);
if (opcode & 0x80) { if (opcode & 0x80) {
strcat(buffer , ",D"); strcat(buffer , ",D");
} else { } else {
strcat(buffer , ",I"); strcat(buffer , ",I");
} }
} }
static const dis_entry_t dis_table[] = { static const dis_entry_t dis_table[] = {
// *** BPC Instructions *** // *** BPC Instructions ***
{0xffff , 0x0000 , "NOP" , param_none , 0 }, {0xffff , 0x0000 , "NOP" , param_none , 0 },
{0x7800 , 0x0000 , "LDA" , param_loc , 0 }, {0x7800 , 0x0000 , "LDA" , param_loc , 0 },
{0x7800 , 0x0800 , "LDB" , param_loc , 0 }, {0x7800 , 0x0800 , "LDB" , param_loc , 0 },
{0x7800 , 0x1000 , "CPA" , param_loc , 0 }, {0x7800 , 0x1000 , "CPA" , param_loc , 0 },
{0x7800 , 0x1800 , "CPB" , param_loc , 0 }, {0x7800 , 0x1800 , "CPB" , param_loc , 0 },
{0x7800 , 0x2000 , "ADA" , param_loc , 0 }, {0x7800 , 0x2000 , "ADA" , param_loc , 0 },
{0x7800 , 0x2800 , "ADB" , param_loc , 0 }, {0x7800 , 0x2800 , "ADB" , param_loc , 0 },
{0x7800 , 0x3000 , "STA" , param_loc , 0 }, {0x7800 , 0x3000 , "STA" , param_loc , 0 },
{0x7800 , 0x3800 , "STB" , param_loc , 0 }, {0x7800 , 0x3800 , "STB" , param_loc , 0 },
{0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER }, {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER },
{0x7800 , 0x4800 , "ISZ" , param_loc , 0 }, {0x7800 , 0x4800 , "ISZ" , param_loc , 0 },
{0x7800 , 0x5000 , "AND" , param_loc , 0 }, {0x7800 , 0x5000 , "AND" , param_loc , 0 },
{0x7800 , 0x5800 , "DSZ" , param_loc , 0 }, {0x7800 , 0x5800 , "DSZ" , param_loc , 0 },
{0x7800 , 0x6000 , "IOR" , param_loc , 0 }, {0x7800 , 0x6000 , "IOR" , param_loc , 0 },
{0x7800 , 0x6800 , "JMP" , param_loc , 0 }, {0x7800 , 0x6800 , "JMP" , param_loc , 0 },
{0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 }, {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 },
{0xffc0 , 0x7400 , "RZA" , param_skip , 0 }, {0xffc0 , 0x7400 , "RZA" , param_skip , 0 },
{0xffc0 , 0x7C00 , "RZB" , param_skip , 0 }, {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 },
{0xffc0 , 0x7440 , "RIA" , param_skip , 0 }, {0xffc0 , 0x7440 , "RIA" , param_skip , 0 },
{0xffc0 , 0x7C40 , "RIB" , param_skip , 0 }, {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 },
{0xffc0 , 0x7500 , "SZA" , param_skip , 0 }, {0xffc0 , 0x7500 , "SZA" , param_skip , 0 },
{0xffc0 , 0x7D00 , "SZB" , param_skip , 0 }, {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 },
{0xffc0 , 0x7540 , "SIA" , param_skip , 0 }, {0xffc0 , 0x7540 , "SIA" , param_skip , 0 },
{0xffc0 , 0x7D40 , "SIB" , param_skip , 0 }, {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 },
{0xffc0 , 0x7480 , "SFS" , param_skip , 0 }, {0xffc0 , 0x7480 , "SFS" , param_skip , 0 },
{0xffc0 , 0x7580 , "SFC" , param_skip , 0 }, {0xffc0 , 0x7580 , "SFC" , param_skip , 0 },
{0xffc0 , 0x7c80 , "SSS" , param_skip , 0 }, {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 },
{0xffc0 , 0x7d80 , "SSC" , param_skip , 0 }, {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 },
{0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 }, {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 },
{0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 }, {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 },
{0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 }, {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 },
{0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 }, {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 },
{0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 }, {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 },
{0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 }, {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 },
{0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 }, {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 },
{0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 }, {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 },
{0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 }, {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 },
{0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 }, {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 },
{0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 }, {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 },
{0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 }, {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 },
{0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 }, {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 },
{0xff00 , 0xff00 , "SES" , param_skip_sc , 0 }, {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 },
{0xffff , 0xf020 , "TCA" , param_none , 0 }, {0xffff , 0xf020 , "TCA" , param_none , 0 },
{0xffff , 0xf820 , "TCB" , param_none , 0 }, {0xffff , 0xf820 , "TCB" , param_none , 0 },
{0xffff , 0xf060 , "CMA" , param_none , 0 }, {0xffff , 0xf060 , "CMA" , param_none , 0 },
{0xffff , 0xf860 , "CMB" , param_none , 0 }, {0xffff , 0xf860 , "CMB" , param_none , 0 },
{0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT }, {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT },
{0xfff0 , 0xf100 , "AAR" , param_n16 , 0 }, {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 },
{0xfff0 , 0xf900 , "ABR" , param_n16 , 0 }, {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 },
{0xffff , 0xf14f , "CLA" , param_none , 0 }, {0xffff , 0xf14f , "CLA" , param_none , 0 },
{0xfff0 , 0xf140 , "SAR" , param_n16 , 0 }, {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 },
{0xffff , 0xf94f , "CLB" , param_none , 0 }, {0xffff , 0xf94f , "CLB" , param_none , 0 },
{0xfff0 , 0xf940 , "SBR" , param_n16 , 0 }, {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 },
{0xfff0 , 0xf180 , "SAL" , param_n16 , 0 }, {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 },
{0xfff0 , 0xf980 , "SBL" , param_n16 , 0 }, {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 },
{0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 }, {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 },
{0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 }, {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 },
// *** IOC Instructions *** // *** IOC Instructions ***
{0xffff , 0x7100 , "SDO" , param_none , 0 }, {0xffff , 0x7100 , "SDO" , param_none , 0 },
{0xffff , 0x7108 , "SDI" , param_none , 0 }, {0xffff , 0x7108 , "SDI" , param_none , 0 },
{0xffff , 0x7110 , "EIR" , param_none , 0 }, {0xffff , 0x7110 , "EIR" , param_none , 0 },
{0xffff , 0x7118 , "DIR" , param_none , 0 }, {0xffff , 0x7118 , "DIR" , param_none , 0 },
{0xffff , 0x7120 , "DMA" , param_none , 0 }, {0xffff , 0x7120 , "DMA" , param_none , 0 },
{0xffff , 0x7128 , "PCM" , param_none , 0 }, {0xffff , 0x7128 , "PCM" , param_none , 0 },
{0xffff , 0x7138 , "DDR" , param_none , 0 }, {0xffff , 0x7138 , "DDR" , param_none , 0 },
{0xffff , 0x7140 , "DBL" , param_none , 0 }, {0xffff , 0x7140 , "DBL" , param_none , 0 },
{0xffff , 0x7148 , "CBL" , param_none , 0 }, {0xffff , 0x7148 , "CBL" , param_none , 0 },
{0xffff , 0x7150 , "DBU" , param_none , 0 }, {0xffff , 0x7150 , "DBU" , param_none , 0 },
{0xffff , 0x7158 , "CBU" , param_none , 0 }, {0xffff , 0x7158 , "CBU" , param_none , 0 },
{0xff78 , 0x7160 , "PWC" , param_reg_id , 0 }, {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 },
{0xff78 , 0x7168 , "PWD" , param_reg_id , 0 }, {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 },
{0xff78 , 0x7960 , "PBC" , param_reg_id , 0 }, {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 },
{0xff78 , 0x7968 , "PBD" , param_reg_id , 0 }, {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 },
{0xff78 , 0x7170 , "WWC" , param_reg_id , 0 }, {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 },
{0xff78 , 0x7178 , "WWD" , param_reg_id , 0 }, {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 },
{0xff78 , 0x7970 , "WBC" , param_reg_id , 0 }, {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 },
{0xff78 , 0x7978 , "WBD" , param_reg_id , 0 }, {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 },
// *** END *** // *** END ***
{0 , 0 , NULL , NULL , 0 } {0 , 0 , NULL , NULL , 0 }
}; };
CPU_DISASSEMBLE(hp_hybrid) CPU_DISASSEMBLE(hp_hybrid)
{ {
UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ]; UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ];
const dis_entry_t *p; const dis_entry_t *p;
for (p = dis_table; p->m_op_mask; p++) { for (p = dis_table; p->m_op_mask; p++) {
if ((opcode & p->m_op_mask) == p->m_opcode) { if ((opcode & p->m_op_mask) == p->m_opcode) {
strcpy(buffer , p->m_mnemonic); strcpy(buffer , p->m_mnemonic);
strcat(buffer , " "); strcat(buffer , " ");
p->m_param_fn(buffer , pc , opcode); p->m_param_fn(buffer , pc , opcode);
return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED; return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED;
} }
} }
// Unknown opcode // Unknown opcode
strcpy(buffer , "???"); strcpy(buffer , "???");
return 1 | DASMFLAG_SUPPORTED; return 1 | DASMFLAG_SUPPORTED;
} }

4
src/emu/cpu/i86/i86.c
View File

@ -1915,9 +1915,9 @@ bool i8086_common_cpu_device::common_op(UINT8 op)
break; break;
case 0xe4: // i_inal case 0xe4: // i_inal
if (m_lock) m_lock_handler(1); if (m_lock) m_lock_handler(1);
m_regs.b[AL] = read_port_byte( fetch() ); m_regs.b[AL] = read_port_byte( fetch() );
if (m_lock) { m_lock_handler(0); m_lock = false; } if (m_lock) { m_lock_handler(0); m_lock = false; }
CLK(IN_IMM8); CLK(IN_IMM8);
break; break;

1
src/emu/cpu/mn10200/mn10200.c
View File

@ -539,7 +539,6 @@ void mn10200_device::execute_run()
{ {
while (m_cycles > 0) while (m_cycles > 0)
{ {
// internal peripheral, external pin, or prev instruction may have changed irq state // internal peripheral, external pin, or prev instruction may have changed irq state
while (m_possible_irq) while (m_possible_irq)
{ {

20
src/emu/info.c
View File

@ -421,16 +421,16 @@ void info_xml_creator::output_devices()
if (shortnames.add(dev->shortname(), 0, FALSE) != TMERR_DUPLICATE) if (shortnames.add(dev->shortname(), 0, FALSE) != TMERR_DUPLICATE)
output_one_device(*dev, temptag.c_str()); output_one_device(*dev, temptag.c_str());
// also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401) // also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401)
device_iterator deviter2(*dev); device_iterator deviter2(*dev);
for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next()) for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next())
{ {
if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0) if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0)
{ {
if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE) if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE)
output_one_device(*device, device->tag()); output_one_device(*device, device->tag());
} }
} }
const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.c_str()); const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.c_str());
} }

2
src/emu/machine/netlist.h
View File

@ -73,7 +73,7 @@ private:
pstring m_name; pstring m_name;
}; };
#define MEMREGION_SOURCE(_name) \ #define MEMREGION_SOURCE(_name) \
setup.register_source(palloc(netlist_source_memregion_t, _name)); setup.register_source(palloc(netlist_source_memregion_t, _name));
#define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \ #define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \

2
src/emu/netlist/devices/net_lib.c
View File

@ -54,7 +54,7 @@ void initialize_factory(factory_list_t &factory)
ENTRY(VCCS, VCCS, "-") ENTRY(VCCS, VCCS, "-")
ENTRY(CCCS, CCCS, "-") ENTRY(CCCS, CCCS, "-")
ENTRY(dummy_input, DUMMY_INPUT, "-") ENTRY(dummy_input, DUMMY_INPUT, "-")
ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly
ENTRY(QBJT_EB, QBJT_EB, "model") ENTRY(QBJT_EB, QBJT_EB, "model")
ENTRY(QBJT_switch, QBJT_SW, "model") ENTRY(QBJT_switch, QBJT_SW, "model")
ENTRY(ttl_input, TTL_INPUT, "IN") ENTRY(ttl_input, TTL_INPUT, "IN")

2
src/emu/netlist/devices/nld_system.h
View File

@ -51,7 +51,7 @@
NET_C(_G, _name.G) \ NET_C(_G, _name.G) \
NET_C(_OUT, _name.Q) NET_C(_OUT, _name.Q)
#define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \ #define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \
setup.register_frontier(# _attach, _r_in, _r_out); setup.register_frontier(# _attach, _r_in, _r_out);
#define RES_SWITCH(_name, _IN, _P1, _P2) \ #define RES_SWITCH(_name, _IN, _P1, _P2) \

6
src/emu/netlist/devices/nld_truthtable.c
View File

@ -238,11 +238,11 @@ void truthtable_desc_t::setup(const pstring_list_t &truthtable, UINT32 disabled_
} }
#define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \ #define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \
{ typedef netlist_factory_truthtable_t<_n,_m,_h> xtype; \ { typedef netlist_factory_truthtable_t<_n,_m,_h> xtype; \
return palloc(xtype,name,classname,def_param); } break return palloc(xtype,name,classname,def_param); } break
#define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1) #define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1)
#define ENTRY(_n) ENTRYY(_n, 1); ENTRYY(_n, 2); ENTRYY(_n, 3); ENTRYY(_n, 4); ENTRYY(_n, 5); ENTRYY(_n, 6) #define ENTRY(_n) ENTRYY(_n, 1); ENTRYY(_n, 2); ENTRYY(_n, 3); ENTRYY(_n, 4); ENTRYY(_n, 5); ENTRYY(_n, 6)

1
src/emu/netlist/nl_base.c
View File

@ -99,7 +99,6 @@ public:
const logic_family_desc_t *logic_family_desc_t::from_model(const pstring &model) const logic_family_desc_t *logic_family_desc_t::from_model(const pstring &model)
{ {
if (setup_t::model_value_str(model, "TYPE", "") == "TTL") if (setup_t::model_value_str(model, "TYPE", "") == "TTL")
return &netlist_family_TTL; return &netlist_family_TTL;
if (setup_t::model_value_str(model, "TYPE", "") == "CD4000") if (setup_t::model_value_str(model, "TYPE", "") == "CD4000")

7
src/emu/netlist/nl_base.h
View File

@ -170,9 +170,8 @@ typedef UINT8 netlist_sig_t;
// MACROS / netlist devices // MACROS / netlist devices
//============================================================ //============================================================
#define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices { #define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices {
#define NETLIB_NAMESPACE_DEVICES_END() }}
#define NETLIB_NAMESPACE_DEVICES_END() }}
#define NETLIB_NAME(_chip) nld_ ## _chip #define NETLIB_NAME(_chip) nld_ ## _chip
@ -292,7 +291,7 @@ namespace netlist
fatalerror_e(const char *format, va_list ap); fatalerror_e(const char *format, va_list ap);
virtual ~fatalerror_e() throw() {} virtual ~fatalerror_e() throw() {}
const pstring &text() { return m_text; } const pstring &text() { return m_text; }
private: private:
pstring m_text; pstring m_text;
}; };

46
src/emu/netlist/nl_config.h
View File

@ -17,42 +17,42 @@
/* /*
* The following options determine how object::update is called. * The following options determine how object::update is called.
* NL_PMF_TYPE_VIRTUAL * NL_PMF_TYPE_VIRTUAL
* Use stock virtual call * Use stock virtual call
* *
* NL_PMF_TYPE_GNUC_PMF * NL_PMF_TYPE_GNUC_PMF
* Use standard pointer to member function syntax * Use standard pointer to member function syntax
* *
* NL_PMF_TYPE_GNUC_PMF_CONV * NL_PMF_TYPE_GNUC_PMF_CONV
* Use gnu extension and convert the pmf to a function pointer. * Use gnu extension and convert the pmf to a function pointer.
* This is not standard compliant and needs * This is not standard compliant and needs
* -Wno-pmf-conversions to compile. * -Wno-pmf-conversions to compile.
* *
* NL_PMF_TYPE_INTERNAL * NL_PMF_TYPE_INTERNAL
* Use the same approach as MAME for deriving the function pointer. * Use the same approach as MAME for deriving the function pointer.
* This is compiler-dependant as well * This is compiler-dependant as well
* *
* Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast * Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast
* *
* NL_PMF_TYPE_INTERNAL: 215% * NL_PMF_TYPE_INTERNAL: 215%
* NL_PMF_TYPE_GNUC_PMF: 163% * NL_PMF_TYPE_GNUC_PMF: 163%
* NL_PMF_TYPE_GNUC_PMF_CONV: 215% * NL_PMF_TYPE_GNUC_PMF_CONV: 215%
* NL_PMF_TYPE_VIRTUAL: 213% * NL_PMF_TYPE_VIRTUAL: 213%
* *
* The whole exercise was done to avoid virtual calls. In prior versions of * The whole exercise was done to avoid virtual calls. In prior versions of
* netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement. * netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement.
* Since than, ATTR_COLD was removed from functions declared as virtual. * Since than, ATTR_COLD was removed from functions declared as virtual.
* This may explain that the recent benchmarks show no difference at all. * This may explain that the recent benchmarks show no difference at all.
* *
* Disappointing is the GNUC_PMF performance. * Disappointing is the GNUC_PMF performance.
*/ */
// This will be autodetected // This will be autodetected
//#define NL_PMF_TYPE 3 //#define NL_PMF_TYPE 3
#define NL_PMF_TYPE_VIRTUAL 0 #define NL_PMF_TYPE_VIRTUAL 0
#define NL_PMF_TYPE_GNUC_PMF 1 #define NL_PMF_TYPE_GNUC_PMF 1
#define NL_PMF_TYPE_GNUC_PMF_CONV 2 #define NL_PMF_TYPE_GNUC_PMF_CONV 2
#define NL_PMF_TYPE_INTERNAL 3 #define NL_PMF_TYPE_INTERNAL 3
#ifndef NL_PMF_TYPE #ifndef NL_PMF_TYPE
#if PHAS_PMF_INTERNAL #if PHAS_PMF_INTERNAL

1
src/emu/netlist/nl_factory.c
View File

@ -13,7 +13,6 @@
namespace netlist namespace netlist
{ {
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// net_device_t_base_factory // net_device_t_base_factory
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------

1
src/emu/netlist/nl_factory.h
View File

@ -16,7 +16,6 @@
namespace netlist namespace netlist
{ {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// net_dev class factory // net_dev class factory
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

1
src/emu/netlist/nl_lists.h
View File

@ -19,7 +19,6 @@
namespace netlist namespace netlist
{ {
template <class _Element, class _Time> template <class _Element, class _Time>
class timed_queue class timed_queue
{ {

1
src/emu/netlist/nl_parser.h
View File

@ -14,7 +14,6 @@
namespace netlist namespace netlist
{ {
class parser_t : public ptokenizer class parser_t : public ptokenizer
{ {
NETLIST_PREVENT_COPYING(parser_t) NETLIST_PREVENT_COPYING(parser_t)

1
src/emu/netlist/nl_setup.c
View File

@ -39,7 +39,6 @@ NETLIST_END()
namespace netlist namespace netlist
{ {
setup_t::setup_t(netlist_t *netlist) setup_t::setup_t(netlist_t *netlist)
: m_netlist(netlist) : m_netlist(netlist)
, m_proxy_cnt(0) , m_proxy_cnt(0)

8
src/emu/netlist/nl_setup.h
View File

@ -55,10 +55,9 @@
#define NETLIST_START(_name) \ #define NETLIST_START(_name) \
ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \
{ {
#define NETLIST_END() } #define NETLIST_END() }
#define LOCAL_SOURCE(_name) \ #define LOCAL_SOURCE(_name) \
setup.register_source(palloc(netlist::source_proc_t, # _name, &NETLIST_NAME(_name))); setup.register_source(palloc(netlist::source_proc_t, # _name, &NETLIST_NAME(_name)));
#define INCLUDE(_name) \ #define INCLUDE(_name) \
@ -75,7 +74,6 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup)
namespace netlist namespace netlist
{ {
// Forward definition so we keep nl_factory.h out of the public // Forward definition so we keep nl_factory.h out of the public
class factory_list_t; class factory_list_t;
@ -282,8 +280,8 @@ namespace netlist
public: public:
source_proc_t(pstring name, void (*setup_func)(setup_t &)) source_proc_t(pstring name, void (*setup_func)(setup_t &))
: setup_t::source_t(), : setup_t::source_t(),
m_setup_func(setup_func), m_setup_func(setup_func),
m_setup_func_name(name) m_setup_func_name(name)
{ {
} }

1
src/emu/netlist/nl_time.h
View File

@ -27,7 +27,6 @@
namespace netlist namespace netlist
{ {
struct netlist_time struct netlist_time
{ {
public: public:

17
src/emu/netlist/plib/plists.h
View File

@ -97,7 +97,7 @@ public:
plist_t() : std::vector<_ListClass>() {} plist_t() : std::vector<_ListClass>() {}
plist_t(const int numElements) : std::vector<_ListClass>(numElements) {} plist_t(const int numElements) : std::vector<_ListClass>(numElements) {}
void add(const _ListClass &elem) { this->push_back(elem); } void add(const _ListClass &elem) { this->push_back(elem); }
void clear_and_free() void clear_and_free()
{ {
for (_ListClass *i = this->data(); i < this->data() + this->size(); i++) for (_ListClass *i = this->data(); i < this->data() + this->size(); i++)
@ -106,7 +106,7 @@ public:
} }
this->clear(); this->clear();
} }
bool contains(const _ListClass &elem) const bool contains(const _ListClass &elem) const
{ {
for (const _ListClass *i = this->data(); i < this->data() + this->size(); i++) for (const _ListClass *i = this->data(); i < this->data() + this->size(); i++)
{ {
@ -116,7 +116,7 @@ public:
return false; return false;
} }
void remove(const _ListClass &elem) void remove(const _ListClass &elem)
{ {
for (int i = 0; i < this->size(); i++) for (int i = 0; i < this->size(); i++)
{ {
@ -127,12 +127,12 @@ public:
} }
} }
} }
void remove_at(const int pos) void remove_at(const int pos)
{ {
this->erase(this->begin() + pos); this->erase(this->begin() + pos);
} }
int indexof(const _ListClass &elem) const int indexof(const _ListClass &elem) const
{ {
for (int i = 0; i < this->size(); i++) for (int i = 0; i < this->size(); i++)
{ {
@ -539,7 +539,6 @@ public:
pstring_list_t(const pstring &str, const pstring &onstr, bool ignore_empty = false) pstring_list_t(const pstring &str, const pstring &onstr, bool ignore_empty = false)
: plist_t<pstring>() : plist_t<pstring>()
{ {
int p = 0; int p = 0;
int pn; int pn;
@ -607,9 +606,9 @@ static inline void psort_list(Class &sl)
{ {
for(int i = 0; i < (int) sl.size() - 1; i++) for(int i = 0; i < (int) sl.size() - 1; i++)
{ {
for(int j = i + 1; j < sl.size(); j++) for(int j = i + 1; j < sl.size(); j++)
if(sl[i] > sl[j]) if(sl[i] > sl[j])
std::swap(sl[i], sl[j]); std::swap(sl[i], sl[j]);
} }
} }

10
src/emu/netlist/solver/mat_cr.h
View File

@ -19,7 +19,7 @@ struct mat_cr_t
unsigned nz_num; unsigned nz_num;
unsigned ia[_storage_N + 1]; unsigned ia[_storage_N + 1];
unsigned ja[_storage_N * _storage_N]; unsigned ja[_storage_N * _storage_N];
unsigned diag[_storage_N]; /* n */ unsigned diag[_storage_N]; /* n */
void mult_vec(const double * RESTRICT A, const double * RESTRICT x, double * RESTRICT res) void mult_vec(const double * RESTRICT A, const double * RESTRICT x, double * RESTRICT res)
{ {
@ -85,14 +85,14 @@ struct mat_cr_t
/* /*
* Solve a linear equation Ax = r * Solve a linear equation Ax = r
* where * where
* A = L*U * A = L*U
* *
* L unit lower triangular * L unit lower triangular
* U upper triangular * U upper triangular
* *
* ==> LUx = r * ==> LUx = r
* *
* ==> Ux = L⁻¹r = w * ==> Ux = L?????r = w
* *
* ==> r = Lw * ==> r = Lw
* *

6
src/emu/netlist/solver/nld_ms_direct.h
View File

@ -250,7 +250,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
} }
psort_list(t->m_nzrd); psort_list(t->m_nzrd);
t->m_nz.add(k); // add diagonal t->m_nz.add(k); // add diagonal
psort_list(t->m_nz); psort_list(t->m_nz);
} }
@ -388,8 +388,8 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
/* The code below is 30% faster than the original /* The code below is 30% faster than the original
* implementation which is given here for reference. * implementation which is given here for reference.
* *
* for (unsigned k = i + 1; k < kN; k++) * for (unsigned k = i + 1; k < kN; k++)
* m_A[j][k] = m_A[j][k] + m_A[i][k] * f1; * m_A[j][k] = m_A[j][k] + m_A[i][k] * f1;
*/ */
double * RESTRICT d = &m_A[j][i+1]; double * RESTRICT d = &m_A[j][i+1];
const double * RESTRICT s = &m_A[i][i+1]; const double * RESTRICT s = &m_A[i][i+1];

26
src/emu/netlist/solver/nld_ms_gmres.h
View File

@ -78,10 +78,10 @@ private:
double m_c[_storage_N + 1]; /* mr + 1 */ double m_c[_storage_N + 1]; /* mr + 1 */
double m_g[_storage_N + 1]; /* mr + 1 */ double m_g[_storage_N + 1]; /* mr + 1 */
double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */ double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */
double m_s[_storage_N]; /* mr + 1 */ double m_s[_storage_N]; /* mr + 1 */
double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */ double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */
//double m_y[_storage_N]; /* mr + 1 */ //double m_y[_storage_N]; /* mr + 1 */
double m_accuracy_mult; double m_accuracy_mult;
@ -234,7 +234,7 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
if (gsl>=failed) if (gsl>=failed)
{ {
//for (int k = 0; k < iN; k++) //for (int k = 0; k < iN; k++)
// this->m_nets[k]->m_cur_Analog = new_V[k]; // this->m_nets[k]->m_cur_Analog = new_V[k];
// Fallback to direct solver ... // Fallback to direct solver ...
this->m_gs_fail++; this->m_gs_fail++;
return matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(newton_raphson); return matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(newton_raphson);
@ -264,11 +264,11 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
static inline void givens_mult( const double c, const double s, double * RESTRICT g0, double * RESTRICT g1 ) static inline void givens_mult( const double c, const double s, double * RESTRICT g0, double * RESTRICT g1 )
{ {
const double tg0 = c * *g0 - s * *g1; const double tg0 = c * *g0 - s * *g1;
const double tg1 = s * *g0 + c * *g1; const double tg1 = s * *g0 + c * *g1;
*g0 = tg0; *g0 = tg0;
*g1 = tg1; *g1 = tg1;
} }
template <unsigned m_N, unsigned _storage_N> template <unsigned m_N, unsigned _storage_N>
@ -289,10 +289,10 @@ int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (double * RESTRICT x
* *
* Yousef Saad, * Yousef Saad,
* Iterative Methods for Sparse Linear Systems, * Iterative Methods for Sparse Linear Systems,
* Second Edition, * Second Edition,
* SIAM, 20003, * SIAM, 20003,
* ISBN: 0898715342, * ISBN: 0898715342,
* LC: QA188.S17. * LC: QA188.S17.
* *
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/

2
src/emu/netlist/solver/nld_ms_sor_mat.h
View File

@ -175,7 +175,7 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic
s = s + nl_math::abs(this->m_A[k][i]); s = s + nl_math::abs(this->m_A[k][i]);
akk = s / akk - 1.0; akk = s / akk - 1.0;
if ( akk > lambdaN) if ( akk > lambdaN)
lambdaN = akk; lambdaN = akk;
if (akk < lambda1) if (akk < lambda1)
lambda1 = akk; lambda1 = akk;
#endif #endif

1
src/emu/netlist/solver/vector_base.h
View File

@ -17,7 +17,6 @@
template <unsigned _storage_N> template <unsigned _storage_N>
struct pvector struct pvector
{ {
pvector(unsigned size) pvector(unsigned size)
: m_N(size) { } : m_N(size) { }

24
src/emu/netlist/tools/nl_convert.c
View File

@ -17,15 +17,15 @@ static plist_t<int> bubble(const pnamedlist_t<Class *> &sl)
ret[i] = i; ret[i] = i;
for(int i=0; i < sl.size()-1;i++) for(int i=0; i < sl.size()-1;i++)
{ {
for(int j=i+1; j < sl.size(); j++) for(int j=i+1; j < sl.size(); j++)
{ {
if(sl[ret[i]]->name() > sl[ret[j]]->name()) if(sl[ret[i]]->name() > sl[ret[j]]->name())
{ {
std::swap(ret[i], ret[j]); std::swap(ret[i], ret[j]);
} }
} }
} }
return ret; return ret;
} }
@ -179,7 +179,7 @@ nl_convert_base_t::unit_t nl_convert_base_t::m_units[] = {
{"M", "CAP_M(%g)", 1.0e-3 }, {"M", "CAP_M(%g)", 1.0e-3 },
{"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */ {"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */
{"U", "CAP_U(%g)", 1.0e-6 }, {"U", "CAP_U(%g)", 1.0e-6 },
{"µ", "CAP_U(%g)", 1.0e-6 }, {"??", "CAP_U(%g)", 1.0e-6 },
{"N", "CAP_N(%g)", 1.0e-9 }, {"N", "CAP_N(%g)", 1.0e-9 },
{"P", "CAP_P(%g)", 1.0e-12}, {"P", "CAP_P(%g)", 1.0e-12},
{"F", "%ge-15", 1.0e-15}, {"F", "%ge-15", 1.0e-15},
@ -444,7 +444,7 @@ void nl_convert_eagle_t::convert(const pstring &contents)
pstring devname = token.str(); pstring devname = token.str();
pstring pin = tok.get_string(); pstring pin = tok.get_string();
add_term(netname, devname + "." + pin); add_term(netname, devname + "." + pin);
token = tok.get_token(); } token = tok.get_token(); }
} }
else else
{ {
@ -454,5 +454,3 @@ void nl_convert_eagle_t::convert(const pstring &contents)
} }
} }

1
src/emu/netlist/tools/nl_convert.h
View File

@ -164,7 +164,6 @@ public:
class eagle_tokenizer : public ptokenizer class eagle_tokenizer : public ptokenizer
{ {
public: public:
eagle_tokenizer(nl_convert_eagle_t &convert) eagle_tokenizer(nl_convert_eagle_t &convert)
: ptokenizer(), m_convert(convert) : ptokenizer(), m_convert(convert)

12
src/emu/softlist.c
View File

@ -557,12 +557,12 @@ void software_list_device::internal_validity_check(validity_checker &valid)
break; break;
} }
// Did we lost the software parts? // Did we lost the software parts?
if (swinfo->num_parts() == 0) if (swinfo->num_parts() == 0)
{ {
osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname()); osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname());
break; break;
} }
// Second, since the xml is fine, run additional checks: // Second, since the xml is fine, run additional checks:

86
src/emu/sound/tms5110r.inc
View File

@ -39,17 +39,17 @@
*/ */
/* Chip types based on die marks from decap: /* Chip types based on die marks from decap:
chip type chip type
|||||| rom number |||||| rom number
|||||| ||||| |||||| |||||
VVVVVV VVVVV VVVVVV VVVVV
T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp
T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp
?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp ?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp
T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp
?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom. ?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom.
?????? ????? = TMS5110 ?????? ????? = TMS5110
T0280F 5110A = TMS5110AN2L T0280F 5110A = TMS5110AN2L
*/ */
@ -111,9 +111,9 @@ struct tms5100_coeffs
#define TI_0280_2801_PATENT_PITCH \ #define TI_0280_2801_PATENT_PITCH \
/* P */\ /* P */\
{ 0, 41, 43, 45, 47, 49, 51, 53, \ { 0, 41, 43, 45, 47, 49, 51, 53, \
55, 58, 60, 63, 66, 70, 73, 76, \ 55, 58, 60, 63, 66, 70, 73, 76, \
79, 83, 87, 90, 94, 99, 103, 107, \ 79, 83, 87, 90, 94, 99, 103, 107, \
112, 118, 123, 129, 134, 140, 147, 153 }, 112, 118, 123, 129, 134, 140, 147, 153 },
#define TI_2802_PITCH \ #define TI_2802_PITCH \
/* P */\ /* P */\
@ -155,14 +155,14 @@ struct tms5100_coeffs
#define TI_0280_PATENT_LPC \ #define TI_0280_PATENT_LPC \
/* K1 */\ /* K1 */\
{ -501, -497, -493, -488, -480, -471, -460, -446,\ { -501, -497, -493, -488, -480, -471, -460, -446,\
-427, -405, -378, -344, -305, -259, -206, -148,\ -427, -405, -378, -344, -305, -259, -206, -148,\
-86, -21, 45, 110, 171, 227, 277, 320,\ -86, -21, 45, 110, 171, 227, 277, 320,\
357, 388, 413, 434, 451, 464, 474, 498 },\ 357, 388, 413, 434, 451, 464, 474, 498 },\
/* K2 */\ /* K2 */\
{ -349, -328, -305, -280, -252, -223, -192, -158,\ { -349, -328, -305, -280, -252, -223, -192, -158,\
-124, -88, -51, -14, 23, 60, 97, 133,\ -124, -88, -51, -14, 23, 60, 97, 133,\
167, 199, 230, 259, 286, 310, 333, 354,\ 167, 199, 230, 259, 286, 310, 333, 354,\
372, 389, 404, 417, 429, 439, 449, 506 },\ 372, 389, 404, 417, 429, 439, 449, 506 },\
/* K3 */\ /* K3 */\
{ -397, -365, -327, -282, -229, -170, -104, -36,\ { -397, -365, -327, -282, -229, -170, -104, -36,\
35, 104, 169, 228, 281, 326, 364, 396 },\ 35, 104, 169, 228, 281, 326, 364, 396 },\
@ -188,17 +188,17 @@ struct tms5100_coeffs
#define TI_2801_2501E_LPC \ #define TI_2801_2501E_LPC \
/* K1 */\ /* K1 */\
{ -501, -498, -495, -490, -485, -478, -469, -459,\ { -501, -498, -495, -490, -485, -478, -469, -459,\
-446, -431, -412, -389, -362, -331, -295, -253,\ -446, -431, -412, -389, -362, -331, -295, -253,\
-207, -156, -102, -45, 13, 70, 126, 179,\ -207, -156, -102, -45, 13, 70, 126, 179,\
228, 272, 311, 345, 374, 399, 420, 437 },\ 228, 272, 311, 345, 374, 399, 420, 437 },\
/* K2 */\ /* K2 */\
{ -376, -357, -335, -312, -286, -258, -227, -195,\ { -376, -357, -335, -312, -286, -258, -227, -195,\
-161, -124, -87, -49, -10, 29, 68, 106,\ -161, -124, -87, -49, -10, 29, 68, 106,\
143, 178, 212, 243, 272, 299, 324, 346,\ 143, 178, 212, 243, 272, 299, 324, 346,\
366, 384, 400, 414, 427, 438, 448, 506 },\ 366, 384, 400, 414, 427, 438, 448, 506 },\
/* K3 */\ /* K3 */\
{ -407, -381, -349, -311, -268, -218, -162, -102,\ { -407, -381, -349, -311, -268, -218, -162, -102,\
-39, 25, 89, 149, 206, 257, 302, 341 },\ -39, 25, 89, 149, 206, 257, 302, 341 },\
/* K4 */\ /* K4 */\
{ -290, -252, -209, -163, -114, -62, -9, 44,\ { -290, -252, -209, -163, -114, -62, -9, 44,\
97, 147, 194, 238, 278, 313, 344, 371 },\ 97, 147, 194, 238, 278, 313, 344, 371 },\
@ -207,7 +207,7 @@ struct tms5100_coeffs
49, 101, 150, 196, 239, 278, 313, 344 },\ 49, 101, 150, 196, 239, 278, 313, 344 },\
/* K6 */\ /* K6 */\
{ -193, -152, -109, -65, -20, 26, 71, 115,\ { -193, -152, -109, -65, -20, 26, 71, 115,\
158, 198, 235, 270, 301, 330, 355, 377 },\ 158, 198, 235, 270, 301, 330, 355, 377 },\
/* K7 */\ /* K7 */\
{ -254, -218, -180, -140, -97, -53, -8, 36,\ { -254, -218, -180, -140, -97, -53, -8, 36,\
81, 124, 165, 204, 240, 274, 304, 332 },\ 81, 124, 165, 204, 240, 274, 304, 332 },\
@ -222,26 +222,26 @@ struct tms5100_coeffs
#define TI_2802_LPC \ #define TI_2802_LPC \
/* K1 */\ /* K1 */\
{ -501, -498, -495, -490, -485, -478, -469, -459,\ { -501, -498, -495, -490, -485, -478, -469, -459,\
-446, -431, -412, -389, -362, -331, -295, -253,\ -446, -431, -412, -389, -362, -331, -295, -253,\
-207, -156, -102, -45, 13, 70, 126, 179,\ -207, -156, -102, -45, 13, 70, 126, 179,\
228, 272, 311, 345, 374, 399, 420, 437},\ 228, 272, 311, 345, 374, 399, 420, 437},\
/* K2 */\ /* K2 */\
{ -376, -357, -335, -312, -286, -258, -227, -195,\ { -376, -357, -335, -312, -286, -258, -227, -195,\
-161, -124, -87, -49, -10, 29, 68, 106,\ -161, -124, -87, -49, -10, 29, 68, 106,\
143, 178, 212, 243, 272, 299, 324, 346,\ 143, 178, 212, 243, 272, 299, 324, 346,\
366, 384, 400, 414, 427, 438, 448, 506},\ 366, 384, 400, 414, 427, 438, 448, 506},\
/* K3 */\ /* K3 */\
{ -407, -381, -349, -311, -268, -218, -162, -102,\ { -407, -381, -349, -311, -268, -218, -162, -102,\
-39, 25, 89, 149, 206, 257, 302, 341},\ -39, 25, 89, 149, 206, 257, 302, 341},\
/* K4 */\ /* K4 */\
{ -289, -248, -202, -152, -98, -43, 14, 71,\ { -289, -248, -202, -152, -98, -43, 14, 71,\
125, 177, 225, 269, 307, 341, 371, 506},\ 125, 177, 225, 269, 307, 341, 371, 506},\
/* K5 */\ /* K5 */\
{ -318, -283, -245, -202, -156, -107, -56, -3,\ { -318, -283, -245, -202, -156, -107, -56, -3,\
49, 101, 150, 196, 239, 278, 313, 344},\ 49, 101, 150, 196, 239, 278, 313, 344},\
/* K6 */\ /* K6 */\
{ -193, -152, -109, -65, -20, 26, 71, 115,\ { -193, -152, -109, -65, -20, 26, 71, 115,\
158, 198, 235, 270, 301, 330, 355, 377},\ 158, 198, 235, 270, 301, 330, 355, 377},\
/* K7 */\ /* K7 */\
{ -254, -218, -180, -140, -97, -53, -8, 36,\ { -254, -218, -180, -140, -97, -53, -8, 36,\
81, 124, 165, 204, 240, 274, 304, 332},\ 81, 124, 165, 204, 240, 274, 304, 332},\
@ -255,20 +255,20 @@ struct tms5100_coeffs
#define TI_5110_5220_LPC \ #define TI_5110_5220_LPC \
/* K1 */\ /* K1 */\
{ -501, -498, -497, -495, -493, -491, -488, -482,\ { -501, -498, -497, -495, -493, -491, -488, -482,\
-478, -474, -469, -464, -459, -452, -445, -437,\ -478, -474, -469, -464, -459, -452, -445, -437,\
-412, -380, -339, -288, -227, -158, -81, -1,\ -412, -380, -339, -288, -227, -158, -81, -1,\
80, 157, 226, 287, 337, 379, 411, 436 },\ 80, 157, 226, 287, 337, 379, 411, 436 },\
/* K2 */\ /* K2 */\
{ -328, -303, -274, -244, -211, -175, -138, -99,\ { -328, -303, -274, -244, -211, -175, -138, -99,\
-59, -18, 24, 64, 105, 143, 180, 215,\ -59, -18, 24, 64, 105, 143, 180, 215,\
248, 278, 306, 331, 354, 374, 392, 408,\ 248, 278, 306, 331, 354, 374, 392, 408,\
422, 435, 445, 455, 463, 470, 476, 506 },\ 422, 435, 445, 455, 463, 470, 476, 506 },\
/* K3 */\ /* K3 */\
{ -441, -387, -333, -279, -225, -171, -117, -63,\ { -441, -387, -333, -279, -225, -171, -117, -63,\
-9, 45, 98, 152, 206, 260, 314, 368 },\ -9, 45, 98, 152, 206, 260, 314, 368 },\
/* K4 */\ /* K4 */\
{ -328, -273, -217, -161, -106, -50, 5, 61,\ { -328, -273, -217, -161, -106, -50, 5, 61,\
116, 172, 228, 283, 339, 394, 450, 506 },\ 116, 172, 228, 283, 339, 394, 450, 506 },\
/* K5 */\ /* K5 */\
{ -328, -282, -235, -189, -142, -96, -50, -3,\ { -328, -282, -235, -189, -142, -96, -50, -3,\
43, 90, 136, 182, 229, 275, 322, 368 },\ 43, 90, 136, 182, 229, 275, 322, 368 },\

2
src/emu/sound/x1_010.c
View File

@ -22,7 +22,7 @@ Registers:
Reg: Bits: Meaning: Reg: Bits: Meaning:
0 7--- ---- Frequency divider flag (only downtown seems to set this) 0 7--- ---- Frequency divider flag (only downtown seems to set this)
-654 3--- -654 3---
---- -2-- PCM/Waveform repeat flag (0:Ones 1:Repeat) (*1) ---- -2-- PCM/Waveform repeat flag (0:Ones 1:Repeat) (*1)
---- --1- Sound out select (0:PCM 1:Waveform) ---- --1- Sound out select (0:PCM 1:Waveform)
---- ---0 Key on / off ---- ---0 Key on / off

10
src/emu/video/rgbsse.h
View File

@ -23,10 +23,10 @@ extern const struct _rgbsse_statics
{ {
__m128 dummy_for_alignment; __m128 dummy_for_alignment;
INT16 maxbyte[8]; INT16 maxbyte[8];
INT16 alpha_mask[8]; INT16 alpha_mask[8];
INT16 red_mask[8]; INT16 red_mask[8];
INT16 green_mask[8]; INT16 green_mask[8];
INT16 blue_mask[8]; INT16 blue_mask[8];
INT16 scale_table[256][8]; INT16 scale_table[256][8];
} rgbsse_statics; } rgbsse_statics;
@ -434,7 +434,7 @@ public:
} }
protected: protected:
__m128i m_value; __m128i m_value;
}; };
#endif /* __RGBSSE__ */ #endif /* __RGBSSE__ */

22
src/emu/video/rgbvmx.h
View File

@ -487,19 +487,19 @@ public:
} }
protected: protected:
typedef vector unsigned char VECU8; typedef vector unsigned char VECU8;
typedef vector signed short VECS16; typedef vector signed short VECS16;
typedef vector unsigned short VECU16; typedef vector unsigned short VECU16;
typedef vector signed int VECS32; typedef vector signed int VECS32;
typedef vector unsigned int VECU32; typedef vector unsigned int VECU32;
vector VECU32 m_value; vector VECU32 m_value;
static const VECU8 alpha_perm; static const VECU8 alpha_perm;
static const VECU8 red_perm; static const VECU8 red_perm;
static const VECU8 green_perm; static const VECU8 green_perm;
static const VECU8 blue_perm; static const VECU8 blue_perm;
static const VECS16 scale_table[256]; static const VECS16 scale_table[256];
}; };

14
src/emu/video/vooddefs.h
View File

@ -1,4 +1,4 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Aaron Giles // copyright-holders:Aaron Giles
/*************************************************************************** /***************************************************************************
@ -2212,13 +2212,13 @@ INLINE UINT32 clampARGB(INT32 iterr, INT32 iterg, INT32 iterb, INT32 itera, UINT
//if (r == 0xfff) //if (r == 0xfff)
rgbaint_t temp(colorint); rgbaint_t temp(colorint);
temp.cmpeq_imm(0xfff); temp.cmpeq_imm(0xfff);
// result.rgb.r = 0; // result.rgb.r = 0;
temp.xor_imm(0xffffffff); temp.xor_imm(0xffffffff);
colorint.and_reg(temp); colorint.and_reg(temp);
//else if (r == 0x100) //else if (r == 0x100)
temp.set(colorint); temp.set(colorint);
temp.cmpeq_imm(0x100); temp.cmpeq_imm(0x100);
// result.rgb.r = 0xff; // result.rgb.r = 0xff;
colorint.or_reg(temp); colorint.or_reg(temp);
return colorint.to_rgba(); return colorint.to_rgba();
} }
@ -3842,15 +3842,15 @@ INLINE bool depthTest(UINT16 zaColorReg, stats_block *stats, INT32 destDepth, UI
\ \
/* perform alpha blending */ \ /* perform alpha blending */ \
APPLY_ALPHA_BLEND(FBZMODE, ALPHAMODE, XX, DITHER, r, g, b, a); \ APPLY_ALPHA_BLEND(FBZMODE, ALPHAMODE, XX, DITHER, r, g, b, a); \
} else { \ } else { \
/* perform fogging */ \ /* perform fogging */ \
rgb_union preFog; \ rgb_union preFog; \
preFog.u = color.u; \ preFog.u = color.u; \
applyFogging(VV, FOGMODE, FBZCOLORPATH, XX, DITHER4, fogdepth, color, ITERZ, ITERW, ITERAXXX); \ applyFogging(VV, FOGMODE, FBZCOLORPATH, XX, DITHER4, fogdepth, color, ITERZ, ITERW, ITERAXXX); \
/* perform alpha blending */ \ /* perform alpha blending */ \
alphaBlend(FBZMODE, ALPHAMODE, XX, DITHER, dest[XX], depth, preFog, color); \ alphaBlend(FBZMODE, ALPHAMODE, XX, DITHER, dest[XX], depth, preFog, color); \
a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \ a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \
} \ } \
/* modify the pixel for debugging purposes */ \ /* modify the pixel for debugging purposes */ \
MODIFY_PIXEL(VV); \ MODIFY_PIXEL(VV); \
\ \
@ -4589,7 +4589,7 @@ static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, co
} \ } \
\ \
/* colorpath pipeline selects source colors and does blending */ \ /* colorpath pipeline selects source colors and does blending */ \
iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \ iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \
if (!combineColor(v, stats, FBZCOLORPATH, FBZMODE, ALPHAMODE, texel, iterz, iterw, iterargb, color)) \ if (!combineColor(v, stats, FBZCOLORPATH, FBZMODE, ALPHAMODE, texel, iterz, iterw, iterargb, color)) \
goto skipdrawdepth; \ goto skipdrawdepth; \
} \ } \

2
src/lib/formats/flopimg.c
View File

@ -2565,7 +2565,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_fm_pc(const UINT8 *bi
} }
// f8, f9, fa, fb // f8, f9, fa, fb
if(shift_reg == 0xf56a || shift_reg == 0xf56b || if(shift_reg == 0xf56a || shift_reg == 0xf56b ||
shift_reg == 0xf56e || shift_reg == 0xf56f) { // data mark shift_reg == 0xf56e || shift_reg == 0xf56f) { // data mark
if(dblk_count < 100) if(dblk_count < 100)
dblk[dblk_count++] = i+1; dblk[dblk_count++] = i+1;
} }

2
src/lib/formats/jvc_dsk.c
View File

@ -55,7 +55,7 @@ bool jvc_format::parse_header(io_generic *io, int &header_size, int &tracks, int
switch (header_size) switch (header_size)
{ {
case 5: emu_fatalerror("jvc_format: sector attribute flag unsupported\n"); case 5: emu_fatalerror("jvc_format: sector attribute flag unsupported\n");
break; break;
case 4: base_sector_id = header[3]; case 4: base_sector_id = header[3];
// no break // no break

3
src/lib/formats/svi_dsk.c
View File

@ -118,7 +118,7 @@ bool svi_format::save(io_generic *io, floppy_image *image)
for (int head = 0; head < head_count; head++) for (int head = 0; head < head_count; head++)
{ {
// skip track 0, head 0 // skip track 0, head 0
if (track == 0) { if (head_count == 1) break; else head++; } if (track == 0) { if (head_count == 1) break; else head++; }
generate_bitstream_from_track(track, head, 2000, bitstream, track_size, image); generate_bitstream_from_track(track, head, 2000, bitstream, track_size, image);
extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data)); extract_sectors_from_bitstream_mfm_pc(bitstream, track_size, sectors, sector_data, sizeof(sector_data));
@ -140,4 +140,3 @@ bool svi_format::supports_save() const
} }
const floppy_format_type FLOPPY_SVI_FORMAT = &floppy_image_format_creator<svi_format>; const floppy_format_type FLOPPY_SVI_FORMAT = &floppy_image_format_creator<svi_format>;

4
src/lib/formats/trs80_dsk.c
View File

@ -8,8 +8,8 @@
Used by Jeff Vavasour's TRS-80 Emulators Used by Jeff Vavasour's TRS-80 Emulators
TODO: TODO:
- Gap sizes unverified - Gap sizes unverified
***************************************************************************/ ***************************************************************************/

2
src/lib/formats/vdk_dsk.c
View File

@ -102,7 +102,7 @@ bool vdk_format::save(io_generic *io, floppy_image *image)
header[0] = 'd'; header[0] = 'd';
header[1] = 'k'; header[1] = 'k';
header[2] = sizeof(header) % 0x100; header[2] = sizeof(header) % 0x100;
header[3] = sizeof(header) / 0x100; header[3] = sizeof(header) / 0x100;
header[4] = 0x10; header[4] = 0x10;
header[5] = 0x10; header[5] = 0x10;
header[6] = 'M'; header[6] = 'M';

1
src/lib/formats/wd177x_dsk.c
View File

@ -204,7 +204,6 @@ bool wd177x_format::load(io_generic *io, UINT32 form_factor, floppy_image *image
for(int track=0; track < f.track_count; track++) for(int track=0; track < f.track_count; track++)
for(int head=0; head < f.head_count; head++) { for(int head=0; head < f.head_count; head++) {
if (f.encoding == floppy_image::FM) if (f.encoding == floppy_image::FM)
desc[14].p1 = get_track_dam_fm(f, head, track); desc[14].p1 = get_track_dam_fm(f, head, track);
else else

250
src/lib/util/avhuff.c
View File

@ -174,11 +174,11 @@ inline UINT32 avhuff_decoder::deltarle_decoder::decode_one(bitstream_in &bitbuf)
//************************************************************************** //**************************************************************************
/** /**
* @fn avhuff_encoder::avhuff_encoder() * @fn avhuff_encoder::avhuff_encoder()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* avhuff_encoder - constructor * avhuff_encoder - constructor
* -------------------------------------------------. * -------------------------------------------------.
*/ */
avhuff_encoder::avhuff_encoder() avhuff_encoder::avhuff_encoder()
@ -189,17 +189,17 @@ m_flac_encoder.set_strip_metadata(true);
} }
/** /**
* @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength) * @fn avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* encode_data - encode a block of data into a compressed data stream * encode_data - encode a block of data into a compressed data stream
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param [in,out] complength The complength. * @param [in,out] complength The complength.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength) avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT32 &complength)
@ -278,15 +278,15 @@ avhuff_error avhuff_encoder::encode_data(const UINT8 *source, UINT8 *dest, UINT3
} }
/** /**
* @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) * @fn UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* raw_data_size - return the raw data size of a raw stream based on the header * raw_data_size - return the raw data size of a raw stream based on the header
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param data The data. * @param data The data.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 avhuff_encoder::raw_data_size(const UINT8 *data) UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
@ -308,21 +308,21 @@ UINT32 avhuff_encoder::raw_data_size(const UINT8 *data)
} }
/** /**
* @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) * @fn avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* assemble_data - assemble a datastream from raw bits * assemble_data - assemble a datastream from raw bits
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] buffer The buffer. * @param [in,out] buffer The buffer.
* @param [in,out] bitmap The bitmap. * @param [in,out] bitmap The bitmap.
* @param channels The channels. * @param channels The channels.
* @param numsamples The numsamples. * @param numsamples The numsamples.
* @param [in,out] samples If non-null, the samples. * @param [in,out] samples If non-null, the samples.
* @param [in,out] metadata If non-null, the metadata. * @param [in,out] metadata If non-null, the metadata.
* @param metadatasize The metadatasize. * @param metadatasize The metadatasize.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize) avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16 &bitmap, UINT8 channels, UINT32 numsamples, INT16 **samples, UINT8 *metadata, UINT32 metadatasize)
@ -378,19 +378,19 @@ avhuff_error avhuff_encoder::assemble_data(dynamic_buffer &buffer, bitmap_yuy16
} }
/** /**
* @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes) * @fn avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* encode_audio - encode raw audio data to the destination * encode_audio - encode raw audio data to the destination
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param channels The channels. * @param channels The channels.
* @param samples The samples. * @param samples The samples.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param [in,out] sizes If non-null, the sizes. * @param [in,out] sizes If non-null, the sizes.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes) avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int samples, UINT8 *dest, UINT8 *sizes)
@ -511,19 +511,19 @@ avhuff_error avhuff_encoder::encode_audio(const UINT8 *source, int channels, int
} }
/** /**
* @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) * @fn avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* encode_video - encode raw video data to the destination * encode_video - encode raw video data to the destination
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param [in,out] complength The complength. * @param [in,out] complength The complength.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
@ -533,20 +533,20 @@ avhuff_error avhuff_encoder::encode_video(const UINT8 *source, int width, int he
} }
/** /**
* @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) * @fn avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* encode_video_lossless - do a lossless video encoding using deltas and huffman * encode_video_lossless - do a lossless video encoding using deltas and huffman
* encoding * encoding
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param [in,out] complength The complength. * @param [in,out] complength The complength.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength) avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int width, int height, UINT8 *dest, UINT32 &complength)
@ -601,18 +601,18 @@ avhuff_error avhuff_encoder::encode_video_lossless(const UINT8 *source, int widt
//************************************************************************** //**************************************************************************
/** /**
* @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count) * @fn UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data * rle_and_histo_bitmap - RLE compress and histogram a bitmap's worth of data
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param items_per_row The items per row. * @param items_per_row The items per row.
* @param item_advance The item advance. * @param item_advance The item advance.
* @param row_count Number of rows. * @param row_count Number of rows.
* *
* @return null if it fails, else an UINT16*. * @return null if it fails, else an UINT16*.
*/ */
UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count) UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *source, UINT32 items_per_row, UINT32 item_advance, UINT32 row_count)
@ -679,11 +679,11 @@ UINT16 *avhuff_encoder::deltarle_encoder::rle_and_histo_bitmap(const UINT8 *sour
//************************************************************************** //**************************************************************************
/** /**
* @fn avhuff_decoder::avhuff_decoder() * @fn avhuff_decoder::avhuff_decoder()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* avhuff_decoder - constructor * avhuff_decoder - constructor
* -------------------------------------------------. * -------------------------------------------------.
*/ */
avhuff_decoder::avhuff_decoder() avhuff_decoder::avhuff_decoder()
@ -691,13 +691,13 @@ avhuff_decoder::avhuff_decoder()
} }
/** /**
* @fn void avhuff_decoder::configure(const avhuff_decompress_config &config) * @fn void avhuff_decoder::configure(const avhuff_decompress_config &config)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* configure - configure decompression parameters * configure - configure decompression parameters
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param config The configuration. * @param config The configuration.
*/ */
void avhuff_decoder::configure(const avhuff_decompress_config &config) void avhuff_decoder::configure(const avhuff_decompress_config &config)
@ -712,17 +712,17 @@ void avhuff_decoder::configure(const avhuff_decompress_config &config)
} }
/** /**
* @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest) * @fn avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decode_data - decode both audio and video from a raw data stream * decode_data - decode both audio and video from a raw data stream
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param complength The complength. * @param complength The complength.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest) avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength, UINT8 *dest)
@ -853,23 +853,23 @@ avhuff_error avhuff_decoder::decode_data(const UINT8 *source, UINT32 complength,
} }
/** /**
* @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes) * @fn avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decode_audio - decode audio from a compressed data stream * decode_audio - decode audio from a compressed data stream
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
* condition occurs. * condition occurs.
* *
* @param channels The channels. * @param channels The channels.
* @param samples The samples. * @param samples The samples.
* @param source Source for the. * @param source Source for the.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param dxor The dxor. * @param dxor The dxor.
* @param sizes The sizes. * @param sizes The sizes.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes) avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8 *source, UINT8 **dest, UINT32 dxor, const UINT8 *sizes)
@ -991,21 +991,21 @@ avhuff_error avhuff_decoder::decode_audio(int channels, int samples, const UINT8
} }
/** /**
* @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) * @fn avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decode_video - decode video from a compressed data stream * decode_video - decode video from a compressed data stream
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param source Source for the. * @param source Source for the.
* @param complength The complength. * @param complength The complength.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param dstride The dstride. * @param dstride The dstride.
* @param dxor The dxor. * @param dxor The dxor.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
@ -1018,22 +1018,22 @@ avhuff_error avhuff_decoder::decode_video(int width, int height, const UINT8 *so
} }
/** /**
* @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) * @fn avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decode_video_lossless - do a lossless video decoding using deltas and huffman * decode_video_lossless - do a lossless video decoding using deltas and huffman
* encoding * encoding
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param source Source for the. * @param source Source for the.
* @param complength The complength. * @param complength The complength.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param dstride The dstride. * @param dstride The dstride.
* @param dxor The dxor. * @param dxor The dxor.
* *
* @return An avhuff_error. * @return An avhuff_error.
*/ */
avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor) avhuff_error avhuff_decoder::decode_video_lossless(int width, int height, const UINT8 *source, UINT32 complength, UINT8 *dest, UINT32 dstride, UINT32 dxor)

898
src/lib/util/aviio.c
View File

File diff suppressed because it is too large Load Diff

156
src/lib/util/bitmap.c
View File

@ -20,9 +20,9 @@
// CONSTANTS // CONSTANTS
//************************************************************************** //**************************************************************************
/** @brief alignment values; 128 bytes is the largest cache line on typical architectures today. */ /** @brief alignment values; 128 bytes is the largest cache line on typical architectures today. */
const UINT32 BITMAP_OVERALL_ALIGN = 128; const UINT32 BITMAP_OVERALL_ALIGN = 128;
/** @brief The bitmap rowbytes align. */ /** @brief The bitmap rowbytes align. */
const UINT32 BITMAP_ROWBYTES_ALIGN = 128; const UINT32 BITMAP_ROWBYTES_ALIGN = 128;
@ -62,18 +62,18 @@ inline void bitmap_t::compute_base(int xslop, int yslop)
//************************************************************************** //**************************************************************************
/** /**
* @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop) * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* bitmap_t - basic constructor * bitmap_t - basic constructor
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param format Describes the format to use. * @param format Describes the format to use.
* @param bpp The bits per pixel. * @param bpp The bits per pixel.
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param xslop The xslop. * @param xslop The xslop.
* @param yslop The yslop. * @param yslop The yslop.
*/ */
bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop) bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xslop, int yslop)
@ -88,16 +88,16 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, int width, int height, int xsl
} }
/** /**
* @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels) * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels)
* *
* @brief Constructor. * @brief Constructor.
* *
* @param format Describes the format to use. * @param format Describes the format to use.
* @param bpp The bits per pixel. * @param bpp The bits per pixel.
* @param [in,out] base If non-null, the base. * @param [in,out] base If non-null, the base.
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param rowpixels The rowpixels. * @param rowpixels The rowpixels.
*/ */
bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels) bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int height, int rowpixels)
@ -115,14 +115,14 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, void *base, int width, int hei
} }
/** /**
* @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect) * @fn bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect)
* *
* @brief Constructor. * @brief Constructor.
* *
* @param format Describes the format to use. * @param format Describes the format to use.
* @param bpp The bits per pixel. * @param bpp The bits per pixel.
* @param [in,out] source Source for the. * @param [in,out] source Source for the.
* @param subrect The subrect. * @param subrect The subrect.
*/ */
bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect) bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectangle &subrect)
@ -143,11 +143,11 @@ bitmap_t::bitmap_t(bitmap_format format, int bpp, bitmap_t &source, const rectan
} }
/** /**
* @fn bitmap_t::~bitmap_t() * @fn bitmap_t::~bitmap_t()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ~bitmap_t - basic destructor * ~bitmap_t - basic destructor
* -------------------------------------------------. * -------------------------------------------------.
*/ */
bitmap_t::~bitmap_t() bitmap_t::~bitmap_t()
@ -157,17 +157,17 @@ bitmap_t::~bitmap_t()
} }
/** /**
* @fn void bitmap_t::allocate(int width, int height, int xslop, int yslop) * @fn void bitmap_t::allocate(int width, int height, int xslop, int yslop)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* allocate -- (re)allocate memory for the bitmap at the given size, destroying * allocate -- (re)allocate memory for the bitmap at the given size, destroying
* anything that already exists * anything that already exists
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param xslop The xslop. * @param xslop The xslop.
* @param yslop The yslop. * @param yslop The yslop.
*/ */
void bitmap_t::allocate(int width, int height, int xslop, int yslop) void bitmap_t::allocate(int width, int height, int xslop, int yslop)
@ -201,17 +201,17 @@ void bitmap_t::allocate(int width, int height, int xslop, int yslop)
} }
/** /**
* @fn void bitmap_t::resize(int width, int height, int xslop, int yslop) * @fn void bitmap_t::resize(int width, int height, int xslop, int yslop)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* resize -- resize a bitmap, reusing existing memory if the new size is smaller than * resize -- resize a bitmap, reusing existing memory if the new size is smaller than
* the current size * the current size
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param xslop The xslop. * @param xslop The xslop.
* @param yslop The yslop. * @param yslop The yslop.
*/ */
void bitmap_t::resize(int width, int height, int xslop, int yslop) void bitmap_t::resize(int width, int height, int xslop, int yslop)
@ -248,11 +248,11 @@ void bitmap_t::resize(int width, int height, int xslop, int yslop)
} }
/** /**
* @fn void bitmap_t::reset() * @fn void bitmap_t::reset()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* reset -- reset to an invalid bitmap, deleting all allocated stuff * reset -- reset to an invalid bitmap, deleting all allocated stuff
* -------------------------------------------------. * -------------------------------------------------.
*/ */
void bitmap_t::reset() void bitmap_t::reset()
@ -271,16 +271,16 @@ void bitmap_t::reset()
} }
/** /**
* @fn void bitmap_t::wrap(void *base, int width, int height, int rowpixels) * @fn void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* wrap -- wrap an array of memory; the target bitmap does not own the memory * wrap -- wrap an array of memory; the target bitmap does not own the memory
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] base If non-null, the base. * @param [in,out] base If non-null, the base.
* @param width The width. * @param width The width.
* @param height The height. * @param height The height.
* @param rowpixels The rowpixels. * @param rowpixels The rowpixels.
*/ */
void bitmap_t::wrap(void *base, int width, int height, int rowpixels) void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
@ -297,15 +297,15 @@ void bitmap_t::wrap(void *base, int width, int height, int rowpixels)
} }
/** /**
* @fn void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect) * @fn void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* wrap -- wrap a subrectangle of an existing bitmap by copying its fields; the target * wrap -- wrap a subrectangle of an existing bitmap by copying its fields; the target
* bitmap does not own the memory * bitmap does not own the memory
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param subrect The subrect. * @param subrect The subrect.
*/ */
void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect) void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
@ -327,13 +327,13 @@ void bitmap_t::wrap(const bitmap_t &source, const rectangle &subrect)
} }
/** /**
* @fn void bitmap_t::set_palette(palette_t *palette) * @fn void bitmap_t::set_palette(palette_t *palette)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* set_palette -- associate a palette with a bitmap * set_palette -- associate a palette with a bitmap
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] palette If non-null, the palette. * @param [in,out] palette If non-null, the palette.
*/ */
void bitmap_t::set_palette(palette_t *palette) void bitmap_t::set_palette(palette_t *palette)
@ -354,14 +354,14 @@ void bitmap_t::set_palette(palette_t *palette)
} }
/** /**
* @fn void bitmap_t::fill(UINT32 color, const rectangle &cliprect) * @fn void bitmap_t::fill(UINT32 color, const rectangle &cliprect)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* fill -- fill a bitmap with a solid color * fill -- fill a bitmap with a solid color
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param color The color. * @param color The color.
* @param cliprect The cliprect. * @param cliprect The cliprect.
*/ */
void bitmap_t::fill(UINT32 color, const rectangle &cliprect) void bitmap_t::fill(UINT32 color, const rectangle &cliprect)

368
src/lib/util/cdrom.c
View File

@ -28,39 +28,39 @@
DEBUGGING DEBUGGING
***************************************************************************/ ***************************************************************************/
/** @brief The verbose. */ /** @brief The verbose. */
#define VERBOSE (0) #define VERBOSE (0)
#if VERBOSE #if VERBOSE
/** /**
* @def LOG(x) do * @def LOG(x) do
* *
* @brief A macro that defines log. * @brief A macro that defines log.
* *
* @param x The void to process. * @param x The void to process.
*/ */
#define LOG(x) do { if (VERBOSE) logerror x; } while (0) #define LOG(x) do { if (VERBOSE) logerror x; } while (0)
/** /**
* @fn void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2); * @fn void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
* *
* @brief Logerrors the given text. * @brief Logerrors the given text.
* *
* @param text The text. * @param text The text.
* *
* @return A CLIB_DECL. * @return A CLIB_DECL.
*/ */
void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2); void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
#else #else
/** /**
* @def LOG(x); * @def LOG(x);
* *
* @brief A macro that defines log. * @brief A macro that defines log.
* *
* @param x The void to process. * @param x The void to process.
*/ */
#define LOG(x) #define LOG(x)
@ -72,26 +72,26 @@ void CLIB_DECL logerror(const char *text, ...) ATTR_PRINTF(1,2);
CONSTANTS CONSTANTS
***************************************************************************/ ***************************************************************************/
/** @brief offset within sector. */ /** @brief offset within sector. */
const int SYNC_OFFSET = 0x000; const int SYNC_OFFSET = 0x000;
/** @brief 12 bytes. */ /** @brief 12 bytes. */
const int SYNC_NUM_BYTES = 12; const int SYNC_NUM_BYTES = 12;
/** @brief offset within sector. */ /** @brief offset within sector. */
const int MODE_OFFSET = 0x00f; const int MODE_OFFSET = 0x00f;
/** @brief offset within sector. */ /** @brief offset within sector. */
const int ECC_P_OFFSET = 0x81c; const int ECC_P_OFFSET = 0x81c;
/** @brief 2 lots of 86. */ /** @brief 2 lots of 86. */
const int ECC_P_NUM_BYTES = 86; const int ECC_P_NUM_BYTES = 86;
/** @brief 24 bytes each. */ /** @brief 24 bytes each. */
const int ECC_P_COMP = 24; const int ECC_P_COMP = 24;
/** @brief The ECC q offset. */ /** @brief The ECC q offset. */
const int ECC_Q_OFFSET = ECC_P_OFFSET + 2 * ECC_P_NUM_BYTES; const int ECC_Q_OFFSET = ECC_P_OFFSET + 2 * ECC_P_NUM_BYTES;
/** @brief 2 lots of 52. */ /** @brief 2 lots of 52. */
const int ECC_Q_NUM_BYTES = 52; const int ECC_Q_NUM_BYTES = 52;
/** @brief 43 bytes each. */ /** @brief 43 bytes each. */
const int ECC_Q_COMP = 43; const int ECC_Q_COMP = 43;
@ -101,20 +101,20 @@ const int ECC_Q_COMP = 43;
***************************************************************************/ ***************************************************************************/
/** /**
* @struct cdrom_file * @struct cdrom_file
* *
* @brief A cdrom file. * @brief A cdrom file.
*/ */
struct cdrom_file struct cdrom_file
{ {
/** @brief The chd. */ /** @brief The chd. */
chd_file * chd; /* CHD file */ chd_file * chd; /* CHD file */
/** @brief The cdtoc. */ /** @brief The cdtoc. */
cdrom_toc cdtoc; /* TOC for the CD */ cdrom_toc cdtoc; /* TOC for the CD */
/** @brief Information describing the track. */ /** @brief Information describing the track. */
chdcd_track_input_info track_info; /* track info */ chdcd_track_input_info track_info; /* track info */
/** @brief The fhandle[ CD maximum tracks]. */ /** @brief The fhandle[ CD maximum tracks]. */
core_file * fhandle[CD_MAX_TRACKS];/* file handle */ core_file * fhandle[CD_MAX_TRACKS];/* file handle */
}; };
@ -130,15 +130,15 @@ struct cdrom_file
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum) * @fn INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
* *
* @brief Physical to chd lba. * @brief Physical to chd lba.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param physlba The physlba. * @param physlba The physlba.
* @param [in,out] tracknum The tracknum. * @param [in,out] tracknum The tracknum.
* *
* @return An UINT32. * @return An UINT32.
*/ */
INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum) INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &tracknum)
@ -164,15 +164,15 @@ INLINE UINT32 physical_to_chd_lba(cdrom_file *file, UINT32 physlba, UINT32 &trac
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum) * @fn INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
* *
* @brief Logical to chd lba. * @brief Logical to chd lba.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param loglba The loglba. * @param loglba The loglba.
* @param [in,out] tracknum The tracknum. * @param [in,out] tracknum The tracknum.
* *
* @return An UINT32. * @return An UINT32.
*/ */
INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum) INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &tracknum)
@ -208,13 +208,13 @@ INLINE UINT32 logical_to_chd_lba(cdrom_file *file, UINT32 loglba, UINT32 &trackn
***************************************************************************/ ***************************************************************************/
/** /**
* @fn cdrom_file *cdrom_open(const char *inputfile) * @fn cdrom_file *cdrom_open(const char *inputfile)
* *
* @brief Queries if a given cdrom open. * @brief Queries if a given cdrom open.
* *
* @param inputfile The inputfile. * @param inputfile The inputfile.
* *
* @return null if it fails, else a cdrom_file*. * @return null if it fails, else a cdrom_file*.
*/ */
cdrom_file *cdrom_open(const char *inputfile) cdrom_file *cdrom_open(const char *inputfile)
@ -304,13 +304,13 @@ cdrom_file *cdrom_open(const char *inputfile)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn cdrom_file *cdrom_open(chd_file *chd) * @fn cdrom_file *cdrom_open(chd_file *chd)
* *
* @brief Queries if a given cdrom open. * @brief Queries if a given cdrom open.
* *
* @param [in,out] chd If non-null, the chd. * @param [in,out] chd If non-null, the chd.
* *
* @return null if it fails, else a cdrom_file*. * @return null if it fails, else a cdrom_file*.
*/ */
cdrom_file *cdrom_open(chd_file *chd) cdrom_file *cdrom_open(chd_file *chd)
@ -402,11 +402,11 @@ cdrom_file *cdrom_open(chd_file *chd)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void cdrom_close(cdrom_file *file) * @fn void cdrom_close(cdrom_file *file)
* *
* @brief Cdrom close. * @brief Cdrom close.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
*/ */
void cdrom_close(cdrom_file *file) void cdrom_close(cdrom_file *file)
@ -432,19 +432,19 @@ void cdrom_close(cdrom_file *file)
***************************************************************************/ ***************************************************************************/
/** /**
* @fn chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length) * @fn chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length)
* *
* @brief Reads partial sector. * @brief Reads partial sector.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param lbasector The lbasector. * @param lbasector The lbasector.
* @param chdsector The chdsector. * @param chdsector The chdsector.
* @param tracknum The tracknum. * @param tracknum The tracknum.
* @param startoffs The startoffs. * @param startoffs The startoffs.
* @param length The length. * @param length The length.
* *
* @return The partial sector. * @return The partial sector.
*/ */
chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length) chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UINT32 chdsector, UINT32 tracknum, UINT32 startoffs, UINT32 length)
@ -506,17 +506,17 @@ chd_error read_partial_sector(cdrom_file *file, void *dest, UINT32 lbasector, UI
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys) * @fn UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys)
* *
* @brief Cdrom read data. * @brief Cdrom read data.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param lbasector The lbasector. * @param lbasector The lbasector.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* @param datatype The datatype. * @param datatype The datatype.
* @param phys true to physical. * @param phys true to physical.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys) UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 datatype, bool phys)
@ -592,16 +592,16 @@ UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys) * @fn UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys)
* *
* @brief Cdrom read subcode. * @brief Cdrom read subcode.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param lbasector The lbasector. * @param lbasector The lbasector.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* @param phys true to physical. * @param phys true to physical.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys) UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool phys)
@ -642,14 +642,14 @@ UINT32 cdrom_read_subcode(cdrom_file *file, UINT32 lbasector, void *buffer, bool
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame) * @fn UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
* *
* @brief Cdrom get track. * @brief Cdrom get track.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param frame The frame. * @param frame The frame.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame) UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
@ -672,14 +672,14 @@ UINT32 cdrom_get_track(cdrom_file *file, UINT32 frame)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track) * @fn UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
* *
* @brief Cdrom get track start. * @brief Cdrom get track start.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param track The track. * @param track The track.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track) UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
@ -700,14 +700,14 @@ UINT32 cdrom_get_track_start(cdrom_file *file, UINT32 track)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track) * @fn UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
* *
* @brief Cdrom get track start physical. * @brief Cdrom get track start physical.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param track The track. * @param track The track.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track) UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
@ -732,13 +732,13 @@ UINT32 cdrom_get_track_start_phys(cdrom_file *file, UINT32 track)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int cdrom_get_last_track(cdrom_file *file) * @fn int cdrom_get_last_track(cdrom_file *file)
* *
* @brief Cdrom get last track. * @brief Cdrom get last track.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* *
* @return An int. * @return An int.
*/ */
int cdrom_get_last_track(cdrom_file *file) int cdrom_get_last_track(cdrom_file *file)
@ -756,14 +756,14 @@ int cdrom_get_last_track(cdrom_file *file)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int cdrom_get_adr_control(cdrom_file *file, int track) * @fn int cdrom_get_adr_control(cdrom_file *file, int track)
* *
* @brief Cdrom get address control. * @brief Cdrom get address control.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param track The track. * @param track The track.
* *
* @return An int. * @return An int.
*/ */
int cdrom_get_adr_control(cdrom_file *file, int track) int cdrom_get_adr_control(cdrom_file *file, int track)
@ -785,14 +785,14 @@ int cdrom_get_adr_control(cdrom_file *file, int track)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int cdrom_get_track_type(cdrom_file *file, int track) * @fn int cdrom_get_track_type(cdrom_file *file, int track)
* *
* @brief Cdrom get track type. * @brief Cdrom get track type.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param track The track. * @param track The track.
* *
* @return An int. * @return An int.
*/ */
int cdrom_get_track_type(cdrom_file *file, int track) int cdrom_get_track_type(cdrom_file *file, int track)
@ -810,13 +810,13 @@ int cdrom_get_track_type(cdrom_file *file, int track)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const cdrom_toc *cdrom_get_toc(cdrom_file *file) * @fn const cdrom_toc *cdrom_get_toc(cdrom_file *file)
* *
* @brief Cdrom get TOC. * @brief Cdrom get TOC.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* *
* @return null if it fails, else a cdrom_toc*. * @return null if it fails, else a cdrom_toc*.
*/ */
const cdrom_toc *cdrom_get_toc(cdrom_file *file) const cdrom_toc *cdrom_get_toc(cdrom_file *file)
@ -840,13 +840,13 @@ const cdrom_toc *cdrom_get_toc(cdrom_file *file)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize) * @fn static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize)
* *
* @brief Cdrom get information from type string. * @brief Cdrom get information from type string.
* *
* @param typestring The typestring. * @param typestring The typestring.
* @param [in,out] trktype If non-null, the trktype. * @param [in,out] trktype If non-null, the trktype.
* @param [in,out] datasize If non-null, the datasize. * @param [in,out] datasize If non-null, the datasize.
*/ */
static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize) static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize)
@ -935,12 +935,12 @@ static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trkt
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info) * @fn void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info)
* *
* @brief Cdrom convert type string to track information. * @brief Cdrom convert type string to track information.
* *
* @param typestring The typestring. * @param typestring The typestring.
* @param [in,out] info If non-null, the information. * @param [in,out] info If non-null, the information.
*/ */
void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info) void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track_info *info)
@ -955,12 +955,12 @@ void cdrom_convert_type_string_to_track_info(const char *typestring, cdrom_track
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info) * @fn void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
* *
* @brief Cdrom convert type string to pregap information. * @brief Cdrom convert type string to pregap information.
* *
* @param typestring The typestring. * @param typestring The typestring.
* @param [in,out] info If non-null, the information. * @param [in,out] info If non-null, the information.
*/ */
void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info) void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
@ -975,12 +975,12 @@ void cdrom_convert_type_string_to_pregap_info(const char *typestring, cdrom_trac
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info) * @fn void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info)
* *
* @brief Cdrom convert subtype string to track information. * @brief Cdrom convert subtype string to track information.
* *
* @param typestring The typestring. * @param typestring The typestring.
* @param [in,out] info If non-null, the information. * @param [in,out] info If non-null, the information.
*/ */
void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info) void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_track_info *info)
@ -1004,12 +1004,12 @@ void cdrom_convert_subtype_string_to_track_info(const char *typestring, cdrom_tr
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info) * @fn void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
* *
* @brief Cdrom convert subtype string to pregap information. * @brief Cdrom convert subtype string to pregap information.
* *
* @param typestring The typestring. * @param typestring The typestring.
* @param [in,out] info If non-null, the information. * @param [in,out] info If non-null, the information.
*/ */
void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info) void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_track_info *info)
@ -1032,13 +1032,13 @@ void cdrom_convert_subtype_string_to_pregap_info(const char *typestring, cdrom_t
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const char *cdrom_get_type_string(UINT32 trktype) * @fn const char *cdrom_get_type_string(UINT32 trktype)
* *
* @brief Cdrom get type string. * @brief Cdrom get type string.
* *
* @param trktype The trktype. * @param trktype The trktype.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *cdrom_get_type_string(UINT32 trktype) const char *cdrom_get_type_string(UINT32 trktype)
@ -1064,13 +1064,13 @@ const char *cdrom_get_type_string(UINT32 trktype)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const char *cdrom_get_subtype_string(UINT32 subtype) * @fn const char *cdrom_get_subtype_string(UINT32 subtype)
* *
* @brief Cdrom get subtype string. * @brief Cdrom get subtype string.
* *
* @param subtype The subtype. * @param subtype The subtype.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *cdrom_get_subtype_string(UINT32 subtype) const char *cdrom_get_subtype_string(UINT32 subtype)
@ -1095,14 +1095,14 @@ const char *cdrom_get_subtype_string(UINT32 subtype)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc) * @fn chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
* *
* @brief Cdrom parse metadata. * @brief Cdrom parse metadata.
* *
* @param [in,out] chd If non-null, the chd. * @param [in,out] chd If non-null, the chd.
* @param [in,out] toc If non-null, the TOC. * @param [in,out] toc If non-null, the TOC.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc) chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
@ -1272,14 +1272,14 @@ chd_error cdrom_parse_metadata(chd_file *chd, cdrom_toc *toc)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc) * @fn chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
* *
* @brief Cdrom write metadata. * @brief Cdrom write metadata.
* *
* @param [in,out] chd If non-null, the chd. * @param [in,out] chd If non-null, the chd.
* @param toc The TOC. * @param toc The TOC.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc) chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
@ -1327,9 +1327,9 @@ chd_error cdrom_write_metadata(chd_file *chd, const cdrom_toc *toc)
} }
/** /**
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ECC lookup tables pre-calculated tables for ECC data calcs * ECC lookup tables pre-calculated tables for ECC data calcs
* -------------------------------------------------. * -------------------------------------------------.
*/ */
static const UINT8 ecclow[256] = static const UINT8 ecclow[256] =
@ -1352,7 +1352,7 @@ static const UINT8 ecclow[256] =
0xfd, 0xff, 0xf9, 0xfb, 0xf5, 0xf7, 0xf1, 0xf3, 0xed, 0xef, 0xe9, 0xeb, 0xe5, 0xe7, 0xe1, 0xe3 0xfd, 0xff, 0xf9, 0xfb, 0xf5, 0xf7, 0xf1, 0xf3, 0xed, 0xef, 0xe9, 0xeb, 0xe5, 0xe7, 0xe1, 0xe3
}; };
/** @brief The ecchigh[ 256]. */ /** @brief The ecchigh[ 256]. */
static const UINT8 ecchigh[256] = static const UINT8 ecchigh[256] =
{ {
0x00, 0xf4, 0xf5, 0x01, 0xf7, 0x03, 0x02, 0xf6, 0xf3, 0x07, 0x06, 0xf2, 0x04, 0xf0, 0xf1, 0x05, 0x00, 0xf4, 0xf5, 0x01, 0xf7, 0x03, 0x02, 0xf6, 0xf3, 0x07, 0x06, 0xf2, 0x04, 0xf0, 0xf1, 0x05,
@ -1374,10 +1374,10 @@ static const UINT8 ecchigh[256] =
}; };
/** /**
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* poffsets - each row represents the addresses used to calculate a byte of the ECC P * poffsets - each row represents the addresses used to calculate a byte of the ECC P
* data 86 (*2) ECC P bytes, 24 values represented by each * data 86 (*2) ECC P bytes, 24 values represented by each
* -------------------------------------------------. * -------------------------------------------------.
*/ */
static const UINT16 poffsets[ECC_P_NUM_BYTES][ECC_P_COMP] = static const UINT16 poffsets[ECC_P_NUM_BYTES][ECC_P_COMP] =
@ -1471,10 +1471,10 @@ static const UINT16 poffsets[ECC_P_NUM_BYTES][ECC_P_COMP] =
}; };
/** /**
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* qoffsets - each row represents the addresses used to calculate a byte of the ECC Q * qoffsets - each row represents the addresses used to calculate a byte of the ECC Q
* data 52 (*2) ECC Q bytes, 43 values represented by each * data 52 (*2) ECC Q bytes, 43 values represented by each
* -------------------------------------------------. * -------------------------------------------------.
*/ */
static const UINT16 qoffsets[ECC_Q_NUM_BYTES][ECC_Q_COMP] = static const UINT16 qoffsets[ECC_Q_NUM_BYTES][ECC_Q_COMP] =
@ -1547,17 +1547,17 @@ inline UINT8 ecc_source_byte(const UINT8 *sector, UINT32 offset)
} }
/** /**
* @fn void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2) * @fn void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ecc_compute_bytes - calculate an ECC value (P or Q) * ecc_compute_bytes - calculate an ECC value (P or Q)
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param sector The sector. * @param sector The sector.
* @param row The row. * @param row The row.
* @param rowlen The rowlen. * @param rowlen The rowlen.
* @param [in,out] val1 The first value. * @param [in,out] val1 The first value.
* @param [in,out] val2 The second value. * @param [in,out] val2 The second value.
*/ */
void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2) void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8 &val1, UINT8 &val2)
@ -1574,15 +1574,15 @@ void ecc_compute_bytes(const UINT8 *sector, const UINT16 *row, int rowlen, UINT8
} }
/** /**
* @fn bool ecc_verify(const UINT8 *sector) * @fn bool ecc_verify(const UINT8 *sector)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ecc_verify - verify the P and Q ECC codes in a sector * ecc_verify - verify the P and Q ECC codes in a sector
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param sector The sector. * @param sector The sector.
* *
* @return true if it succeeds, false if it fails. * @return true if it succeeds, false if it fails.
*/ */
bool ecc_verify(const UINT8 *sector) bool ecc_verify(const UINT8 *sector)
@ -1608,14 +1608,14 @@ bool ecc_verify(const UINT8 *sector)
} }
/** /**
* @fn void ecc_generate(UINT8 *sector) * @fn void ecc_generate(UINT8 *sector)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ecc_generate - generate the P and Q ECC codes for a sector, overwriting any * ecc_generate - generate the P and Q ECC codes for a sector, overwriting any
* existing codes * existing codes
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] sector If non-null, the sector. * @param [in,out] sector If non-null, the sector.
*/ */
void ecc_generate(UINT8 *sector) void ecc_generate(UINT8 *sector)
@ -1630,13 +1630,13 @@ void ecc_generate(UINT8 *sector)
} }
/** /**
* @fn void ecc_clear(UINT8 *sector) * @fn void ecc_clear(UINT8 *sector)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ecc_clear - erase the ECC P and Q cods to 0 within a sector * ecc_clear - erase the ECC P and Q cods to 0 within a sector
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] sector If non-null, the sector. * @param [in,out] sector If non-null, the sector.
*/ */
void ecc_clear(UINT8 *sector) void ecc_clear(UINT8 *sector)

940
src/lib/util/chd.c
View File

File diff suppressed because it is too large Load Diff

150
src/lib/util/chdcd.c
View File

@ -22,15 +22,15 @@
***************************************************************************/ ***************************************************************************/
/** /**
* @def TOKENIZE(); * @def TOKENIZE();
* *
* @brief A macro that defines tokenize. * @brief A macro that defines tokenize.
* *
* @param linebuffer The linebuffer. * @param linebuffer The linebuffer.
* @param i Zero-based index of the. * @param i Zero-based index of the.
* @param sizeof(linebuffer) The sizeof(linebuffer) * @param sizeof(linebuffer) The sizeof(linebuffer)
* @param token The token. * @param token The token.
* @param sizeof(token) The sizeof(token) * @param sizeof(token) The sizeof(token)
*/ */
#define TOKENIZE i = tokenize( linebuffer, i, sizeof(linebuffer), token, sizeof(token) ); #define TOKENIZE i = tokenize( linebuffer, i, sizeof(linebuffer), token, sizeof(token) );
@ -41,7 +41,7 @@
GLOBAL VARIABLES GLOBAL VARIABLES
***************************************************************************/ ***************************************************************************/
/** @brief The linebuffer[ 512]. */ /** @brief The linebuffer[ 512]. */
static char linebuffer[512]; static char linebuffer[512];
@ -51,13 +51,13 @@ static char linebuffer[512];
***************************************************************************/ ***************************************************************************/
/** /**
* @fn static std::string get_file_path(std::string &path) * @fn static std::string get_file_path(std::string &path)
* *
* @brief Gets file path. * @brief Gets file path.
* *
* @param [in,out] path Full pathname of the file. * @param [in,out] path Full pathname of the file.
* *
* @return The file path. * @return The file path.
*/ */
static std::string get_file_path(std::string &path) static std::string get_file_path(std::string &path)
@ -76,13 +76,13 @@ static std::string get_file_path(std::string &path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static UINT64 get_file_size(const char *filename) * @fn static UINT64 get_file_size(const char *filename)
* *
* @brief Gets file size. * @brief Gets file size.
* *
* @param filename Filename of the file. * @param filename Filename of the file.
* *
* @return The file size. * @return The file size.
*/ */
static UINT64 get_file_size(const char *filename) static UINT64 get_file_size(const char *filename)
@ -104,17 +104,17 @@ static UINT64 get_file_size(const char *filename)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize ) * @fn static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize )
* *
* @brief Tokenizes. * @brief Tokenizes.
* *
* @param linebuffer The linebuffer. * @param linebuffer The linebuffer.
* @param i Zero-based index of the. * @param i Zero-based index of the.
* @param linebuffersize The linebuffersize. * @param linebuffersize The linebuffersize.
* @param [in,out] token If non-null, the token. * @param [in,out] token If non-null, the token.
* @param tokensize The tokensize. * @param tokensize The tokensize.
* *
* @return An int. * @return An int.
*/ */
static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize ) static int tokenize( const char *linebuffer, int i, int linebuffersize, char *token, int tokensize )
@ -162,13 +162,13 @@ static int tokenize( const char *linebuffer, int i, int linebuffersize, char *to
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int msf_to_frames( char *token ) * @fn static int msf_to_frames( char *token )
* *
* @brief Msf to frames. * @brief Msf to frames.
* *
* @param [in,out] token If non-null, the token. * @param [in,out] token If non-null, the token.
* *
* @return An int. * @return An int.
*/ */
static int msf_to_frames( char *token ) static int msf_to_frames( char *token )
@ -199,14 +199,14 @@ static int msf_to_frames( char *token )
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs) * @fn static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
* *
* @brief Parse WAV sample. * @brief Parse WAV sample.
* *
* @param filename Filename of the file. * @param filename Filename of the file.
* @param [in,out] dataoffs If non-null, the dataoffs. * @param [in,out] dataoffs If non-null, the dataoffs.
* *
* @return An UINT32. * @return An UINT32.
*/ */
static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs) static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
@ -378,13 +378,13 @@ static UINT32 parse_wav_sample(const char *filename, UINT32 *dataoffs)
} }
/** /**
* @fn UINT16 read_uint16(FILE *infile) * @fn UINT16 read_uint16(FILE *infile)
* *
* @brief Reads uint 16. * @brief Reads uint 16.
* *
* @param [in,out] infile If non-null, the infile. * @param [in,out] infile If non-null, the infile.
* *
* @return The uint 16. * @return The uint 16.
*/ */
UINT16 read_uint16(FILE *infile) UINT16 read_uint16(FILE *infile)
@ -400,13 +400,13 @@ UINT16 read_uint16(FILE *infile)
} }
/** /**
* @fn UINT32 read_uint32(FILE *infile) * @fn UINT32 read_uint32(FILE *infile)
* *
* @brief Reads uint 32. * @brief Reads uint 32.
* *
* @param [in,out] infile If non-null, the infile. * @param [in,out] infile If non-null, the infile.
* *
* @return The uint 32. * @return The uint 32.
*/ */
UINT32 read_uint32(FILE *infile) UINT32 read_uint32(FILE *infile)
@ -422,13 +422,13 @@ UINT32 read_uint32(FILE *infile)
} }
/** /**
* @fn UINT64 read_uint64(FILE *infile) * @fn UINT64 read_uint64(FILE *infile)
* *
* @brief Reads uint 64. * @brief Reads uint 64.
* *
* @param [in,out] infile If non-null, the infile. * @param [in,out] infile If non-null, the infile.
* *
* @return The uint 64. * @return The uint 64.
*/ */
UINT64 read_uint64(FILE *infile) UINT64 read_uint64(FILE *infile)
@ -452,15 +452,15 @@ UINT64 read_uint64(FILE *infile)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) * @fn chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
* *
* @brief Chdcd parse nero. * @brief Chdcd parse nero.
* *
* @param tocfname The tocfname. * @param tocfname The tocfname.
* @param [in,out] outtoc The outtoc. * @param [in,out] outtoc The outtoc.
* @param [in,out] outinfo The outinfo. * @param [in,out] outinfo The outinfo.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@ -638,15 +638,15 @@ chd_error chdcd_parse_nero(const char *tocfname, cdrom_toc &outtoc, chdcd_track_
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) * @fn chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
* *
* @brief Chdcd parse ISO. * @brief Chdcd parse ISO.
* *
* @param tocfname The tocfname. * @param tocfname The tocfname.
* @param [in,out] outtoc The outtoc. * @param [in,out] outtoc The outtoc.
* @param [in,out] outinfo The outinfo. * @param [in,out] outinfo The outinfo.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@ -715,15 +715,15 @@ chd_error chdcd_parse_iso(const char *tocfname, cdrom_toc &outtoc, chdcd_track_i
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) * @fn static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
* *
* @brief Chdcd parse GDI. * @brief Chdcd parse GDI.
* *
* @param tocfname The tocfname. * @param tocfname The tocfname.
* @param [in,out] outtoc The outtoc. * @param [in,out] outtoc The outtoc.
* @param [in,out] outinfo The outinfo. * @param [in,out] outinfo The outinfo.
* *
* @return A chd_error. * @return A chd_error.
*/ */
static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@ -847,15 +847,15 @@ static chd_error chdcd_parse_gdi(const char *tocfname, cdrom_toc &outtoc, chdcd_
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) * @fn chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
* *
* @brief Chdcd parse cue. * @brief Chdcd parse cue.
* *
* @param tocfname The tocfname. * @param tocfname The tocfname.
* @param [in,out] outtoc The outtoc. * @param [in,out] outtoc The outtoc.
* @param [in,out] outinfo The outinfo. * @param [in,out] outinfo The outinfo.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
@ -1142,15 +1142,15 @@ chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_i
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) * @fn chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
* *
* @brief Chdcd parse TOC. * @brief Chdcd parse TOC.
* *
* @param tocfname The tocfname. * @param tocfname The tocfname.
* @param [in,out] outtoc The outtoc. * @param [in,out] outtoc The outtoc.
* @param [in,out] outinfo The outinfo. * @param [in,out] outinfo The outinfo.
* *
* @return A chd_error. * @return A chd_error.
*/ */
chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo) chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)

160
src/lib/util/chdcodec.c
View File

@ -1454,15 +1454,15 @@ UINT32 chd_cd_flac_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *
} }
/** /**
* @fn UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes) * @fn UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* blocksize - return the optimal block size * blocksize - return the optimal block size
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param bytes The bytes. * @param bytes The bytes.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes) UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
@ -1481,17 +1481,17 @@ UINT32 chd_cd_flac_compressor::blocksize(UINT32 bytes)
//************************************************************************** //**************************************************************************
/** /**
* @fn chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy) * @fn chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* chd_cd_flac_decompressor - constructor * chd_cd_flac_decompressor - constructor
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_CODEC_ERROR Thrown when a chderr codec error error condition occurs. * @exception CHDERR_CODEC_ERROR Thrown when a chderr codec error error condition occurs.
* *
* @param [in,out] chd The chd. * @param [in,out] chd The chd.
* @param hunkbytes The hunkbytes. * @param hunkbytes The hunkbytes.
* @param lossy true to lossy. * @param lossy true to lossy.
*/ */
chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy) chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@ -1521,11 +1521,11 @@ chd_cd_flac_decompressor::chd_cd_flac_decompressor(chd_file &chd, UINT32 hunkbyt
} }
/** /**
* @fn chd_cd_flac_decompressor::~chd_cd_flac_decompressor() * @fn chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* ~chd_cd_flac_decompressor - destructor * ~chd_cd_flac_decompressor - destructor
* -------------------------------------------------. * -------------------------------------------------.
*/ */
chd_cd_flac_decompressor::~chd_cd_flac_decompressor() chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
@ -1534,19 +1534,19 @@ chd_cd_flac_decompressor::~chd_cd_flac_decompressor()
} }
/** /**
* @fn void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen) * @fn void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decompress - decompress data using the FLAC codec * decompress - decompress data using the FLAC codec
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
* condition occurs. * condition occurs.
* *
* @param src Source for the. * @param src Source for the.
* @param complen The complen. * @param complen The complen.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param destlen The destlen. * @param destlen The destlen.
*/ */
void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen) void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
@ -1593,15 +1593,15 @@ void chd_cd_flac_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT
//************************************************************************** //**************************************************************************
/** /**
* @fn chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy) * @fn chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* chd_avhuff_compressor - constructor * chd_avhuff_compressor - constructor
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] chd The chd. * @param [in,out] chd The chd.
* @param hunkbytes The hunkbytes. * @param hunkbytes The hunkbytes.
* @param lossy true to lossy. * @param lossy true to lossy.
*/ */
chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy) chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@ -1620,22 +1620,22 @@ chd_avhuff_compressor::chd_avhuff_compressor(chd_file &chd, UINT32 hunkbytes, bo
} }
/** /**
* @fn UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest) * @fn UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* compress - compress data using the A/V codec * compress - compress data using the A/V codec
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_INVALID_DATA Thrown when a chderr invalid data error condition * @exception CHDERR_INVALID_DATA Thrown when a chderr invalid data error condition
* occurs. * occurs.
* @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error * @exception CHDERR_COMPRESSION_ERROR Thrown when a chderr compression error error
* condition occurs. * condition occurs.
* *
* @param src Source for the. * @param src Source for the.
* @param srclen The srclen. * @param srclen The srclen.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest) UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *dest)
@ -1662,16 +1662,16 @@ UINT32 chd_avhuff_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *d
} }
/** /**
* @fn void chd_avhuff_compressor::postinit() * @fn void chd_avhuff_compressor::postinit()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* postinit - actual initialization of avhuff happens here, on the first attempt to * postinit - actual initialization of avhuff happens here, on the first attempt to
* compress or decompress data * compress or decompress data
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception err Thrown when an error error condition occurs. * @exception err Thrown when an error error condition occurs.
* @exception CHDERR_INVALID_METADATA Thrown when a chderr invalid metadata error condition * @exception CHDERR_INVALID_METADATA Thrown when a chderr invalid metadata error condition
* occurs. * occurs.
*/ */
void chd_avhuff_compressor::postinit() void chd_avhuff_compressor::postinit()
@ -1705,15 +1705,15 @@ void chd_avhuff_compressor::postinit()
//************************************************************************** //**************************************************************************
/** /**
* @fn chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy) * @fn chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* chd_avhuff_decompressor - constructor * chd_avhuff_decompressor - constructor
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] chd The chd. * @param [in,out] chd The chd.
* @param hunkbytes The hunkbytes. * @param hunkbytes The hunkbytes.
* @param lossy true to lossy. * @param lossy true to lossy.
*/ */
chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy) chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes, bool lossy)
@ -1722,19 +1722,19 @@ chd_avhuff_decompressor::chd_avhuff_decompressor(chd_file &chd, UINT32 hunkbytes
} }
/** /**
* @fn void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen) * @fn void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decompress - decompress data using the A/V codec * decompress - decompress data using the A/V codec
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error * @exception CHDERR_DECOMPRESSION_ERROR Thrown when a chderr decompression error error
* condition occurs. * condition occurs.
* *
* @param src Source for the. * @param src Source for the.
* @param complen The complen. * @param complen The complen.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param destlen The destlen. * @param destlen The destlen.
*/ */
void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen) void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *dest, UINT32 destlen)
@ -1754,17 +1754,17 @@ void chd_avhuff_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8
} }
/** /**
* @fn void chd_avhuff_decompressor::configure(int param, void *config) * @fn void chd_avhuff_decompressor::configure(int param, void *config)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* config - codec-specific configuration for the A/V codec * config - codec-specific configuration for the A/V codec
* -------------------------------------------------. * -------------------------------------------------.
* *
* @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error * @exception CHDERR_INVALID_PARAMETER Thrown when a chderr invalid parameter error
* condition occurs. * condition occurs.
* *
* @param param The parameter. * @param param The parameter.
* @param [in,out] config If non-null, the configuration. * @param [in,out] config If non-null, the configuration.
*/ */
void chd_avhuff_decompressor::configure(int param, void *config) void chd_avhuff_decompressor::configure(int param, void *config)

10
src/lib/util/corealloc.c
View File

@ -395,13 +395,13 @@ void memory_entry::release(memory_entry *entry, const char *file, int line)
} }
/** /**
* @fn void memory_entry::report_unfreed(UINT64 start) * @fn void memory_entry::report_unfreed(UINT64 start)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* report_unfreed - print a list of unfreed memory to the target file * report_unfreed - print a list of unfreed memory to the target file
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param start The start. * @param start The start.
*/ */
void memory_entry::report_unfreed(UINT64 start) void memory_entry::report_unfreed(UINT64 start)

16
src/lib/util/corefile.c
View File

@ -1029,17 +1029,17 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset,
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual) * @fn static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual)
* *
* @brief OSD or zlib write. * @brief OSD or zlib write.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param buffer The buffer. * @param buffer The buffer.
* @param offset The offset. * @param offset The offset.
* @param length The length. * @param length The length.
* @param [in,out] actual If non-null, the actual. * @param [in,out] actual If non-null, the actual.
* *
* @return A file_error. * @return A file_error.
*/ */
static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual) static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 offset, UINT32 length, UINT32 *actual)

20
src/lib/util/corestr.c
View File

@ -295,13 +295,13 @@ std::string strmakeupper(std::string& str)
} }
/** /**
* @fn std::string strmakelower(std::string& str) * @fn std::string strmakelower(std::string& str)
* *
* @brief Strmakelowers the given string. * @brief Strmakelowers the given string.
* *
* @param [in,out] str The string. * @param [in,out] str The string.
* *
* @return A std::string. * @return A std::string.
*/ */
std::string strmakelower(std::string& str) std::string strmakelower(std::string& str)
@ -311,15 +311,15 @@ std::string strmakelower(std::string& str)
} }
/** /**
* @fn int strreplace(std::string &str, const std::string& search, const std::string& replace) * @fn int strreplace(std::string &str, const std::string& search, const std::string& replace)
* *
* @brief Strreplaces. * @brief Strreplaces.
* *
* @param [in,out] str The string. * @param [in,out] str The string.
* @param search The search. * @param search The search.
* @param replace The replace. * @param replace The replace.
* *
* @return An int. * @return An int.
*/ */
int strreplace(std::string &str, const std::string& search, const std::string& replace) int strreplace(std::string &str, const std::string& search, const std::string& replace)

18
src/lib/util/coreutil.c
View File

@ -69,14 +69,14 @@ int gregorian_is_leap_year(int year)
/* months are one counted */ /* months are one counted */
/** /**
* @fn int gregorian_days_in_month(int month, int year) * @fn int gregorian_days_in_month(int month, int year)
* *
* @brief Gregorian days in month. * @brief Gregorian days in month.
* *
* @param month The month. * @param month The month.
* @param year The year. * @param year The year.
* *
* @return An int. * @return An int.
*/ */
int gregorian_days_in_month(int month, int year) int gregorian_days_in_month(int month, int year)
@ -95,12 +95,12 @@ int gregorian_days_in_month(int month, int year)
***************************************************************************/ ***************************************************************************/
/** /**
* @fn void rand_memory(void *memory, size_t length) * @fn void rand_memory(void *memory, size_t length)
* *
* @brief Random memory. * @brief Random memory.
* *
* @param [in,out] memory If non-null, the memory. * @param [in,out] memory If non-null, the memory.
* @param length The length. * @param length The length.
*/ */
void rand_memory(void *memory, size_t length) void rand_memory(void *memory, size_t length)

20
src/lib/util/cstrpool.c
View File

@ -71,11 +71,11 @@ bool const_string_pool::contains(const char *string)
} }
/** /**
* @fn const_string_pool::pool_chunk::pool_chunk() * @fn const_string_pool::pool_chunk::pool_chunk()
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* pool_chunk - constructor * pool_chunk - constructor
* -------------------------------------------------. * -------------------------------------------------.
*/ */
const_string_pool::pool_chunk::pool_chunk() const_string_pool::pool_chunk::pool_chunk()
@ -85,15 +85,15 @@ const_string_pool::pool_chunk::pool_chunk()
} }
/** /**
* @fn const char *const_string_pool::pool_chunk::add(const char *string) * @fn const char *const_string_pool::pool_chunk::add(const char *string)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* add - add a string to this pool * add - add a string to this pool
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param string The string to add. * @param string The string to add.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *const_string_pool::pool_chunk::add(const char *string) const char *const_string_pool::pool_chunk::add(const char *string)

14
src/lib/util/delegate.c
View File

@ -33,16 +33,16 @@ delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { 0 };
#if (USE_DELEGATE_TYPE == DELEGATE_TYPE_INTERNAL) #if (USE_DELEGATE_TYPE == DELEGATE_TYPE_INTERNAL)
/** /**
* @fn delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const * @fn delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* delegate_convert_raw - given an object and an raw function, adjust the object base * delegate_convert_raw - given an object and an raw function, adjust the object base
* and return the actual final code pointer * and return the actual final code pointer
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] object [in,out] If non-null, the object. * @param [in,out] object [in,out] If non-null, the object.
* *
* @return The given data converted to a generic. * @return The given data converted to a generic.
*/ */
delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const

3
src/lib/util/delegate.h
View File

@ -659,8 +659,7 @@ public:
if (is_mfp() && (HAS_DIFFERENT_ABI)) \ if (is_mfp() && (HAS_DIFFERENT_ABI)) \
return (*reinterpret_cast<generic_member_func>(m_function)) x; \ return (*reinterpret_cast<generic_member_func>(m_function)) x; \
else \ else \
return (*m_function) x; \ return (*m_function) x;
//return MEMBER_ABI (*reinpertret_cast<generic_member_func>(m_function)) x; //return MEMBER_ABI (*reinpertret_cast<generic_member_func>(m_function)) x;
// call the function // call the function

14
src/lib/util/flac.c
View File

@ -609,15 +609,15 @@ FLAC__StreamDecoderWriteStatus flac_decoder::write_callback(const ::FLAC__Frame
} }
/** /**
* @fn void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) * @fn void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* error_callback - handle errors (ignore them) * error_callback - handle errors (ignore them)
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param decoder The decoder. * @param decoder The decoder.
* @param status The status. * @param status The status.
* @param [in,out] client_data If non-null, information describing the client. * @param [in,out] client_data If non-null, information describing the client.
*/ */
void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) void flac_decoder::error_callback_static(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)

32
src/lib/util/harddisk.c
View File

@ -98,13 +98,13 @@ chd_file *hard_disk_get_chd(hard_disk_file *file)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn hard_disk_info *hard_disk_get_info(hard_disk_file *file) * @fn hard_disk_info *hard_disk_get_info(hard_disk_file *file)
* *
* @brief Hard disk get information. * @brief Hard disk get information.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* *
* @return null if it fails, else a hard_disk_info*. * @return null if it fails, else a hard_disk_info*.
*/ */
hard_disk_info *hard_disk_get_info(hard_disk_file *file) hard_disk_info *hard_disk_get_info(hard_disk_file *file)
@ -119,15 +119,15 @@ hard_disk_info *hard_disk_get_info(hard_disk_file *file)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer) * @fn UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
* *
* @brief Hard disk read. * @brief Hard disk read.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param lbasector The lbasector. * @param lbasector The lbasector.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer) UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
@ -143,15 +143,15 @@ UINT32 hard_disk_read(hard_disk_file *file, UINT32 lbasector, void *buffer)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer) * @fn UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer)
* *
* @brief Hard disk write. * @brief Hard disk write.
* *
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
* @param lbasector The lbasector. * @param lbasector The lbasector.
* @param buffer The buffer. * @param buffer The buffer.
* *
* @return An UINT32. * @return An UINT32.
*/ */
UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer) UINT32 hard_disk_write(hard_disk_file *file, UINT32 lbasector, const void *buffer)

24
src/lib/util/hashing.c
View File

@ -215,15 +215,15 @@ bool crc16_t::from_string(const char *string, int length)
} }
/** /**
* @fn const char *crc16_t::as_string(std::string &buffer) const * @fn const char *crc16_t::as_string(std::string &buffer) const
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* as_string - convert to a string * as_string - convert to a string
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] buffer The buffer. * @param [in,out] buffer The buffer.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *crc16_t::as_string(std::string &buffer) const const char *crc16_t::as_string(std::string &buffer) const
@ -233,14 +233,14 @@ const char *crc16_t::as_string(std::string &buffer) const
} }
/** /**
* @fn void crc16_creator::append(const void *data, UINT32 length) * @fn void crc16_creator::append(const void *data, UINT32 length)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* append - hash a block of data, appending to the currently-accumulated value * append - hash a block of data, appending to the currently-accumulated value
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param data The data. * @param data The data.
* @param length The length. * @param length The length.
*/ */
void crc16_creator::append(const void *data, UINT32 length) void crc16_creator::append(const void *data, UINT32 length)

18
src/lib/util/huffman.c
View File

@ -731,18 +731,18 @@ huffman_8bit_decoder::huffman_8bit_decoder()
} }
/** /**
* @fn huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength) * @fn huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* decode - decode a full buffer * decode - decode a full buffer
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param source Source for the. * @param source Source for the.
* @param slength The slength. * @param slength The slength.
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param dlength The dlength. * @param dlength The dlength.
* *
* @return A huffman_error. * @return A huffman_error.
*/ */
huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength) huffman_error huffman_8bit_decoder::decode(const UINT8 *source, UINT32 slength, UINT8 *dest, UINT32 dlength)

12
src/lib/util/jedparse.c
View File

@ -411,15 +411,15 @@ int jedbin_parse(const void *data, size_t length, jed_data *result)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn size_t jedbin_output(const jed_data *data, void *result, size_t length) * @fn size_t jedbin_output(const jed_data *data, void *result, size_t length)
* *
* @brief Jedbin output. * @brief Jedbin output.
* *
* @param data The data. * @param data The data.
* @param [out] result If non-null, the result. * @param [out] result If non-null, the result.
* @param length The length. * @param length The length.
* *
* @return A size_t. * @return A size_t.
*/ */
size_t jedbin_output(const jed_data *data, void *result, size_t length) size_t jedbin_output(const jed_data *data, void *result, size_t length)

8
src/lib/util/md5.c
View File

@ -155,12 +155,12 @@ MD5Final(md5byte digest[16], struct MD5Context *ctx)
*/ */
/** /**
* @fn void MD5Transform(UWORD32 buf[4], UWORD32 const in[16]) * @fn void MD5Transform(UWORD32 buf[4], UWORD32 const in[16])
* *
* @brief Md 5 transform. * @brief Md 5 transform.
* *
* @param buf The buffer. * @param buf The buffer.
* @param in The in. * @param in The in.
*/ */
void void

18
src/lib/util/opresolv.c
View File

@ -537,14 +537,14 @@ optreserr_t option_resolution_isvalidvalue(const char *specification, int option
} }
/** /**
* @fn int option_resolution_contains(const char *specification, int option_char) * @fn int option_resolution_contains(const char *specification, int option_char)
* *
* @brief Option resolution contains. * @brief Option resolution contains.
* *
* @param specification The specification. * @param specification The specification.
* @param option_char The option character. * @param option_char The option character.
* *
* @return An int. * @return An int.
*/ */
int option_resolution_contains(const char *specification, int option_char) int option_resolution_contains(const char *specification, int option_char)
@ -553,13 +553,13 @@ int option_resolution_contains(const char *specification, int option_char)
} }
/** /**
* @fn const char *option_resolution_error_string(optreserr_t err) * @fn const char *option_resolution_error_string(optreserr_t err)
* *
* @brief Option resolution error string. * @brief Option resolution error string.
* *
* @param err The error. * @param err The error.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *option_resolution_error_string(optreserr_t err) const char *option_resolution_error_string(optreserr_t err)

30
src/lib/util/options.c
View File

@ -710,13 +710,13 @@ void core_options::remove_entry(core_options::entry &delentry)
} }
/** /**
* @fn void core_options::copyfrom(const core_options &src) * @fn void core_options::copyfrom(const core_options &src)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* copyfrom - copy options from another set * copyfrom - copy options from another set
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param src Source for the. * @param src Source for the.
*/ */
void core_options::copyfrom(const core_options &src) void core_options::copyfrom(const core_options &src)
@ -730,19 +730,19 @@ void core_options::copyfrom(const core_options &src)
} }
/** /**
* @fn bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string) * @fn bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* validate_and_set_data - make sure the data is of the appropriate type and within * validate_and_set_data - make sure the data is of the appropriate type and within
* range, then set it * range, then set it
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param [in,out] curentry The curentry. * @param [in,out] curentry The curentry.
* @param newdata The newdata. * @param newdata The newdata.
* @param priority The priority. * @param priority The priority.
* @param [in,out] error_string The error string. * @param [in,out] error_string The error string.
* *
* @return true if it succeeds, false if it fails. * @return true if it succeeds, false if it fails.
*/ */
bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string) bool core_options::validate_and_set_data(core_options::entry &curentry, const char *newdata, int priority, std::string &error_string)

12
src/lib/util/palette.c
View File

@ -468,14 +468,14 @@ void palette_t::normalize_range(UINT32 start, UINT32 end, int lum_min, int lum_m
} }
/** /**
* @fn void palette_t::update_adjusted_color(UINT32 group, UINT32 index) * @fn void palette_t::update_adjusted_color(UINT32 group, UINT32 index)
* *
* @brief ------------------------------------------------- * @brief -------------------------------------------------
* update_adjusted_color - update a color index by group and index pair * update_adjusted_color - update a color index by group and index pair
* -------------------------------------------------. * -------------------------------------------------.
* *
* @param group The group. * @param group The group.
* @param index Zero-based index of the. * @param index Zero-based index of the.
*/ */
void palette_t::update_adjusted_color(UINT32 group, UINT32 index) void palette_t::update_adjusted_color(UINT32 group, UINT32 index)

12
src/lib/util/plaparse.c
View File

@ -295,15 +295,15 @@ static bool process_field(jed_data *data, const UINT8 **src, const UINT8 *srcend
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int pla_parse(const void *data, size_t length, jed_data *result) * @fn int pla_parse(const void *data, size_t length, jed_data *result)
* *
* @brief Pla parse. * @brief Pla parse.
* *
* @param data The data. * @param data The data.
* @param length The length. * @param length The length.
* @param [out] result If non-null, the result. * @param [out] result If non-null, the result.
* *
* @return An int. * @return An int.
*/ */
int pla_parse(const void *data, size_t length, jed_data *result) int pla_parse(const void *data, size_t length, jed_data *result)

36
src/lib/util/png.c
View File

@ -1097,15 +1097,15 @@ png_error png_write_bitmap(core_file *fp, png_info *info, bitmap_t &bitmap, int
********************************************************************************/ ********************************************************************************/
/** /**
* @fn png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate) * @fn png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
* *
* @brief Mng capture start. * @brief Mng capture start.
* *
* @param [in,out] fp If non-null, the fp. * @param [in,out] fp If non-null, the fp.
* @param [in,out] bitmap The bitmap. * @param [in,out] bitmap The bitmap.
* @param rate The rate. * @param rate The rate.
* *
* @return A png_error. * @return A png_error.
*/ */
png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate) png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
@ -1131,17 +1131,17 @@ png_error mng_capture_start(core_file *fp, bitmap_t &bitmap, double rate)
} }
/** /**
* @fn png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette) * @fn png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette)
* *
* @brief Mng capture frame. * @brief Mng capture frame.
* *
* @param [in,out] fp If non-null, the fp. * @param [in,out] fp If non-null, the fp.
* @param [in,out] info If non-null, the information. * @param [in,out] info If non-null, the information.
* @param [in,out] bitmap The bitmap. * @param [in,out] bitmap The bitmap.
* @param palette_length Length of the palette. * @param palette_length Length of the palette.
* @param palette The palette. * @param palette The palette.
* *
* @return A png_error. * @return A png_error.
*/ */
png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette) png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int palette_length, const rgb_t *palette)
@ -1150,13 +1150,13 @@ png_error mng_capture_frame(core_file *fp, png_info *info, bitmap_t &bitmap, int
} }
/** /**
* @fn png_error mng_capture_stop(core_file *fp) * @fn png_error mng_capture_stop(core_file *fp)
* *
* @brief Mng capture stop. * @brief Mng capture stop.
* *
* @param [in,out] fp If non-null, the fp. * @param [in,out] fp If non-null, the fp.
* *
* @return A png_error. * @return A png_error.
*/ */
png_error mng_capture_stop(core_file *fp) png_error mng_capture_stop(core_file *fp)

6
src/lib/util/pool.c
View File

@ -571,11 +571,11 @@ static void memory_error(const char *message)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int test_memory_pools(void) * @fn int test_memory_pools(void)
* *
* @brief Tests memory pools. * @brief Tests memory pools.
* *
* @return An int. * @return An int.
*/ */
int test_memory_pools(void) int test_memory_pools(void)

48
src/lib/util/sha1.c
View File

@ -122,11 +122,11 @@ static void WRITE_UINT32(unsigned char* data, UINT32 val)
/* Initialize the SHA values */ /* Initialize the SHA values */
/** /**
* @fn void sha1_init(struct sha1_ctx *ctx) * @fn void sha1_init(struct sha1_ctx *ctx)
* *
* @brief Sha 1 initialise. * @brief Sha 1 initialise.
* *
* @param [in,out] ctx If non-null, the context. * @param [in,out] ctx If non-null, the context.
*/ */
void void
@ -154,12 +154,12 @@ sha1_init(struct sha1_ctx *ctx)
Note that this function destroys the data area */ Note that this function destroys the data area */
/** /**
* @fn static void sha1_transform(UINT32 *state, UINT32 *data) * @fn static void sha1_transform(UINT32 *state, UINT32 *data)
* *
* @brief Sha 1 transform. * @brief Sha 1 transform.
* *
* @param [in,out] state If non-null, the state. * @param [in,out] state If non-null, the state.
* @param [in,out] data If non-null, the data. * @param [in,out] data If non-null, the data.
*/ */
static void static void
@ -268,12 +268,12 @@ sha1_transform(UINT32 *state, UINT32 *data)
} }
/** /**
* @fn static void sha1_block(struct sha1_ctx *ctx, const UINT8 *block) * @fn static void sha1_block(struct sha1_ctx *ctx, const UINT8 *block)
* *
* @brief Sha 1 block. * @brief Sha 1 block.
* *
* @param [in,out] ctx If non-null, the context. * @param [in,out] ctx If non-null, the context.
* @param block The block. * @param block The block.
*/ */
static void static void
@ -294,13 +294,13 @@ sha1_block(struct sha1_ctx *ctx, const UINT8 *block)
} }
/** /**
* @fn void sha1_update(struct sha1_ctx *ctx, unsigned length, const UINT8 *buffer) * @fn void sha1_update(struct sha1_ctx *ctx, unsigned length, const UINT8 *buffer)
* *
* @brief Sha 1 update. * @brief Sha 1 update.
* *
* @param [in,out] ctx If non-null, the context. * @param [in,out] ctx If non-null, the context.
* @param length The length. * @param length The length.
* @param buffer The buffer. * @param buffer The buffer.
*/ */
void void
@ -340,11 +340,11 @@ sha1_update(struct sha1_ctx *ctx,
1 0* (64-bit count of bits processed, MSB-first) */ 1 0* (64-bit count of bits processed, MSB-first) */
/** /**
* @fn void sha1_final(struct sha1_ctx *ctx) * @fn void sha1_final(struct sha1_ctx *ctx)
* *
* @brief Sha 1 final. * @brief Sha 1 final.
* *
* @param [in,out] ctx If non-null, the context. * @param [in,out] ctx If non-null, the context.
*/ */
void void
@ -391,13 +391,13 @@ sha1_final(struct sha1_ctx *ctx)
} }
/** /**
* @fn void sha1_digest(const struct sha1_ctx *ctx, unsigned length, UINT8 *digest) * @fn void sha1_digest(const struct sha1_ctx *ctx, unsigned length, UINT8 *digest)
* *
* @brief Sha 1 digest. * @brief Sha 1 digest.
* *
* @param ctx The context. * @param ctx The context.
* @param length The length. * @param length The length.
* @param [in,out] digest If non-null, the digest. * @param [in,out] digest If non-null, the digest.
*/ */
void void

4
src/lib/util/tagmap.c
View File

@ -13,8 +13,8 @@
#include "tagmap.h" #include "tagmap.h"
#ifdef MAME_DEBUG #ifdef MAME_DEBUG
/** @brief The tagmap finds. */ /** @brief The tagmap finds. */
INT32 g_tagmap_finds = 0; INT32 g_tagmap_finds = 0;
/** @brief true to enable, false to disable the tagmap counter. */ /** @brief true to enable, false to disable the tagmap counter. */
bool g_tagmap_counter_enabled = false; bool g_tagmap_counter_enabled = false;
#endif #endif

6
src/lib/util/un7z.c
View File

@ -468,11 +468,11 @@ _7z_error _7z_file_decompress(_7z_file *new_7z, void *buffer, UINT32 length)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void free__7z_file(_7z_file *_7z) * @fn static void free__7z_file(_7z_file *_7z)
* *
* @brief Free 7z file. * @brief Free 7z file.
* *
* @param [in,out] _7z If non-null, the 7z. * @param [in,out] _7z If non-null, the 7z.
*/ */
static void free__7z_file(_7z_file *_7z) static void free__7z_file(_7z_file *_7z)

16
src/lib/util/unicode.c
View File

@ -309,13 +309,13 @@ int utf16f_from_uchar(utf16_char *utf16string, size_t count, unicode_char uchar)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const char *utf8_previous_char(const char *utf8string) * @fn const char *utf8_previous_char(const char *utf8string)
* *
* @brief UTF 8 previous character. * @brief UTF 8 previous character.
* *
* @param utf8string The UTF 8string. * @param utf8string The UTF 8string.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *utf8_previous_char(const char *utf8string) const char *utf8_previous_char(const char *utf8string)
@ -333,13 +333,13 @@ const char *utf8_previous_char(const char *utf8string)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int utf8_is_valid_string(const char *utf8string) * @fn int utf8_is_valid_string(const char *utf8string)
* *
* @brief UTF 8 is valid string. * @brief UTF 8 is valid string.
* *
* @param utf8string The UTF 8string. * @param utf8string The UTF 8string.
* *
* @return An int. * @return An int.
*/ */
int utf8_is_valid_string(const char *utf8string) int utf8_is_valid_string(const char *utf8string)

130
src/lib/util/unzip.c
View File

@ -69,25 +69,25 @@
#define ZIPUNCMP 0x16 #define ZIPUNCMP 0x16
/** /**
* @def ZIPFNLN * @def ZIPFNLN
* *
* @brief A macro that defines zipfnln. * @brief A macro that defines zipfnln.
*/ */
#define ZIPFNLN 0x1a #define ZIPFNLN 0x1a
/** /**
* @def ZIPXTRALN * @def ZIPXTRALN
* *
* @brief A macro that defines zipxtraln. * @brief A macro that defines zipxtraln.
*/ */
#define ZIPXTRALN 0x1c #define ZIPXTRALN 0x1c
/** /**
* @def ZIPNAME * @def ZIPNAME
* *
* @brief A macro that defines zipname. * @brief A macro that defines zipname.
*/ */
#define ZIPNAME 0x1e #define ZIPNAME 0x1e
@ -99,13 +99,13 @@
***************************************************************************/ ***************************************************************************/
/** /**
* @fn INLINE UINT16 read_word(UINT8 *buf) * @fn INLINE UINT16 read_word(UINT8 *buf)
* *
* @brief Reads a word. * @brief Reads a word.
* *
* @param [in,out] buf If non-null, the buffer. * @param [in,out] buf If non-null, the buffer.
* *
* @return The word. * @return The word.
*/ */
INLINE UINT16 read_word(UINT8 *buf) INLINE UINT16 read_word(UINT8 *buf)
@ -114,13 +114,13 @@ INLINE UINT16 read_word(UINT8 *buf)
} }
/** /**
* @fn INLINE UINT32 read_dword(UINT8 *buf) * @fn INLINE UINT32 read_dword(UINT8 *buf)
* *
* @brief Reads a double word. * @brief Reads a double word.
* *
* @param [in,out] buf If non-null, the buffer. * @param [in,out] buf If non-null, the buffer.
* *
* @return The double word. * @return The double word.
*/ */
INLINE UINT32 read_dword(UINT8 *buf) INLINE UINT32 read_dword(UINT8 *buf)
@ -134,7 +134,7 @@ INLINE UINT32 read_dword(UINT8 *buf)
GLOBAL VARIABLES GLOBAL VARIABLES
***************************************************************************/ ***************************************************************************/
/** @brief The zip cache[ zip cache size]. */ /** @brief The zip cache[ zip cache size]. */
static zip_file *zip_cache[ZIP_CACHE_SIZE]; static zip_file *zip_cache[ZIP_CACHE_SIZE];
@ -165,14 +165,14 @@ static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buff
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn zip_error zip_file_open(const char *filename, zip_file **zip) * @fn zip_error zip_file_open(const char *filename, zip_file **zip)
* *
* @brief Queries if a given zip file open. * @brief Queries if a given zip file open.
* *
* @param filename Filename of the file. * @param filename Filename of the file.
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* *
* @return A zip_error. * @return A zip_error.
*/ */
zip_error zip_file_open(const char *filename, zip_file **zip) zip_error zip_file_open(const char *filename, zip_file **zip)
@ -267,11 +267,11 @@ error:
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void zip_file_close(zip_file *zip) * @fn void zip_file_close(zip_file *zip)
* *
* @brief Zip file close. * @brief Zip file close.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
*/ */
void zip_file_close(zip_file *zip) void zip_file_close(zip_file *zip)
@ -305,9 +305,9 @@ void zip_file_close(zip_file *zip)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void zip_file_cache_clear(void) * @fn void zip_file_cache_clear(void)
* *
* @brief Zip file cache clear. * @brief Zip file cache clear.
*/ */
void zip_file_cache_clear(void) void zip_file_cache_clear(void)
@ -335,13 +335,13 @@ void zip_file_cache_clear(void)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const zip_file_header *zip_file_first_file(zip_file *zip) * @fn const zip_file_header *zip_file_first_file(zip_file *zip)
* *
* @brief Zip file first file. * @brief Zip file first file.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* *
* @return null if it fails, else a zip_file_header*. * @return null if it fails, else a zip_file_header*.
*/ */
const zip_file_header *zip_file_first_file(zip_file *zip) const zip_file_header *zip_file_first_file(zip_file *zip)
@ -358,13 +358,13 @@ const zip_file_header *zip_file_first_file(zip_file *zip)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const zip_file_header *zip_file_next_file(zip_file *zip) * @fn const zip_file_header *zip_file_next_file(zip_file *zip)
* *
* @brief Zip file next file. * @brief Zip file next file.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* *
* @return null if it fails, else a zip_file_header*. * @return null if it fails, else a zip_file_header*.
*/ */
const zip_file_header *zip_file_next_file(zip_file *zip) const zip_file_header *zip_file_next_file(zip_file *zip)
@ -425,15 +425,15 @@ const zip_file_header *zip_file_next_file(zip_file *zip)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length) * @fn zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
* *
* @brief Zip file decompress. * @brief Zip file decompress.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* @param length The length. * @param length The length.
* *
* @return A zip_error. * @return A zip_error.
*/ */
zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length) zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
@ -484,11 +484,11 @@ zip_error zip_file_decompress(zip_file *zip, void *buffer, UINT32 length)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void free_zip_file(zip_file *zip) * @fn static void free_zip_file(zip_file *zip)
* *
* @brief Free zip file. * @brief Free zip file.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
*/ */
static void free_zip_file(zip_file *zip) static void free_zip_file(zip_file *zip)
@ -518,13 +518,13 @@ static void free_zip_file(zip_file *zip)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static zip_error read_ecd(zip_file *zip) * @fn static zip_error read_ecd(zip_file *zip)
* *
* @brief Reads an ecd. * @brief Reads an ecd.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* *
* @return The ecd. * @return The ecd.
*/ */
static zip_error read_ecd(zip_file *zip) static zip_error read_ecd(zip_file *zip)
@ -602,14 +602,14 @@ static zip_error read_ecd(zip_file *zip)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset) * @fn static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
* *
* @brief Gets compressed data offset. * @brief Gets compressed data offset.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* @param [in,out] offset If non-null, the offset. * @param [in,out] offset If non-null, the offset.
* *
* @return The compressed data offset. * @return The compressed data offset.
*/ */
static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset) static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
@ -650,16 +650,16 @@ static zip_error get_compressed_data_offset(zip_file *zip, UINT64 *offset)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length) * @fn static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
* *
* @brief Decompress the data type 0. * @brief Decompress the data type 0.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* @param offset The offset. * @param offset The offset.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* @param length The length. * @param length The length.
* *
* @return A zip_error. * @return A zip_error.
*/ */
static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length) static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
@ -684,16 +684,16 @@ static zip_error decompress_data_type_0(zip_file *zip, UINT64 offset, void *buff
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length) * @fn static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)
* *
* @brief Decompress the data type 8. * @brief Decompress the data type 8.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* @param offset The offset. * @param offset The offset.
* @param [in,out] buffer If non-null, the buffer. * @param [in,out] buffer If non-null, the buffer.
* @param length The length. * @param length The length.
* *
* @return A zip_error. * @return A zip_error.
*/ */
static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length) static zip_error decompress_data_type_8(zip_file *zip, UINT64 offset, void *buffer, UINT32 length)

34
src/lib/util/vbiparse.c
View File

@ -277,15 +277,15 @@ int vbi_parse_white_flag(const UINT16 *source, int sourcewidth, int sourceshift)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi) * @fn void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi)
* *
* @brief Vbi parse all. * @brief Vbi parse all.
* *
* @param source Source for the. * @param source Source for the.
* @param sourcerowpixels The sourcerowpixels. * @param sourcerowpixels The sourcerowpixels.
* @param sourcewidth The sourcewidth. * @param sourcewidth The sourcewidth.
* @param sourceshift The sourceshift. * @param sourceshift The sourceshift.
* @param [in,out] vbi If non-null, the vbi. * @param [in,out] vbi If non-null, the vbi.
*/ */
void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi) void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, int sourceshift, vbi_metadata *vbi)
@ -351,13 +351,13 @@ void vbi_parse_all(const UINT16 *source, int sourcerowpixels, int sourcewidth, i
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi) * @fn void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
* *
* @brief Vbi metadata pack. * @brief Vbi metadata pack.
* *
* @param [in,out] dest If non-null, destination for the. * @param [in,out] dest If non-null, destination for the.
* @param framenum The framenum. * @param framenum The framenum.
* @param vbi The vbi. * @param vbi The vbi.
*/ */
void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi) void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
@ -387,13 +387,13 @@ void vbi_metadata_pack(UINT8 *dest, UINT32 framenum, const vbi_metadata *vbi)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source) * @fn void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source)
* *
* @brief Vbi metadata unpack. * @brief Vbi metadata unpack.
* *
* @param [in,out] vbi If non-null, the vbi. * @param [in,out] vbi If non-null, the vbi.
* @param [in,out] framenum If non-null, the framenum. * @param [in,out] framenum If non-null, the framenum.
* @param source Source for the. * @param source Source for the.
*/ */
void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source) void vbi_metadata_unpack(vbi_metadata *vbi, UINT32 *framenum, const UINT8 *source)

158
src/lib/util/xmlfile.c
View File

@ -452,15 +452,15 @@ int xml_get_attribute_int_format(xml_data_node *node, const char *attribute)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue) * @fn float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue)
* *
* @brief XML get attribute float. * @brief XML get attribute float.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param attribute The attribute. * @param attribute The attribute.
* @param defvalue The defvalue. * @param defvalue The defvalue.
* *
* @return A float. * @return A float.
*/ */
float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue) float xml_get_attribute_float(xml_data_node *node, const char *attribute, float defvalue)
@ -480,15 +480,15 @@ float xml_get_attribute_float(xml_data_node *node, const char *attribute, float
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value) * @fn xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value)
* *
* @brief XML set attribute. * @brief XML set attribute.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param name The name. * @param name The name.
* @param value The value. * @param value The value.
* *
* @return null if it fails, else an xml_attribute_node*. * @return null if it fails, else an xml_attribute_node*.
*/ */
xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value) xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, const char *value)
@ -520,15 +520,15 @@ xml_attribute_node *xml_set_attribute(xml_data_node *node, const char *name, con
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value) * @fn xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value)
* *
* @brief XML set attribute int. * @brief XML set attribute int.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param name The name. * @param name The name.
* @param value The value. * @param value The value.
* *
* @return null if it fails, else an xml_attribute_node*. * @return null if it fails, else an xml_attribute_node*.
*/ */
xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value) xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name, int value)
@ -545,15 +545,15 @@ xml_attribute_node *xml_set_attribute_int(xml_data_node *node, const char *name,
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value) * @fn xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value)
* *
* @brief XML set attribute float. * @brief XML set attribute float.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param name The name. * @param name The name.
* @param value The value. * @param value The value.
* *
* @return null if it fails, else an xml_attribute_node*. * @return null if it fails, else an xml_attribute_node*.
*/ */
xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value) xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *name, float value)
@ -575,13 +575,13 @@ xml_attribute_node *xml_set_attribute_float(xml_data_node *node, const char *nam
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const char *xml_normalize_string(const char *string) * @fn const char *xml_normalize_string(const char *string)
* *
* @brief XML normalize string. * @brief XML normalize string.
* *
* @param string The string. * @param string The string.
* *
* @return null if it fails, else a char*. * @return null if it fails, else a char*.
*/ */
const char *xml_normalize_string(const char *string) const char *xml_normalize_string(const char *string)
@ -623,13 +623,13 @@ const char *xml_normalize_string(const char *string)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void *expat_malloc(size_t size) * @fn static void *expat_malloc(size_t size)
* *
* @brief Expat malloc. * @brief Expat malloc.
* *
* @param size The size. * @param size The size.
* *
* @return null if it fails, else a void*. * @return null if it fails, else a void*.
*/ */
static void *expat_malloc(size_t size) static void *expat_malloc(size_t size)
@ -640,11 +640,11 @@ static void *expat_malloc(size_t size)
} }
/** /**
* @fn static void expat_free(void *ptr) * @fn static void expat_free(void *ptr)
* *
* @brief Expat free. * @brief Expat free.
* *
* @param [in,out] ptr If non-null, the pointer. * @param [in,out] ptr If non-null, the pointer.
*/ */
static void expat_free(void *ptr) static void expat_free(void *ptr)
@ -654,14 +654,14 @@ static void expat_free(void *ptr)
} }
/** /**
* @fn static void *expat_realloc(void *ptr, size_t size) * @fn static void *expat_realloc(void *ptr, size_t size)
* *
* @brief Expat realloc. * @brief Expat realloc.
* *
* @param [in,out] ptr If non-null, the pointer. * @param [in,out] ptr If non-null, the pointer.
* @param size The size. * @param size The size.
* *
* @return null if it fails, else a void*. * @return null if it fails, else a void*.
*/ */
static void *expat_realloc(void *ptr, size_t size) static void *expat_realloc(void *ptr, size_t size)
@ -684,14 +684,14 @@ static void *expat_realloc(void *ptr, size_t size)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts) * @fn static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts)
* *
* @brief Expat setup parser. * @brief Expat setup parser.
* *
* @param [in,out] parse_info If non-null, information describing the parse. * @param [in,out] parse_info If non-null, information describing the parse.
* @param [in,out] opts If non-null, options for controlling the operation. * @param [in,out] opts If non-null, options for controlling the operation.
* *
* @return An int. * @return An int.
*/ */
static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts) static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts)
@ -746,13 +746,13 @@ static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opt
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes) * @fn static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes)
* *
* @brief Expat element start. * @brief Expat element start.
* *
* @param [in,out] data If non-null, the data. * @param [in,out] data If non-null, the data.
* @param name The name. * @param name The name.
* @param attributes The attributes. * @param attributes The attributes.
*/ */
static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes) static void expat_element_start(void *data, const XML_Char *name, const XML_Char **attributes)
@ -785,13 +785,13 @@ static void expat_element_start(void *data, const XML_Char *name, const XML_Char
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void expat_data(void *data, const XML_Char *s, int len) * @fn static void expat_data(void *data, const XML_Char *s, int len)
* *
* @brief Expat data. * @brief Expat data.
* *
* @param [in,out] data If non-null, the data. * @param [in,out] data If non-null, the data.
* @param s The const XML_Char * to process. * @param s The const XML_Char * to process.
* @param len The length. * @param len The length.
*/ */
static void expat_data(void *data, const XML_Char *s, int len) static void expat_data(void *data, const XML_Char *s, int len)
@ -833,12 +833,12 @@ static void expat_data(void *data, const XML_Char *s, int len)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void expat_element_end(void *data, const XML_Char *name) * @fn static void expat_element_end(void *data, const XML_Char *name)
* *
* @brief Expat element end. * @brief Expat element end.
* *
* @param [in,out] data If non-null, the data. * @param [in,out] data If non-null, the data.
* @param name The name. * @param name The name.
*/ */
static void expat_element_end(void *data, const XML_Char *name) static void expat_element_end(void *data, const XML_Char *name)
@ -892,15 +892,15 @@ static void expat_element_end(void *data, const XML_Char *name)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value) * @fn static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value)
* *
* @brief Adds a child. * @brief Adds a child.
* *
* @param [in,out] parent If non-null, the parent. * @param [in,out] parent If non-null, the parent.
* @param name The name. * @param name The name.
* @param value The value. * @param value The value.
* *
* @return null if it fails, else an xml_data_node*. * @return null if it fails, else an xml_data_node*.
*/ */
static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value) static xml_data_node *add_child(xml_data_node *parent, const char *name, const char *value)
@ -946,15 +946,15 @@ static xml_data_node *add_child(xml_data_node *parent, const char *name, const c
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value) * @fn static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value)
* *
* @brief Adds an attribute. * @brief Adds an attribute.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param name The name. * @param name The name.
* @param value The value. * @param value The value.
* *
* @return null if it fails, else an xml_attribute_node*. * @return null if it fails, else an xml_attribute_node*.
*/ */
static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value) static xml_attribute_node *add_attribute(xml_data_node *node, const char *name, const char *value)
@ -1001,13 +1001,13 @@ static xml_attribute_node *add_attribute(xml_data_node *node, const char *name,
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void write_node_recursive(xml_data_node *node, int indent, core_file *file) * @fn static void write_node_recursive(xml_data_node *node, int indent, core_file *file)
* *
* @brief Writes a node recursive. * @brief Writes a node recursive.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
* @param indent The indent. * @param indent The indent.
* @param [in,out] file If non-null, the file. * @param [in,out] file If non-null, the file.
*/ */
static void write_node_recursive(xml_data_node *node, int indent, core_file *file) static void write_node_recursive(xml_data_node *node, int indent, core_file *file)
@ -1054,11 +1054,11 @@ static void write_node_recursive(xml_data_node *node, int indent, core_file *fil
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void free_node_recursive(xml_data_node *node) * @fn static void free_node_recursive(xml_data_node *node)
* *
* @brief Free node recursive. * @brief Free node recursive.
* *
* @param [in,out] node If non-null, the node. * @param [in,out] node If non-null, the node.
*/ */
static void free_node_recursive(xml_data_node *node) static void free_node_recursive(xml_data_node *node)

232
src/lib/util/zippath.c
View File

@ -23,23 +23,23 @@
***************************************************************************/ ***************************************************************************/
/** /**
* @struct zippath_returned_directory * @struct zippath_returned_directory
* *
* @brief A zippath returned directory. * @brief A zippath returned directory.
*/ */
struct zippath_returned_directory struct zippath_returned_directory
{ {
/** @brief The next. */ /** @brief The next. */
zippath_returned_directory *next; zippath_returned_directory *next;
/** @brief The name. */ /** @brief The name. */
std::string name; std::string name;
}; };
/** /**
* @class zippath_directory * @class zippath_directory
* *
* @brief A zippath directory. * @brief A zippath directory.
*/ */
class zippath_directory class zippath_directory
@ -53,23 +53,23 @@ public:
returned_dirlist(NULL) { } returned_dirlist(NULL) { }
/* common */ /* common */
/** @brief true to returned parent. */ /** @brief true to returned parent. */
bool returned_parent; bool returned_parent;
/** @brief The returned entry. */ /** @brief The returned entry. */
osd_directory_entry returned_entry; osd_directory_entry returned_entry;
/* specific to normal directories */ /* specific to normal directories */
/** @brief Pathname of the directory. */ /** @brief Pathname of the directory. */
osd_directory *directory; osd_directory *directory;
/* specific to ZIP directories */ /* specific to ZIP directories */
/** @brief true to called zip first. */ /** @brief true to called zip first. */
bool called_zip_first; bool called_zip_first;
/** @brief The zipfile. */ /** @brief The zipfile. */
zip_file *zipfile; zip_file *zipfile;
/** @brief The zipprefix. */ /** @brief The zipprefix. */
std::string zipprefix; std::string zipprefix;
/** @brief The returned dirlist. */ /** @brief The returned dirlist. */
zippath_returned_directory *returned_dirlist; zippath_returned_directory *returned_dirlist;
}; };
@ -89,15 +89,15 @@ static int is_7z_file(const char *path);
***************************************************************************/ ***************************************************************************/
/** /**
* @fn int is_path_separator(char c) * @fn int is_path_separator(char c)
* *
* @brief ============================================================ * @brief ============================================================
* is_path_separator * is_path_separator
* ============================================================. * ============================================================.
* *
* @param c The character. * @param c The character.
* *
* @return An int. * @return An int.
*/ */
int is_path_separator(char c) int is_path_separator(char c)
@ -110,13 +110,13 @@ int is_path_separator(char c)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static void parse_parent_path(const char *path, int *beginpos, int *endpos) * @fn static void parse_parent_path(const char *path, int *beginpos, int *endpos)
* *
* @brief Parse parent path. * @brief Parse parent path.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* @param [in,out] beginpos If non-null, the beginpos. * @param [in,out] beginpos If non-null, the beginpos.
* @param [in,out] endpos If non-null, the endpos. * @param [in,out] endpos If non-null, the endpos.
*/ */
static void parse_parent_path(const char *path, int *beginpos, int *endpos) static void parse_parent_path(const char *path, int *beginpos, int *endpos)
@ -149,14 +149,14 @@ static void parse_parent_path(const char *path, int *beginpos, int *endpos)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn std::string &zippath_parent(std::string &dst, const char *path) * @fn std::string &zippath_parent(std::string &dst, const char *path)
* *
* @brief Zippath parent. * @brief Zippath parent.
* *
* @param [in,out] dst Destination for the. * @param [in,out] dst Destination for the.
* @param path Full pathname of the file. * @param path Full pathname of the file.
* *
* @return A std::string&amp; * @return A std::string&amp;
*/ */
std::string &zippath_parent(std::string &dst, const char *path) std::string &zippath_parent(std::string &dst, const char *path)
@ -182,14 +182,14 @@ std::string &zippath_parent(std::string &dst, const char *path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn std::string &zippath_parent_basename(std::string &dst, const char *path) * @fn std::string &zippath_parent_basename(std::string &dst, const char *path)
* *
* @brief Zippath parent basename. * @brief Zippath parent basename.
* *
* @param [in,out] dst Destination for the. * @param [in,out] dst Destination for the.
* @param path Full pathname of the file. * @param path Full pathname of the file.
* *
* @return A std::string&amp; * @return A std::string&amp;
*/ */
std::string &zippath_parent_basename(std::string &dst, const char *path) std::string &zippath_parent_basename(std::string &dst, const char *path)
@ -207,15 +207,15 @@ std::string &zippath_parent_basename(std::string &dst, const char *path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn std::string &zippath_combine(std::string &dst, const char *path1, const char *path2) * @fn std::string &zippath_combine(std::string &dst, const char *path1, const char *path2)
* *
* @brief Zippath combine. * @brief Zippath combine.
* *
* @param [in,out] dst Destination for the. * @param [in,out] dst Destination for the.
* @param path1 The first path. * @param path1 The first path.
* @param path2 The second path. * @param path2 The second path.
* *
* @return A std::string&amp; * @return A std::string&amp;
*/ */
std::string &zippath_combine(std::string &dst, const char *path1, const char *path2) std::string &zippath_combine(std::string &dst, const char *path1, const char *path2)
@ -255,13 +255,13 @@ std::string &zippath_combine(std::string &dst, const char *path1, const char *pa
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static file_error file_error_from_zip_error(zip_error ziperr) * @fn static file_error file_error_from_zip_error(zip_error ziperr)
* *
* @brief File error from zip error. * @brief File error from zip error.
* *
* @param ziperr The ziperr. * @param ziperr The ziperr.
* *
* @return A file_error. * @return A file_error.
*/ */
static file_error file_error_from_zip_error(zip_error ziperr) static file_error file_error_from_zip_error(zip_error ziperr)
@ -298,15 +298,15 @@ static file_error file_error_from_zip_error(zip_error ziperr)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file) * @fn static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file)
* *
* @brief Creates core file from zip. * @brief Creates core file from zip.
* *
* @param [in,out] zip If non-null, the zip. * @param [in,out] zip If non-null, the zip.
* @param header The header. * @param header The header.
* @param [in,out] file [in,out] If non-null, the file. * @param [in,out] file [in,out] If non-null, the file.
* *
* @return The new core file from zip. * @return The new core file from zip.
*/ */
static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file) static file_error create_core_file_from_zip(zip_file *zip, const zip_file_header *header, core_file *&file)
@ -345,16 +345,16 @@ done:
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path) * @fn file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path)
* *
* @brief Zippath fopen. * @brief Zippath fopen.
* *
* @param filename Filename of the file. * @param filename Filename of the file.
* @param openflags The openflags. * @param openflags The openflags.
* @param [in,out] file [in,out] If non-null, the file. * @param [in,out] file [in,out] If non-null, the file.
* @param [in,out] revised_path Full pathname of the revised file. * @param [in,out] revised_path Full pathname of the revised file.
* *
* @return A file_error. * @return A file_error.
*/ */
file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path) file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&file, std::string &revised_path)
@ -487,13 +487,13 @@ done:
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int is_root(const char *path) * @fn static int is_root(const char *path)
* *
* @brief Is root. * @brief Is root.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* *
* @return An int. * @return An int.
*/ */
static int is_root(const char *path) static int is_root(const char *path)
@ -519,13 +519,13 @@ static int is_root(const char *path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int is_7z_file(const char *path) * @fn static int is_7z_file(const char *path)
* *
* @brief Is 7z file. * @brief Is 7z file.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* *
* @return An int. * @return An int.
*/ */
static int is_7z_file(const char *path) static int is_7z_file(const char *path)
@ -541,13 +541,13 @@ static int is_7z_file(const char *path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int is_zip_file(const char *path) * @fn static int is_zip_file(const char *path)
* *
* @brief Is zip file. * @brief Is zip file.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* *
* @return An int. * @return An int.
*/ */
static int is_zip_file(const char *path) static int is_zip_file(const char *path)
@ -564,13 +564,13 @@ static int is_zip_file(const char *path)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int is_zip_file_separator(char c) * @fn static int is_zip_file_separator(char c)
* *
* @brief Is zip file separator. * @brief Is zip file separator.
* *
* @param c The character. * @param c The character.
* *
* @return An int. * @return An int.
*/ */
static int is_zip_file_separator(char c) static int is_zip_file_separator(char c)
@ -586,13 +586,13 @@ static int is_zip_file_separator(char c)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static int is_zip_path_separator(char c) * @fn static int is_zip_path_separator(char c)
* *
* @brief Is zip path separator. * @brief Is zip path separator.
* *
* @param c The character. * @param c The character.
* *
* @return An int. * @return An int.
*/ */
static int is_zip_path_separator(char c) static int is_zip_path_separator(char c)
@ -608,14 +608,14 @@ static int is_zip_path_separator(char c)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static char next_path_char(const char *s, int *pos) * @fn static char next_path_char(const char *s, int *pos)
* *
* @brief Next path character. * @brief Next path character.
* *
* @param s The const char * to process. * @param s The const char * to process.
* @param [in,out] pos If non-null, the position. * @param [in,out] pos If non-null, the position.
* *
* @return A char. * @return A char.
*/ */
static char next_path_char(const char *s, int *pos) static char next_path_char(const char *s, int *pos)
@ -661,15 +661,15 @@ static char next_path_char(const char *s, int *pos)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type) * @fn static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type)
* *
* @brief Zippath find sub path. * @brief Zippath find sub path.
* *
* @param [in,out] zipfile If non-null, the zipfile. * @param [in,out] zipfile If non-null, the zipfile.
* @param subpath The subpath. * @param subpath The subpath.
* @param [in,out] type If non-null, the type. * @param [in,out] type If non-null, the type.
* *
* @return null if it fails, else a zip_file_header*. * @return null if it fails, else a zip_file_header*.
*/ */
static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type) static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const char *subpath, osd_dir_entry_type *type)
@ -726,16 +726,16 @@ static const zip_file_header *zippath_find_sub_path(zip_file *zipfile, const cha
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath) * @fn static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath)
* *
* @brief Zippath resolve. * @brief Zippath resolve.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* @param [in,out] entry_type Type of the entry. * @param [in,out] entry_type Type of the entry.
* @param [in,out] zipfile [in,out] If non-null, the zipfile. * @param [in,out] zipfile [in,out] If non-null, the zipfile.
* @param [in,out] newpath The newpath. * @param [in,out] newpath The newpath.
* *
* @return A file_error. * @return A file_error.
*/ */
static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath) static file_error zippath_resolve(const char *path, osd_dir_entry_type &entry_type, zip_file *&zipfile, std::string &newpath)
@ -834,14 +834,14 @@ done:
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn file_error zippath_opendir(const char *path, zippath_directory **directory) * @fn file_error zippath_opendir(const char *path, zippath_directory **directory)
* *
* @brief Zippath opendir. * @brief Zippath opendir.
* *
* @param path Full pathname of the file. * @param path Full pathname of the file.
* @param [in,out] directory If non-null, pathname of the directory. * @param [in,out] directory If non-null, pathname of the directory.
* *
* @return A file_error. * @return A file_error.
*/ */
file_error zippath_opendir(const char *path, zippath_directory **directory) file_error zippath_opendir(const char *path, zippath_directory **directory)
@ -905,11 +905,11 @@ done:
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn void zippath_closedir(zippath_directory *directory) * @fn void zippath_closedir(zippath_directory *directory)
* *
* @brief Zippath closedir. * @brief Zippath closedir.
* *
* @param [in,out] directory If non-null, pathname of the directory. * @param [in,out] directory If non-null, pathname of the directory.
*/ */
void zippath_closedir(zippath_directory *directory) void zippath_closedir(zippath_directory *directory)
@ -938,14 +938,14 @@ void zippath_closedir(zippath_directory *directory)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header) * @fn static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
* *
* @brief Gets relative path. * @brief Gets relative path.
* *
* @param [in,out] directory If non-null, pathname of the directory. * @param [in,out] directory If non-null, pathname of the directory.
* @param header The header. * @param header The header.
* *
* @return null if it fails, else the relative path. * @return null if it fails, else the relative path.
*/ */
static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header) static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
@ -970,13 +970,13 @@ static const char *get_relative_path(zippath_directory *directory, const zip_fil
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn const osd_directory_entry *zippath_readdir(zippath_directory *directory) * @fn const osd_directory_entry *zippath_readdir(zippath_directory *directory)
* *
* @brief Zippath readdir. * @brief Zippath readdir.
* *
* @param [in,out] directory If non-null, pathname of the directory. * @param [in,out] directory If non-null, pathname of the directory.
* *
* @return null if it fails, else an osd_directory_entry*. * @return null if it fails, else an osd_directory_entry*.
*/ */
const osd_directory_entry *zippath_readdir(zippath_directory *directory) const osd_directory_entry *zippath_readdir(zippath_directory *directory)
@ -1086,13 +1086,13 @@ const osd_directory_entry *zippath_readdir(zippath_directory *directory)
-------------------------------------------------*/ -------------------------------------------------*/
/** /**
* @fn int zippath_is_zip(zippath_directory *directory) * @fn int zippath_is_zip(zippath_directory *directory)
* *
* @brief Zippath is zip. * @brief Zippath is zip.
* *
* @param [in,out] directory If non-null, pathname of the directory. * @param [in,out] directory If non-null, pathname of the directory.
* *
* @return An int. * @return An int.
*/ */
int zippath_is_zip(zippath_directory *directory) int zippath_is_zip(zippath_directory *directory)

6
src/mame/arcade.lst
View File

@ -1901,7 +1901,7 @@ geostorm // (c) 1994 Irem (Japan)
airass // (c) 1993 Irem (World) airass // (c) 1993 Irem (World)
firebarr // (c) 1993 Irem (Japan) firebarr // (c) 1993 Irem (Japan)
dsoccr94 // (c) 1994 Irem (Data East Corporation license) dsoccr94 // (c) 1994 Irem (Data East Corporation license)
dsoccr94k // dsoccr94k //
kftgoal // (c) 1994 Jaleco kftgoal // (c) 1994 Jaleco
wpksoc // (c) 1995 Jaleco wpksoc // (c) 1995 Jaleco
@ -4845,7 +4845,7 @@ mahmajn2 // 1994.05 Tokorosan no Mahmahjong 2 (Japan)
qgh // 1994.09 Quiz Ghost Hunter qgh // 1994.09 Quiz Ghost Hunter
// M1 board // M1 board
bingpty // ? bingpty // ?
// Sega System 32 games // Sega System 32 games
radm // 1991.?? Rad Mobile (World) radm // 1991.?? Rad Mobile (World)
@ -9123,7 +9123,7 @@ keroppi // (c) 1993 Sammy
keroppij // (c) 1993 Sammy keroppij // (c) 1993 Sammy
extdwnhl // (c) 1995 Sammy Japan extdwnhl // (c) 1995 Sammy Japan
gundhara // (c) 1995 Banpresto gundhara // (c) 1995 Banpresto
gundharac // (c) 1995 Banpresto (Chinese, bootleg?) gundharac // (c) 1995 Banpresto (Chinese, bootleg?)
sokonuke // (c) 1995 Sammy Industries sokonuke // (c) 1995 Sammy Industries
zombraid // (c) 1995 American Sammy zombraid // (c) 1995 American Sammy
zombraidp // (c) 1995 American Sammy zombraidp // (c) 1995 American Sammy

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

@ -168,7 +168,7 @@ WRITE8_MEMBER( irem_audio_device::ay8910_45M_portb_w )
WRITE8_MEMBER( irem_audio_device::ay8910_45L_porta_w ) WRITE8_MEMBER( irem_audio_device::ay8910_45L_porta_w )
{ {
/* /*
* 45L 21 IOA0 ==> BD * 45L 21 IOA0 ==> BD
* 45L 20 IOA1 ==> SD * 45L 20 IOA1 ==> SD
* 45L 19 IOA2 ==> OH * 45L 19 IOA2 ==> OH
* 45L 18 IOA3 ==> CH * 45L 18 IOA3 ==> CH
@ -465,7 +465,7 @@ NETLIST_START(kidniki_interface)
TTL_INPUT(I_BD0, 1) TTL_INPUT(I_BD0, 1)
//CLOCK(I_BD0, 5) //CLOCK(I_BD0, 5)
TTL_INPUT(I_CH0, 1) TTL_INPUT(I_CH0, 1)
//CLOCK(I_CH0, 2.2 ) //CLOCK(I_CH0, 2.2 )
TTL_INPUT(I_OH0, 1) TTL_INPUT(I_OH0, 1)
//CLOCK(I_OH0, 1.0) //CLOCK(I_OH0, 1.0)
ANALOG_INPUT(I_MSM2K0, 0) ANALOG_INPUT(I_MSM2K0, 0)

86
src/mame/audio/nl_kidniki.c
View File

@ -312,68 +312,68 @@ NETLIST_END()
NETLIST_START(opamp) NETLIST_START(opamp)
/* Opamp model from /* Opamp model from
* *
* http://www.ecircuitcenter.com/Circuits/opmodel1/opmodel1.htm * http://www.ecircuitcenter.com/Circuits/opmodel1/opmodel1.htm
* *
* Bandwidth 1Mhz * Bandwidth 1Mhz
* *
*/ */
/* Terminal definitions for calling netlists */ /* Terminal definitions for calling netlists */
ALIAS(PLUS, G1.IP) // Positive input ALIAS(PLUS, G1.IP) // Positive input
ALIAS(MINUS, G1.IN) // Negative input ALIAS(MINUS, G1.IN) // Negative input
ALIAS(OUT, EBUF.OP) // Opamp output ... ALIAS(OUT, EBUF.OP) // Opamp output ...
ALIAS(GND, EBUF.ON) // GND terminal ALIAS(GND, EBUF.ON) // GND terminal
ALIAS(VCC, DUMMY.I) // VCC terminal ALIAS(VCC, DUMMY.I) // VCC terminal
DUMMY_INPUT(DUMMY) DUMMY_INPUT(DUMMY)
/* The opamp model */ /* The opamp model */
VCCS(G1) VCCS(G1)
PARAM(G1.RI, RES_K(1000)) PARAM(G1.RI, RES_K(1000))
#if 1 #if 1
PARAM(G1.G, 100) // typical OP-AMP amplification 100 * 1000 = 100000 PARAM(G1.G, 100) // typical OP-AMP amplification 100 * 1000 = 100000
RES(RP1, 1000) RES(RP1, 1000)
CAP(CP1, 1.59e-5) // <== change to 1.59e-3 for 10Khz bandwidth CAP(CP1, 1.59e-5) // <== change to 1.59e-3 for 10Khz bandwidth
#else #else
PARAM(G1.G, 1) // typical OP-AMP amplification 100 * 1000 = 100000 PARAM(G1.G, 1) // typical OP-AMP amplification 100 * 1000 = 100000
RES(RP1, 100000) RES(RP1, 100000)
CAP(CP1, 1.59e-7) // <== change to 1.59e-3 for 10Khz bandwidth CAP(CP1, 1.59e-7) // <== change to 1.59e-3 for 10Khz bandwidth
#endif #endif
VCVS(EBUF) VCVS(EBUF)
PARAM(EBUF.RO, 50) PARAM(EBUF.RO, 50)
PARAM(EBUF.G, 1) PARAM(EBUF.G, 1)
// PARAM(EBUF.RI, 1e20) // PARAM(EBUF.RI, 1e20)
// NET_C(EBUF.ON, GND) // NET_C(EBUF.ON, GND)
NET_C(G1.ON, GND) NET_C(G1.ON, GND)
NET_C(RP1.2, GND) NET_C(RP1.2, GND)
NET_C(CP1.2, GND) NET_C(CP1.2, GND)
NET_C(EBUF.IN, GND) NET_C(EBUF.IN, GND)
NET_C(RP1.1, G1.OP) NET_C(RP1.1, G1.OP)
NET_C(CP1.1, RP1.1) NET_C(CP1.1, RP1.1)
DIODE(DP,"1N914") DIODE(DP,"1N914")
DIODE(DN,"1N914") DIODE(DN,"1N914")
NET_C(DP.K, VCC) NET_C(DP.K, VCC)
#if 1 #if 1
NET_C(DP.A, DN.K, RP1.1) NET_C(DP.A, DN.K, RP1.1)
#else #else
RES(RDP, 1000) RES(RDP, 1000)
RES(RDN, 1000) RES(RDN, 1000)
NET_C(RDP.1, DP.A) NET_C(RDP.1, DP.A)
NET_C(RDN.1, DN.K) NET_C(RDN.1, DN.K)
NET_C(RDP.2, RDN.2, RP1.1) NET_C(RDP.2, RDN.2, RP1.1)
#endif #endif
NET_C(DN.A, GND) NET_C(DN.A, GND)
NET_C(EBUF.IP, RP1.1) NET_C(EBUF.IP, RP1.1)
NETLIST_END() NETLIST_END()

2
src/mame/drivers/aleisttl.c
View File

@ -7,7 +7,7 @@
Chase (aka Chase1) (1976) Chase (aka Chase1) (1976)
Deluxe Soccer (1973) Deluxe Soccer (1973)
Fire Power (1975) Fire Power (1975)
Fütsball (1975) F??tsball (1975)
Galaxy Raider (1974) Galaxy Raider (1974)
Hesitation (1974) AL-6500? Hesitation (1974) AL-6500?
Hockey, Soccer, Tennis (1974) Hockey, Soccer, Tennis (1974)

32
src/mame/drivers/chsuper.c
View File

@ -135,21 +135,21 @@ WRITE8_MEMBER( chsuper_state::chsuper_vram_w )
*/ */
WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
{ {
coin_counter_w(machine(), 0, data & 0x01); // Coin counter coin_counter_w(machine(), 0, data & 0x01); // Coin counter
output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp. output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp.
coin_counter_w(machine(), 1, data & 0x04); // Payout / Ticket Out pulse coin_counter_w(machine(), 1, data & 0x04); // Payout / Ticket Out pulse
output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp. output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp.
// D4: unused... // D4: unused...
output_set_lamp_value(5, (data >> 5) & 1); // BET lamp output_set_lamp_value(5, (data >> 5) & 1); // BET lamp
// D6: ticket motor... // D6: ticket motor...
// D7: unused... // D7: unused...
/* Workaround to get the HOLD 3 lamp line active, /* Workaround to get the HOLD 3 lamp line active,
from the HOLD 1 and HOLD 5 lamps status... from the HOLD 1 and HOLD 5 lamps status...
*/ */
m_blacklamp = (data >> 1) & 1; // latching the BLACK lamp status... m_blacklamp = (data >> 1) & 1; // latching the BLACK lamp status...
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON... if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{ {
@ -161,29 +161,29 @@ WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
} }
} }
WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
{ {
// D0: unknown... // D0: unknown...
// D1: unused... // D1: unused...
output_set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp. output_set_lamp_value(3, (data >> 2) & 1); // Hold 4 / High (Alta) lamp.
// D3: unused... // D3: unused...
// D4: unused... // D4: unused...
output_set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp. output_set_lamp_value(4, (data >> 5) & 1); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
output_set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp. output_set_lamp_value(6, (data >> 6) & 1); // Start / Gamble (Raddoppio) lamp.
// D7: unused... // D7: unused...
/* Workaround to get the HOLD 3 lamp line active, /* Workaround to get the HOLD 3 lamp line active,
from the HOLD 1 and HOLD 5 lamps status... from the HOLD 1 and HOLD 5 lamps status...
*/ */
m_redlamp = (data >> 5) & 1; // latching the RED lamp status... m_redlamp = (data >> 5) & 1; // latching the RED lamp status...
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON... if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{ {
output_set_lamp_value(2, 1); // Hold 3 ON output_set_lamp_value(2, 1); // Hold 3 ON
} }
else else
{ {
output_set_lamp_value(2, 0); // Hold 3 OFF output_set_lamp_value(2, 0); // Hold 3 OFF
} }
} }
@ -208,7 +208,7 @@ static ADDRESS_MAP_START( chsuper_portmap, AS_IO, 8, chsuper_state )
AM_RANGE( 0x00fc, 0x00fc ) AM_DEVWRITE("ramdac", ramdac_device, index_w) AM_RANGE( 0x00fc, 0x00fc ) AM_DEVWRITE("ramdac", ramdac_device, index_w)
AM_RANGE( 0x00fd, 0x00fd ) AM_DEVWRITE("ramdac", ramdac_device, pal_w) AM_RANGE( 0x00fd, 0x00fd ) AM_DEVWRITE("ramdac", ramdac_device, pal_w)
AM_RANGE( 0x00fe, 0x00fe ) AM_DEVWRITE("ramdac", ramdac_device, mask_w) AM_RANGE( 0x00fe, 0x00fe ) AM_DEVWRITE("ramdac", ramdac_device, mask_w)
AM_RANGE( 0x8300, 0x8300 ) AM_READ_PORT("IN2") // valid input port present in test mode. AM_RANGE( 0x8300, 0x8300 ) AM_READ_PORT("IN2") // valid input port present in test mode.
AM_RANGE( 0xff20, 0xff3f ) AM_DEVWRITE("dac", dac_device, write_unsigned8) // unk writes AM_RANGE( 0xff20, 0xff3f ) AM_DEVWRITE("dac", dac_device, write_unsigned8) // unk writes
ADDRESS_MAP_END ADDRESS_MAP_END
@ -263,7 +263,7 @@ static INPUT_PORTS_START( chsuper )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W) PORT_NAME("IN1-3") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W) PORT_NAME("IN1-3")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E) PORT_NAME("IN1-4") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E) PORT_NAME("IN1-4")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_R) PORT_NAME("IN1-5") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_R) PORT_NAME("IN1-5")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) // ticket-in in chmpnum PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) // ticket-in in chmpnum
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("IN1-7") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("IN1-7")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // ticket out / payout in chsuper2 PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // ticket out / payout in chsuper2

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

@ -1622,27 +1622,27 @@ ROM_END
/* sole change seems to be copyright date, PCB has chip references instead of grid references. Not correcting all labels in other sets in case these are legitimate labels */ /* sole change seems to be copyright date, PCB has chip references instead of grid references. Not correcting all labels in other sets in case these are legitimate labels */
ROM_START( fantsia2n ) ROM_START( fantsia2n )
ROM_REGION( 0x500000, "maincpu", 0 ) /* 68000 code */ ROM_REGION( 0x500000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "prog2.g17", 0x000000, 0x80000, CRC(57c59972) SHA1(4b1da928b537cf340a67026d07bc3dfc078b0d0f) ) ROM_LOAD16_BYTE( "prog2.g17", 0x000000, 0x80000, CRC(57c59972) SHA1(4b1da928b537cf340a67026d07bc3dfc078b0d0f) )
ROM_LOAD16_BYTE( "prog1.f17", 0x000001, 0x80000, CRC(bf2d9a26) SHA1(92f0c1bd32f1e5e0ede3ba847242a212dfae4986) ) ROM_LOAD16_BYTE( "prog1.f17", 0x000001, 0x80000, CRC(bf2d9a26) SHA1(92f0c1bd32f1e5e0ede3ba847242a212dfae4986) )
ROM_LOAD16_BYTE( "scr2.g16", 0x100000, 0x80000, CRC(887b1bc5) SHA1(b6fcdc8a56ea25758f363224d256e9b6c8e30244) ) ROM_LOAD16_BYTE( "scr2.g16", 0x100000, 0x80000, CRC(887b1bc5) SHA1(b6fcdc8a56ea25758f363224d256e9b6c8e30244) )
ROM_LOAD16_BYTE( "scr1.f16", 0x100001, 0x80000, CRC(cbba3182) SHA1(a484819940fa1ef18ce679465c31075798748bac) ) ROM_LOAD16_BYTE( "scr1.f16", 0x100001, 0x80000, CRC(cbba3182) SHA1(a484819940fa1ef18ce679465c31075798748bac) )
ROM_LOAD16_BYTE( "scr4.g15", 0x200000, 0x80000, CRC(ce97e411) SHA1(be0ed41362db03f384229c708f2ba4146e5cb501) ) ROM_LOAD16_BYTE( "scr4.g15", 0x200000, 0x80000, CRC(ce97e411) SHA1(be0ed41362db03f384229c708f2ba4146e5cb501) )
ROM_LOAD16_BYTE( "scr3.f15", 0x200001, 0x80000, CRC(480cc2e8) SHA1(38fe57ba1e34537f8be65fcc023ccd43369a5d94) ) ROM_LOAD16_BYTE( "scr3.f15", 0x200001, 0x80000, CRC(480cc2e8) SHA1(38fe57ba1e34537f8be65fcc023ccd43369a5d94) )
ROM_LOAD16_BYTE( "scr6.g14", 0x300000, 0x80000, CRC(b29d49de) SHA1(854b76755acf58fb8a4648a0ce72ea6bdf26c555) ) ROM_LOAD16_BYTE( "scr6.g14", 0x300000, 0x80000, CRC(b29d49de) SHA1(854b76755acf58fb8a4648a0ce72ea6bdf26c555) )
ROM_LOAD16_BYTE( "scr5.f14", 0x300001, 0x80000, CRC(d5f88b83) SHA1(518a1f6732149f2851bbedca61f7313c39beb91b) ) ROM_LOAD16_BYTE( "scr5.f14", 0x300001, 0x80000, CRC(d5f88b83) SHA1(518a1f6732149f2851bbedca61f7313c39beb91b) )
ROM_LOAD16_BYTE( "scr8.g20", 0x400000, 0x80000, CRC(694ae2b3) SHA1(82b7a565290fce07c8393af4718fd1e6136928e9) ) ROM_LOAD16_BYTE( "scr8.g20", 0x400000, 0x80000, CRC(694ae2b3) SHA1(82b7a565290fce07c8393af4718fd1e6136928e9) )
ROM_LOAD16_BYTE( "scr7.f20", 0x400001, 0x80000, CRC(6068712c) SHA1(80a136d76dca566772e34d832ac11b8c7d6ce9ab) ) ROM_LOAD16_BYTE( "scr7.f20", 0x400001, 0x80000, CRC(6068712c) SHA1(80a136d76dca566772e34d832ac11b8c7d6ce9ab) )
ROM_REGION( 0x100000, "gfx1", 0 ) /* sprites */ ROM_REGION( 0x100000, "gfx1", 0 ) /* sprites */
ROM_LOAD( "23_OBJ1.U5", 0x00000, 0x80000, CRC(b45c9234) SHA1(b5eeec91b9c6952b338130458405997e1a51bf2f) ) ROM_LOAD( "23_OBJ1.U5", 0x00000, 0x80000, CRC(b45c9234) SHA1(b5eeec91b9c6952b338130458405997e1a51bf2f) )
ROM_LOAD( "obj2.2i", 0x80000, 0x80000, CRC(ea6e3861) SHA1(463b40f5441231a0451571a0b8afe1ed0fd4b164) ) ROM_LOAD( "obj2.2i", 0x80000, 0x80000, CRC(ea6e3861) SHA1(463b40f5441231a0451571a0b8afe1ed0fd4b164) )
ROM_REGION( 0x140000, "oki", 0 ) /* OKIM6295 samples */ ROM_REGION( 0x140000, "oki", 0 ) /* OKIM6295 samples */
/* 00000-2ffff is fixed, 30000-3ffff is bank switched from all the ROMs */ /* 00000-2ffff is fixed, 30000-3ffff is bank switched from all the ROMs */
ROM_LOAD( "music2.1b", 0x00000, 0x80000, CRC(23cc4f9c) SHA1(06b5342c25de966ce590917c571e5b19af1fef7d) ) ROM_LOAD( "music2.1b", 0x00000, 0x80000, CRC(23cc4f9c) SHA1(06b5342c25de966ce590917c571e5b19af1fef7d) )
ROM_RELOAD( 0x40000, 0x80000 ) ROM_RELOAD( 0x40000, 0x80000 )
ROM_LOAD( "music1.1a", 0xc0000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) ) ROM_LOAD( "music1.1a", 0xc0000, 0x80000, CRC(864167c2) SHA1(c454b26b6dea993e6bd64546f92beef05e46d7d7) )
ROM_END ROM_END
ROM_START( wownfant) ROM_START( wownfant)

70
src/mame/drivers/gradius3.c
View File

@ -412,50 +412,50 @@ ROM_START( gradius3j )
ROM_END ROM_END
ROM_START( gradius3js ) ROM_START( gradius3js )
ROM_REGION( 0x40000, "maincpu", 0 ) ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "945_s13.f15", 0x00000, 0x20000, CRC(70c240a2) SHA1(82dc391572e1f61b0182cb031654d71adcdd5f6e) ) ROM_LOAD16_BYTE( "945_s13.f15", 0x00000, 0x20000, CRC(70c240a2) SHA1(82dc391572e1f61b0182cb031654d71adcdd5f6e) )
ROM_LOAD16_BYTE( "945_s12.e15", 0x00001, 0x20000, CRC(bbc300d4) SHA1(e1ca98bc591575285d7bd2d4fefdf35fed10dcb6) ) ROM_LOAD16_BYTE( "945_s12.e15", 0x00001, 0x20000, CRC(bbc300d4) SHA1(e1ca98bc591575285d7bd2d4fefdf35fed10dcb6) )
ROM_REGION( 0x100000, "sub", 0 ) ROM_REGION( 0x100000, "sub", 0 )
ROM_LOAD16_BYTE( "945_m09.r17", 0x000000, 0x20000, CRC(b4a6df25) SHA1(85533cf140d28f6f81c0b49b8061bda0924a613a) ) ROM_LOAD16_BYTE( "945_m09.r17", 0x000000, 0x20000, CRC(b4a6df25) SHA1(85533cf140d28f6f81c0b49b8061bda0924a613a) )
ROM_LOAD16_BYTE( "945_m08.n17", 0x000001, 0x20000, CRC(74e981d2) SHA1(e7b47a2da01ff73293d2100c48fdf00b33125af5) ) ROM_LOAD16_BYTE( "945_m08.n17", 0x000001, 0x20000, CRC(74e981d2) SHA1(e7b47a2da01ff73293d2100c48fdf00b33125af5) )
ROM_LOAD16_BYTE( "945_l06b.r11", 0x040000, 0x20000, CRC(83772304) SHA1(a90c75a3de670b6ec5e0fc201876d463b4a76766) ) ROM_LOAD16_BYTE( "945_l06b.r11", 0x040000, 0x20000, CRC(83772304) SHA1(a90c75a3de670b6ec5e0fc201876d463b4a76766) )
ROM_LOAD16_BYTE( "945_l06a.n11", 0x040001, 0x20000, CRC(e1fd75b6) SHA1(6160d80a2f1bf550e85d6253cf521a96f5a644cc) ) ROM_LOAD16_BYTE( "945_l06a.n11", 0x040001, 0x20000, CRC(e1fd75b6) SHA1(6160d80a2f1bf550e85d6253cf521a96f5a644cc) )
ROM_LOAD16_BYTE( "945_l07c.r15", 0x080000, 0x20000, CRC(c1e399b6) SHA1(e95bd478dd3beea0175bf9ee4cededb111c4ace1) ) ROM_LOAD16_BYTE( "945_l07c.r15", 0x080000, 0x20000, CRC(c1e399b6) SHA1(e95bd478dd3beea0175bf9ee4cededb111c4ace1) )
ROM_LOAD16_BYTE( "945_l07a.n15", 0x080001, 0x20000, CRC(96222d04) SHA1(b55700f683a556b0e73dbac9c7b4ce485420d21c) ) ROM_LOAD16_BYTE( "945_l07a.n15", 0x080001, 0x20000, CRC(96222d04) SHA1(b55700f683a556b0e73dbac9c7b4ce485420d21c) )
ROM_LOAD16_BYTE( "945_l07d.r13", 0x0c0000, 0x20000, CRC(4c16d4bd) SHA1(01dcf169b78a1e495214b10181401d1920b0c924) ) ROM_LOAD16_BYTE( "945_l07d.r13", 0x0c0000, 0x20000, CRC(4c16d4bd) SHA1(01dcf169b78a1e495214b10181401d1920b0c924) )
ROM_LOAD16_BYTE( "945_l07b.n13", 0x0c0001, 0x20000, CRC(5e209d01) SHA1(0efa1bbfdc7e2ba1e0bb96245e2bfe961258b446) ) ROM_LOAD16_BYTE( "945_l07b.n13", 0x0c0001, 0x20000, CRC(5e209d01) SHA1(0efa1bbfdc7e2ba1e0bb96245e2bfe961258b446) )
ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "945_m05.d9", 0x00000, 0x10000, CRC(c8c45365) SHA1(b9a7b736b52bca42c7b8c8ed64c8df73e0116158) ) ROM_LOAD( "945_m05.d9", 0x00000, 0x10000, CRC(c8c45365) SHA1(b9a7b736b52bca42c7b8c8ed64c8df73e0116158) )
ROM_REGION( 0x200000, "k051960", 0 ) /* graphics (addressable by the main CPU) */ ROM_REGION( 0x200000, "k051960", 0 ) /* graphics (addressable by the main CPU) */
ROM_LOAD32_BYTE( "945_A02A.K2", 0x000000, 0x20000, CRC(fbb81511) SHA1(e7988d52e323e46117f5080c469daf9b119f28a0) ) ROM_LOAD32_BYTE( "945_A02A.K2", 0x000000, 0x20000, CRC(fbb81511) SHA1(e7988d52e323e46117f5080c469daf9b119f28a0) )
ROM_LOAD32_BYTE( "945_A02C.M2", 0x000001, 0x20000, CRC(031b55e8) SHA1(64ed8dee60bf012df7c1ed496af1c75263c052a6) ) ROM_LOAD32_BYTE( "945_A02C.M2", 0x000001, 0x20000, CRC(031b55e8) SHA1(64ed8dee60bf012df7c1ed496af1c75263c052a6) )
ROM_LOAD32_BYTE( "945_A01A.E2", 0x000002, 0x20000, CRC(bace5abb) SHA1(b32df63294c0730f463335b1b760494389c60062) ) ROM_LOAD32_BYTE( "945_A01A.E2", 0x000002, 0x20000, CRC(bace5abb) SHA1(b32df63294c0730f463335b1b760494389c60062) )
ROM_LOAD32_BYTE( "945_A01C.H2", 0x000003, 0x20000, CRC(d91b29a6) SHA1(0c3027a08996f4c2b86dd88695241b21c8dffd64) ) ROM_LOAD32_BYTE( "945_A01C.H2", 0x000003, 0x20000, CRC(d91b29a6) SHA1(0c3027a08996f4c2b86dd88695241b21c8dffd64) )
ROM_LOAD32_BYTE( "945_A02B.K4", 0x080000, 0x20000, CRC(c0fed4ab) SHA1(f01975b13759cae7c8dfd24f9b3f4ac960d32957) ) ROM_LOAD32_BYTE( "945_A02B.K4", 0x080000, 0x20000, CRC(c0fed4ab) SHA1(f01975b13759cae7c8dfd24f9b3f4ac960d32957) )
ROM_LOAD32_BYTE( "945_A02D.M4", 0x080001, 0x20000, CRC(d462817c) SHA1(00137e38454e7c3548a1a9553c5ee644916b3959) ) ROM_LOAD32_BYTE( "945_A02D.M4", 0x080001, 0x20000, CRC(d462817c) SHA1(00137e38454e7c3548a1a9553c5ee644916b3959) )
ROM_LOAD32_BYTE( "945_A01B.E4", 0x080002, 0x20000, CRC(b426090e) SHA1(06a671a648e3255146fe0c325d5451d4f75f08aa) ) ROM_LOAD32_BYTE( "945_A01B.E4", 0x080002, 0x20000, CRC(b426090e) SHA1(06a671a648e3255146fe0c325d5451d4f75f08aa) )
ROM_LOAD32_BYTE( "945_A01D.H4", 0x080003, 0x20000, CRC(3990c09a) SHA1(1f6a089c1d03fb95d4d96fecc0379bde26ee2b9d) ) ROM_LOAD32_BYTE( "945_A01D.H4", 0x080003, 0x20000, CRC(3990c09a) SHA1(1f6a089c1d03fb95d4d96fecc0379bde26ee2b9d) )
ROM_LOAD32_BYTE( "945_l04a.k6", 0x100000, 0x20000, CRC(884e21ee) SHA1(ce86dd3a06775e5b1aa09db010dcb674e67828e7) ) ROM_LOAD32_BYTE( "945_l04a.k6", 0x100000, 0x20000, CRC(884e21ee) SHA1(ce86dd3a06775e5b1aa09db010dcb674e67828e7) )
ROM_LOAD32_BYTE( "945_l04c.m6", 0x100001, 0x20000, CRC(45bcd921) SHA1(e51a8a71362a6fb55124aa1dce74519c0a3c6e3f) ) ROM_LOAD32_BYTE( "945_l04c.m6", 0x100001, 0x20000, CRC(45bcd921) SHA1(e51a8a71362a6fb55124aa1dce74519c0a3c6e3f) )
ROM_LOAD32_BYTE( "945_l03a.e6", 0x100002, 0x20000, CRC(a67ef087) SHA1(fd63474f3bbde5dfc53ed4c1db25d6411a8b54d2) ) ROM_LOAD32_BYTE( "945_l03a.e6", 0x100002, 0x20000, CRC(a67ef087) SHA1(fd63474f3bbde5dfc53ed4c1db25d6411a8b54d2) )
ROM_LOAD32_BYTE( "945_l03c.h6", 0x100003, 0x20000, CRC(a56be17a) SHA1(1d387736144c30fcb5de54235331ab1ff70c356e) ) ROM_LOAD32_BYTE( "945_l03c.h6", 0x100003, 0x20000, CRC(a56be17a) SHA1(1d387736144c30fcb5de54235331ab1ff70c356e) )
ROM_LOAD32_BYTE( "945_l04b.k8", 0x180000, 0x20000, CRC(843bc67d) SHA1(cdf8421083f24ab27867ed5d08d8949da192b2b9) ) ROM_LOAD32_BYTE( "945_l04b.k8", 0x180000, 0x20000, CRC(843bc67d) SHA1(cdf8421083f24ab27867ed5d08d8949da192b2b9) )
ROM_LOAD32_BYTE( "945_l04d.m8", 0x180001, 0x20000, CRC(0a98d08e) SHA1(1e0ca51a2d45c01fa3f11950ddd387f41ddae691) ) ROM_LOAD32_BYTE( "945_l04d.m8", 0x180001, 0x20000, CRC(0a98d08e) SHA1(1e0ca51a2d45c01fa3f11950ddd387f41ddae691) )
ROM_LOAD32_BYTE( "945_l03b.e8", 0x180002, 0x20000, CRC(933e68b9) SHA1(f3a39446ca77d17fdbd938bd5f718ae9d5570879) ) ROM_LOAD32_BYTE( "945_l03b.e8", 0x180002, 0x20000, CRC(933e68b9) SHA1(f3a39446ca77d17fdbd938bd5f718ae9d5570879) )
ROM_LOAD32_BYTE( "945_l03d.h8", 0x180003, 0x20000, CRC(f375e87b) SHA1(6427b966795c907c8e516244872fe52217da62c4) ) ROM_LOAD32_BYTE( "945_l03d.h8", 0x180003, 0x20000, CRC(f375e87b) SHA1(6427b966795c907c8e516244872fe52217da62c4) )
ROM_REGION( 0x0100, "proms", 0 ) ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "945l14.j28", 0x0000, 0x0100, CRC(c778c189) SHA1(847eaf379ba075c25911c6f83dd63ff390534f60) ) /* priority encoder (not used) */ ROM_LOAD( "945l14.j28", 0x0000, 0x0100, CRC(c778c189) SHA1(847eaf379ba075c25911c6f83dd63ff390534f60) ) /* priority encoder (not used) */
ROM_REGION( 0x80000, "k007232", 0 ) /* 007232 samples */ ROM_REGION( 0x80000, "k007232", 0 ) /* 007232 samples */
ROM_LOAD( "945_A10A.C14", 0x00000, 0x20000, CRC(ec717414) SHA1(8c63d5fe01d0833529fca91bc80cdbd8a04174c0) ) ROM_LOAD( "945_A10A.C14", 0x00000, 0x20000, CRC(ec717414) SHA1(8c63d5fe01d0833529fca91bc80cdbd8a04174c0) )
ROM_LOAD( "945_A10B.C16", 0x20000, 0x20000, CRC(709e30e4) SHA1(27fcea720cd2498f1870c9290d30dcb3dd81d5e5) ) ROM_LOAD( "945_A10B.C16", 0x20000, 0x20000, CRC(709e30e4) SHA1(27fcea720cd2498f1870c9290d30dcb3dd81d5e5) )
ROM_LOAD( "945_l11a.c18", 0x40000, 0x20000, CRC(6043f4eb) SHA1(1c2e9ace1cfdde504b7b6158e3c3f54dc5ae33d4) ) ROM_LOAD( "945_l11a.c18", 0x40000, 0x20000, CRC(6043f4eb) SHA1(1c2e9ace1cfdde504b7b6158e3c3f54dc5ae33d4) )
ROM_LOAD( "945_l11b.c20", 0x60000, 0x20000, CRC(89ea3baf) SHA1(8edcbaa7969185cfac48c02559826d1b8b081f3f) ) ROM_LOAD( "945_l11b.c20", 0x60000, 0x20000, CRC(89ea3baf) SHA1(8edcbaa7969185cfac48c02559826d1b8b081f3f) )
ROM_END ROM_END
ROM_START( gradius3a ) ROM_START( gradius3a )

2
src/mame/drivers/grchamp.c
View File

@ -91,7 +91,7 @@ void grchamp_state::machine_start()
save_item(NAME(m_collmode)); save_item(NAME(m_collmode));
} }
void grchamp_state::machine_reset() void grchamp_state::machine_reset()
{ {
/* if the coin system is 1 way, lock Coin B (Page 40) */ /* if the coin system is 1 way, lock Coin B (Page 40) */
coin_lockout_w(machine(), 1, (ioport("DSWB")->read() & 0x10) ? 1 : 0); coin_lockout_w(machine(), 1, (ioport("DSWB")->read() & 0x10) ? 1 : 0);

40
src/mame/drivers/megasys1.c
View File

@ -3280,9 +3280,9 @@ ROM_START( rodland )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_3.ROM3", 0x040000, 0x010000, CRC(62fdf6d7) SHA1(ffde7e7f5b3b548bc980b9dee767f693046ecab2) ) ROM_LOAD16_BYTE( "JALECO_ROD_LAND_3.ROM3", 0x040000, 0x010000, CRC(62fdf6d7) SHA1(ffde7e7f5b3b548bc980b9dee767f693046ecab2) )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_4.ROM4", 0x040001, 0x010000, CRC(44163c86) SHA1(1c56d79531af0312e7cd3dc66cf61b55dd1a6e51) ) ROM_LOAD16_BYTE( "JALECO_ROD_LAND_4.ROM4", 0x040001, 0x010000, CRC(44163c86) SHA1(1c56d79531af0312e7cd3dc66cf61b55dd1a6e51) )
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_REGION( 0x20000, "audiocpu", 0 ) /* Sound CPU Code */
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_5.ROM5", 0x000000, 0x010000, CRC(c1617c28) SHA1(1b3440055c083b74270fe06b5f42e7d1337efeca) ) ROM_LOAD16_BYTE( "JALECO_ROD_LAND_5.ROM5", 0x000000, 0x010000, CRC(c1617c28) SHA1(1b3440055c083b74270fe06b5f42e7d1337efeca) )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) ) ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */ ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) ) ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
@ -3319,7 +3319,7 @@ ROM_START( rodlandj )
ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) ) ROM_LOAD16_BYTE( "JALECO_ROD_LAND_6.ROM6", 0x000001, 0x010000, CRC(663392b2) SHA1(99052639e934d1ca18888c9c7fa061c1d3508fd4) )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */ ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) ) ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */ ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) ) ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) )
@ -3327,8 +3327,8 @@ ROM_START( rodlandj )
ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */ ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) ) ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) )
ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */ ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) ) ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */ ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) ) ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) )
@ -3354,23 +3354,23 @@ ROM_START( rodlandjb )
ROM_LOAD16_BYTE( "rl02.bin", 0x000000, 0x010000, CRC(d26eae8f) SHA1(1c6d514e6d006f78fa7b24d18a3eb4c5a4c5cbce) ) ROM_LOAD16_BYTE( "rl02.bin", 0x000000, 0x010000, CRC(d26eae8f) SHA1(1c6d514e6d006f78fa7b24d18a3eb4c5a4c5cbce) )
ROM_LOAD16_BYTE( "rl01.bin", 0x000001, 0x010000, CRC(04cf24bc) SHA1(e754cce3c83a7088daf90e753fbb0df9ef7fc9be) ) ROM_LOAD16_BYTE( "rl01.bin", 0x000001, 0x010000, CRC(04cf24bc) SHA1(e754cce3c83a7088daf90e753fbb0df9ef7fc9be) )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */ ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 */
ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) ) ROM_LOAD( "LH534H31.ROM14", 0x000000, 0x080000, CRC(8201e1bb) SHA1(3304100dcab7b67cee021869a50f4295c8635814) )
ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */ ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) ) ROM_LOAD( "LH534H32.ROM18", 0x000000, 0x080000, CRC(f3b30ca6) SHA1(f2f88c24a009b6695f7548aebd37b25d1fd19892) )
ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */ ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) ) ROM_LOAD( "LH2311J0.ROM19", 0x000000, 0x020000, CRC(124d7e8f) SHA1(d7885a10085cc3389bd0e26e9d54adb8929218c0) )
ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */ ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) ) ROM_LOAD( "LH534H33.ROM23", 0x000000, 0x080000, CRC(936db174) SHA1(4dfb2c31bc4bbf659184fe18e320d19f326b3ec5) )
ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */ ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) ) ROM_LOAD( "LH5321T5.ROM10", 0x000000, 0x040000, CRC(e1d1cd99) SHA1(6604111d37455c1bd59c1469d9ee7841e7dec913) )
ROM_REGION( 0x040000, "oki2", 0 ) /* Samples */ ROM_REGION( 0x040000, "oki2", 0 ) /* Samples */
ROM_LOAD( "S202000DR.ROM8", 0x000000, 0x040000, CRC(8a49d3a7) SHA1(68cb8cf2753b39c253d0edaa8ef2c54fd1f6ebe5) ) ROM_LOAD( "S202000DR.ROM8", 0x000000, 0x040000, CRC(8a49d3a7) SHA1(68cb8cf2753b39c253d0edaa8ef2c54fd1f6ebe5) )
ROM_REGION( 0x0200, "proms", 0 ) /* Priority PROM */ ROM_REGION( 0x0200, "proms", 0 ) /* Priority PROM */
ROM_LOAD( "PS89013A.M14", 0x0000, 0x0200, CRC(8914e72d) SHA1(80a664471f14c8ed8544a5e226fdca425ab3c657) ) ROM_LOAD( "PS89013A.M14", 0x0000, 0x0200, CRC(8914e72d) SHA1(80a664471f14c8ed8544a5e226fdca425ab3c657) )
@ -3991,8 +3991,8 @@ DRIVER_INIT_MEMBER(megasys1_state,phantasm)
DRIVER_INIT_MEMBER(megasys1_state,rodland) DRIVER_INIT_MEMBER(megasys1_state,rodland)
{ {
rodland_gfx_unmangle("gfx1"); rodland_gfx_unmangle("gfx1");
rodland_gfx_unmangle("gfx4"); rodland_gfx_unmangle("gfx4");
rodland_rom_decode(machine(), "maincpu"); rodland_rom_decode(machine(), "maincpu");
} }

4
src/mame/drivers/model3.c
View File

@ -5691,8 +5691,8 @@ DRIVER_INIT_MEMBER(model3_state,scud)
/* TODO: network device at 0xC0000000 - FF */ /* TODO: network device at 0xC0000000 - FF */
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this)); m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
// UINT32 *rom = (UINT32*)memregion("user1")->base(); // UINT32 *rom = (UINT32*)memregion("user1")->base();
// rom[(0x799de8^4)/4] = 0x00050208; // secret debug menu // rom[(0x799de8^4)/4] = 0x00050208; // secret debug menu
} }
DRIVER_INIT_MEMBER(model3_state,scudplus) DRIVER_INIT_MEMBER(model3_state,scudplus)

68
src/mame/drivers/paradise.c
View File

@ -848,55 +848,55 @@ ROM_START( paradise )
ROM_END ROM_END
ROM_START( paradisea ) ROM_START( paradisea )
ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */ ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
ROM_LOAD( "a-19.U128", 0x00000, 0x40000, CRC(d47ecb7e) SHA1(74e7a33f2fc4c7c830c53c50541c3d0efd152e98) ) ROM_LOAD( "a-19.U128", 0x00000, 0x40000, CRC(d47ecb7e) SHA1(74e7a33f2fc4c7c830c53c50541c3d0efd152e98) )
ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */ ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
ROM_LOAD( "a-19.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) ) ROM_LOAD( "a-19.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
ROM_LOAD( "a-19.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) ) ROM_LOAD( "a-19.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */ ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
ROM_LOAD( "a-19.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) ) ROM_LOAD( "a-19.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */ ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
ROM_LOAD( "a-19.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) ) ROM_LOAD( "a-19.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
ROM_LOAD( "a-19.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) ) ROM_LOAD( "a-19.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */ ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
ROM_LOAD( "a-19.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) ) ROM_LOAD( "a-19.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
ROM_LOAD( "a-19.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) ) ROM_LOAD( "a-19.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */ ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
ROM_LOAD( "a-19.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) ) ROM_LOAD( "a-19.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */ ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
ROM_LOAD( "a-19.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) ) ROM_LOAD( "a-19.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
ROM_END ROM_END
ROM_START( paradisee ) /* YS-1600 PCB. All labels are simply labeled "Escape" */ ROM_START( paradisee ) /* YS-1600 PCB. All labels are simply labeled "Escape" */
ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */ ROM_REGION( 0x40000, "maincpu", 0 ) /* Z80 Code */
ROM_LOAD( "escape.U128", 0x00000, 0x40000, CRC(19b4e854) SHA1(7d7292017df67b7ed3a3e0059334866890c58b83) ) ROM_LOAD( "escape.U128", 0x00000, 0x40000, CRC(19b4e854) SHA1(7d7292017df67b7ed3a3e0059334866890c58b83) )
ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */ ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT) /* 16x16x8 Sprites */
ROM_LOAD( "escape.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) ) ROM_LOAD( "escape.u114", 0x00000, 0x40000, CRC(c748ba3b) SHA1(ad23bda4e001ca539f849c1ca256de5daf7c233b) )
ROM_LOAD( "escape.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) ) ROM_LOAD( "escape.u115", 0x40000, 0x40000, CRC(0d517bbb) SHA1(5bf7c5036f3d660901e26f14baaea1a3c0327dfe) )
ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */ ROM_REGION( 0x20000, "gfx2", ROMREGION_INVERT) /* 8x8x4 Background */
ROM_LOAD( "escape.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) ) ROM_LOAD( "escape.u94", 0x00000, 0x20000, CRC(e3a99209) SHA1(5db79dc1a38d93b458b043499a58516285c65aa8) )
ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */ ROM_REGION( 0x100000, "gfx3", ROMREGION_INVERT) /* 8x8x8 Foreground */
ROM_LOAD( "escape.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) ) ROM_LOAD( "escape.u92", 0x00000, 0x80000, CRC(633d24f0) SHA1(26b25ec1014fba1a3d0d2bdba0c867c57034647d) )
ROM_LOAD( "escape.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) ) ROM_LOAD( "escape.u93", 0x80000, 0x80000, CRC(bbf5c632) SHA1(9d31e136f014c2dd7dd988c3aee0adfcfea91bc9) )
ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */ ROM_REGION( 0x40000, "gfx4", ROMREGION_INVERT) /* 8x8x8 Midground */
ROM_LOAD( "escape.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) ) ROM_LOAD( "escape.u110", 0x00000, 0x20000, CRC(9807a7e6) SHA1(30e2a741a93954cfe672c61c93a990d0c3b25145) )
ROM_LOAD( "escape.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) ) ROM_LOAD( "escape.u111", 0x20000, 0x20000, CRC(bc9f93f0) SHA1(dd4cfc849a0c0f918ac0dfeb7f00a67aae5a1c13) )
ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */ ROM_REGION( 0x40000, "oki1", 0 ) /* Samples */
ROM_LOAD( "escape.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) ) ROM_LOAD( "escape.u85", 0x00000, 0x40000, CRC(bf3c3065) SHA1(54dd7ffea2fb3f31ed575e982b82691cddc2581a) )
ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */ ROM_REGION( 0x80000, "oki2", 0 ) /* Samples (banked) */
ROM_LOAD( "escape.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) ) ROM_LOAD( "escape.u113", 0x00000, 0x80000, CRC(53de6025) SHA1(c94b3778b57ff7f46ce4cff661841019fb187d5d) )
ROM_END ROM_END
ROM_START( paradlx ) ROM_START( paradlx )

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

@ -1454,7 +1454,7 @@ static INPUT_PORTS_START( tahjong )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) // "COIN1", but not working PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 ) // "COIN1", but not working
PORT_START("DSW1") // port $10 PORT_START("DSW1") // port $10
PORT_DIPNAME( 0x07, 0x07, "SWB:1,2,3" ) PORT_DIPLOCATION("SWB:1,2,3") // only with bets on PORT_DIPNAME( 0x07, 0x07, "SWB:1,2,3" ) PORT_DIPLOCATION("SWB:1,2,3") // only with bets on
PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" ) PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x02, "2" )
@ -3605,8 +3605,8 @@ ROM_START( tahjong )
ROM_LOAD( "p2.bin", 0x01000, 0x1000, CRC(c33e3cc3) SHA1(707c437f180ddd2916b5806f208e0a478207d528) ) ROM_LOAD( "p2.bin", 0x01000, 0x1000, CRC(c33e3cc3) SHA1(707c437f180ddd2916b5806f208e0a478207d528) )
ROM_LOAD( "p3.bin", 0x02000, 0x1000, CRC(9e741a74) SHA1(6c8e8eb04331d48b72e2be270c13dbf8deb76005) ) ROM_LOAD( "p3.bin", 0x02000, 0x1000, CRC(9e741a74) SHA1(6c8e8eb04331d48b72e2be270c13dbf8deb76005) )
ROM_LOAD( "p4.bin", 0x03000, 0x1000, CRC(dc6ae62b) SHA1(d0c51047f734c885b7f19972c1bf0408199fde51) ) ROM_LOAD( "p4.bin", 0x03000, 0x1000, CRC(dc6ae62b) SHA1(d0c51047f734c885b7f19972c1bf0408199fde51) )
ROM_LOAD( "p5.bin", 0x04000, 0x1000, CRC(cc9123a3) SHA1(75276045247a0c9ac5810be01f3b58ad63101f9b) ) // same as royalmj (unused) ROM_LOAD( "p5.bin", 0x04000, 0x1000, CRC(cc9123a3) SHA1(75276045247a0c9ac5810be01f3b58ad63101f9b) ) // same as royalmj (unused)
ROM_LOAD( "p6.bin", 0x05000, 0x1000, CRC(92150a0f) SHA1(5c97ba5014abdba4afc78e02e7d90e6ca4d777ac) ) // "" ROM_LOAD( "p6.bin", 0x05000, 0x1000, CRC(92150a0f) SHA1(5c97ba5014abdba4afc78e02e7d90e6ca4d777ac) ) // ""
ROM_LOAD( "s1.bin", 0x10000, 0x4000, CRC(beff21af) SHA1(4dc40a1ac4e36401b1ad8ae3954af6e5001e0a67) ) ROM_LOAD( "s1.bin", 0x10000, 0x4000, CRC(beff21af) SHA1(4dc40a1ac4e36401b1ad8ae3954af6e5001e0a67) )
ROM_LOAD( "s2.bin", 0x14000, 0x4000, CRC(fed42e7c) SHA1(31136dff07bd1883dc2d107823ba83a34abf003d) ) ROM_LOAD( "s2.bin", 0x14000, 0x4000, CRC(fed42e7c) SHA1(31136dff07bd1883dc2d107823ba83a34abf003d) )

2
src/mame/drivers/segam1.c
View File

@ -76,7 +76,7 @@ static MACHINE_CONFIG_START( segam1, segam1_state )
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
MCFG_CPU_PROGRAM_MAP(segam1_map) MCFG_CPU_PROGRAM_MAP(segam1_map)
// MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq1_line_hold) // MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq1_line_hold)
MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_ADD("screen", RASTER)

49
src/mame/drivers/segas32.c
View File

@ -9,10 +9,10 @@
Still to do: Still to do:
* fix protection * fix protection
* fix jpark correctly * fix jpark correctly
* priorities in multi32 appear wrong - stadium cross map screen * priorities in multi32 appear wrong - stadium cross map screen
and title fight ingame backgrounds and title fight ingame backgrounds
* should f1lap be set up as a twin cabinet / direct link or can it * should f1lap be set up as a twin cabinet / direct link or can it
be operated as a single screen, unlike f1en/air rescue be operated as a single screen, unlike f1en/air rescue
**************************************************************************** ****************************************************************************
@ -5096,26 +5096,26 @@ READ16_MEMBER(segas32_new_state::dual_pcb_slave)
DRIVER_INIT_MEMBER(segas32_new_state,titlef) { m_mainpcb->init_titlef(); } DRIVER_INIT_MEMBER(segas32_new_state,titlef) { m_mainpcb->init_titlef(); }
DRIVER_INIT_MEMBER(segas32_new_state,slipstrm) { m_mainpcb->init_slipstrm(); } DRIVER_INIT_MEMBER(segas32_new_state,slipstrm) { m_mainpcb->init_slipstrm(); }
DRIVER_INIT_MEMBER(segas32_new_state,radm) { m_mainpcb->init_radm(); } DRIVER_INIT_MEMBER(segas32_new_state,radm) { m_mainpcb->init_radm(); }
DRIVER_INIT_MEMBER(segas32_new_state,holo) { m_mainpcb->init_holo(); } DRIVER_INIT_MEMBER(segas32_new_state,holo) { m_mainpcb->init_holo(); }
DRIVER_INIT_MEMBER(segas32_new_state,svf) { m_mainpcb->init_svf(); } DRIVER_INIT_MEMBER(segas32_new_state,svf) { m_mainpcb->init_svf(); }
DRIVER_INIT_MEMBER(segas32_new_state,jleague) { m_mainpcb->init_jleague(); } DRIVER_INIT_MEMBER(segas32_new_state,jleague) { m_mainpcb->init_jleague(); }
DRIVER_INIT_MEMBER(segas32_new_state,jpark) { m_mainpcb->init_jpark(); } DRIVER_INIT_MEMBER(segas32_new_state,jpark) { m_mainpcb->init_jpark(); }
DRIVER_INIT_MEMBER(segas32_new_state,ga2) { m_mainpcb->init_ga2(); } DRIVER_INIT_MEMBER(segas32_new_state,ga2) { m_mainpcb->init_ga2(); }
DRIVER_INIT_MEMBER(segas32_new_state,scross) { m_mainpcb->init_scross(); } DRIVER_INIT_MEMBER(segas32_new_state,scross) { m_mainpcb->init_scross(); }
DRIVER_INIT_MEMBER(segas32_new_state,spidman) { m_mainpcb->init_spidman(); } DRIVER_INIT_MEMBER(segas32_new_state,spidman) { m_mainpcb->init_spidman(); }
DRIVER_INIT_MEMBER(segas32_new_state,sonicp) { m_mainpcb->init_sonicp(); } DRIVER_INIT_MEMBER(segas32_new_state,sonicp) { m_mainpcb->init_sonicp(); }
DRIVER_INIT_MEMBER(segas32_new_state,dbzvrvs) { m_mainpcb->init_dbzvrvs(); } DRIVER_INIT_MEMBER(segas32_new_state,dbzvrvs) { m_mainpcb->init_dbzvrvs(); }
DRIVER_INIT_MEMBER(segas32_new_state,brival) { m_mainpcb->init_brival(); } DRIVER_INIT_MEMBER(segas32_new_state,brival) { m_mainpcb->init_brival(); }
DRIVER_INIT_MEMBER(segas32_new_state,harddunk) { m_mainpcb->init_harddunk(); } DRIVER_INIT_MEMBER(segas32_new_state,harddunk) { m_mainpcb->init_harddunk(); }
DRIVER_INIT_MEMBER(segas32_new_state,arabfgt) { m_mainpcb->init_arabfgt(); } DRIVER_INIT_MEMBER(segas32_new_state,arabfgt) { m_mainpcb->init_arabfgt(); }
DRIVER_INIT_MEMBER(segas32_new_state,sonic) { m_mainpcb->init_sonic(); } DRIVER_INIT_MEMBER(segas32_new_state,sonic) { m_mainpcb->init_sonic(); }
DRIVER_INIT_MEMBER(segas32_new_state,alien3) { m_mainpcb->init_alien3(); } DRIVER_INIT_MEMBER(segas32_new_state,alien3) { m_mainpcb->init_alien3(); }
DRIVER_INIT_MEMBER(segas32_new_state,darkedge) { m_mainpcb->init_darkedge(); } DRIVER_INIT_MEMBER(segas32_new_state,darkedge) { m_mainpcb->init_darkedge(); }
DRIVER_INIT_MEMBER(segas32_new_state,radr) { m_mainpcb->init_radr(); } DRIVER_INIT_MEMBER(segas32_new_state,radr) { m_mainpcb->init_radr(); }
DRIVER_INIT_MEMBER(segas32_new_state,orunners) { m_mainpcb->init_orunners(); } DRIVER_INIT_MEMBER(segas32_new_state,orunners) { m_mainpcb->init_orunners(); }
DRIVER_INIT_MEMBER(segas32_new_state, arescue) DRIVER_INIT_MEMBER(segas32_new_state, arescue)
{ {
@ -5131,7 +5131,6 @@ DRIVER_INIT_MEMBER(segas32_new_state, arescue)
} }
DRIVER_INIT_MEMBER(segas32_new_state,f1en) { DRIVER_INIT_MEMBER(segas32_new_state,f1en) {
m_mainpcb->init_f1en(); m_mainpcb->init_f1en();
m_slavepcb->init_f1en(); m_slavepcb->init_f1en();

54
src/mame/drivers/seta.c
View File

@ -10843,44 +10843,44 @@ ROM_END
same factory as normal boards same as daiohc. Modified layout allowing same factory as normal boards same as daiohc. Modified layout allowing
split ROMs */ split ROMs */
ROM_START( gundharac ) ROM_START( gundharac )
ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 Code */ ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 Code */
ROM_LOAD16_BYTE( "4.U3", 0x000000, 0x080000, CRC(14e9970a) SHA1(31964bd290cc94c40684adf3a5d129b1c3addc3b) ) ROM_LOAD16_BYTE( "4.U3", 0x000000, 0x080000, CRC(14e9970a) SHA1(31964bd290cc94c40684adf3a5d129b1c3addc3b) )
ROM_LOAD16_BYTE( "2.U4", 0x000001, 0x080000, CRC(96dfc658) SHA1(f570bc49758535eb00d93ecce9f75832f97a0d8d) ) ROM_LOAD16_BYTE( "2.U4", 0x000001, 0x080000, CRC(96dfc658) SHA1(f570bc49758535eb00d93ecce9f75832f97a0d8d) )
ROM_LOAD16_BYTE( "3.U103", 0x100000, 0x080000, CRC(312f58e2) SHA1(a74819d2f84a00c233489893f12c9ab1a98459cf) ) ROM_LOAD16_BYTE( "3.U103", 0x100000, 0x080000, CRC(312f58e2) SHA1(a74819d2f84a00c233489893f12c9ab1a98459cf) )
ROM_LOAD16_BYTE( "1.U102", 0x100001, 0x080000, CRC(8d23a23c) SHA1(9e9a6488db424c81a97edcb7115cc070fe35c077) ) ROM_LOAD16_BYTE( "1.U102", 0x100001, 0x080000, CRC(8d23a23c) SHA1(9e9a6488db424c81a97edcb7115cc070fe35c077) )
ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */ ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */
ROM_LOAD16_BYTE( "19.U140", 0x000000, 0x080000, CRC(32d92c28) SHA1(7ba67f715f094aacf2dc2399809e4dfc7e4ca241) ) ROM_LOAD16_BYTE( "19.U140", 0x000000, 0x080000, CRC(32d92c28) SHA1(7ba67f715f094aacf2dc2399809e4dfc7e4ca241) )
ROM_LOAD16_BYTE( "23.U142", 0x000001, 0x080000, CRC(ff44db9b) SHA1(76ecd3ce3b6b33f3ae0b0454d58cf37d545dd72c) ) ROM_LOAD16_BYTE( "23.U142", 0x000001, 0x080000, CRC(ff44db9b) SHA1(76ecd3ce3b6b33f3ae0b0454d58cf37d545dd72c) )
ROM_LOAD16_BYTE( "21.U141", 0x100000, 0x080000, CRC(1901dc08) SHA1(b19428a7510d6e28a39bdf6ecc9732e3c2d19214) ) ROM_LOAD16_BYTE( "21.U141", 0x100000, 0x080000, CRC(1901dc08) SHA1(b19428a7510d6e28a39bdf6ecc9732e3c2d19214) )
ROM_LOAD16_BYTE( "25.U143", 0x100001, 0x080000, CRC(877289a2) SHA1(7482320e319d7b641fabba5aeeaa1237b693a219) ) ROM_LOAD16_BYTE( "25.U143", 0x100001, 0x080000, CRC(877289a2) SHA1(7482320e319d7b641fabba5aeeaa1237b693a219) )
ROM_LOAD16_BYTE( "18.U140-B", 0x200000, 0x080000, CRC(4f023fb0) SHA1(815765c9783e44762bf57a3fbfad4385c316343a) ) ROM_LOAD16_BYTE( "18.U140-B", 0x200000, 0x080000, CRC(4f023fb0) SHA1(815765c9783e44762bf57a3fbfad4385c316343a) )
ROM_LOAD16_BYTE( "22.U142-B", 0x200001, 0x080000, CRC(6f3fe7e7) SHA1(71bc347c06678f4ae7850799da6346c6447bf3c0) ) ROM_LOAD16_BYTE( "22.U142-B", 0x200001, 0x080000, CRC(6f3fe7e7) SHA1(71bc347c06678f4ae7850799da6346c6447bf3c0) )
ROM_LOAD16_BYTE( "20.U141-B", 0x300000, 0x080000, CRC(7f1932e0) SHA1(13262a7322ad29cf7c85461204a3518e900c6145) ) ROM_LOAD16_BYTE( "20.U141-B", 0x300000, 0x080000, CRC(7f1932e0) SHA1(13262a7322ad29cf7c85461204a3518e900c6145) )
ROM_LOAD16_BYTE( "24.U143-B", 0x300001, 0x080000, CRC(066a2e2b) SHA1(186729918a89535484ab86dd58caf20ccce81501) ) ROM_LOAD16_BYTE( "24.U143-B", 0x300001, 0x080000, CRC(066a2e2b) SHA1(186729918a89535484ab86dd58caf20ccce81501) )
ROM_LOAD16_BYTE( "9.U144", 0x400000, 0x080000, CRC(6b4a531f) SHA1(701d6b2d87a742c8a2ab36331bd843dcd3309eae) ) ROM_LOAD16_BYTE( "9.U144", 0x400000, 0x080000, CRC(6b4a531f) SHA1(701d6b2d87a742c8a2ab36331bd843dcd3309eae) )
ROM_LOAD16_BYTE( "13.U146", 0x400001, 0x080000, CRC(45be3df4) SHA1(36667bf5e4b80d17a9d7b6ce4df7498f94681c46) ) ROM_LOAD16_BYTE( "13.U146", 0x400001, 0x080000, CRC(45be3df4) SHA1(36667bf5e4b80d17a9d7b6ce4df7498f94681c46) )
ROM_LOAD16_BYTE( "11.U145", 0x500000, 0x080000, CRC(f5210aa5) SHA1(4834d905f699dbec1cdacea6b320271c291aa2a7) ) ROM_LOAD16_BYTE( "11.U145", 0x500000, 0x080000, CRC(f5210aa5) SHA1(4834d905f699dbec1cdacea6b320271c291aa2a7) )
ROM_LOAD16_BYTE( "15.U147", 0x500001, 0x080000, CRC(17003119) SHA1(a2edd65c98bc654b541dad3e3783d90931c97597) ) ROM_LOAD16_BYTE( "15.U147", 0x500001, 0x080000, CRC(17003119) SHA1(a2edd65c98bc654b541dad3e3783d90931c97597) )
ROM_LOAD16_BYTE( "8.U144-B", 0x600000, 0x080000, CRC(ad9d9338) SHA1(33d6c881a20e2150017cc26f929473291e561718) ) ROM_LOAD16_BYTE( "8.U144-B", 0x600000, 0x080000, CRC(ad9d9338) SHA1(33d6c881a20e2150017cc26f929473291e561718) )
ROM_LOAD16_BYTE( "12.U146-B", 0x600001, 0x080000, CRC(0fd4c062) SHA1(7f418d43d9ba884c504f6fe3c04b11724412ac6b) ) ROM_LOAD16_BYTE( "12.U146-B", 0x600001, 0x080000, CRC(0fd4c062) SHA1(7f418d43d9ba884c504f6fe3c04b11724412ac6b) )
ROM_LOAD16_BYTE( "10.U145-B", 0x700000, 0x080000, CRC(7c5d12b9) SHA1(6ee45c4da6994540852153752e2818a8ea8ecf1a) ) ROM_LOAD16_BYTE( "10.U145-B", 0x700000, 0x080000, CRC(7c5d12b9) SHA1(6ee45c4da6994540852153752e2818a8ea8ecf1a) )
ROM_LOAD16_BYTE( "14.U147-B", 0x700001, 0x080000, CRC(5a8af50f) SHA1(3b7937ba720fcbbc5e29c1b95a97c29e8ff5490a) ) ROM_LOAD16_BYTE( "14.U147-B", 0x700001, 0x080000, CRC(5a8af50f) SHA1(3b7937ba720fcbbc5e29c1b95a97c29e8ff5490a) )
ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */ ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */
ROM_LOAD16_BYTE( "5.U148", 0x000000, 0x080000, CRC(0c740f9b) SHA1(f6d135c3318ff0d50d40921aa108b1b332c1a086) ) ROM_LOAD16_BYTE( "5.U148", 0x000000, 0x080000, CRC(0c740f9b) SHA1(f6d135c3318ff0d50d40921aa108b1b332c1a086) )
ROM_LOAD16_BYTE( "6.U150", 0x000001, 0x080000, CRC(ba60eb98) SHA1(7204269816332bbb3401d9f20a513372ffe78500) ) ROM_LOAD16_BYTE( "6.U150", 0x000001, 0x080000, CRC(ba60eb98) SHA1(7204269816332bbb3401d9f20a513372ffe78500) )
ROM_LOAD16_BYTE( "7.U154", 0x100000, 0x080000, CRC(b768e666) SHA1(473fa52c16c0a9f321e6429947a3e0fc1ef22f7e) ) ROM_LOAD16_BYTE( "7.U154", 0x100000, 0x080000, CRC(b768e666) SHA1(473fa52c16c0a9f321e6429947a3e0fc1ef22f7e) )
ROM_REGION( 0x400000, "gfx3", 0 ) /* Layer 2 */ ROM_REGION( 0x400000, "gfx3", 0 ) /* Layer 2 */
ROM_LOAD16_BYTE( "26.U164", 0x000000, 0x080000, CRC(be3ccaba) SHA1(98f8b83cbed00932866375d21f86ee5c9bddb2a6) ) ROM_LOAD16_BYTE( "26.U164", 0x000000, 0x080000, CRC(be3ccaba) SHA1(98f8b83cbed00932866375d21f86ee5c9bddb2a6) )
ROM_LOAD16_BYTE( "28.U166", 0x000001, 0x080000, CRC(8a650a4e) SHA1(1f6eda27b39ad052e3d9a8a72cb0a072e7be4487) ) ROM_LOAD16_BYTE( "28.U166", 0x000001, 0x080000, CRC(8a650a4e) SHA1(1f6eda27b39ad052e3d9a8a72cb0a072e7be4487) )
ROM_LOAD16_BYTE( "27.U165", 0x100000, 0x080000, CRC(47994ff0) SHA1(25211a9af01f77788578bb524619d95b5b86e241) ) ROM_LOAD16_BYTE( "27.U165", 0x100000, 0x080000, CRC(47994ff0) SHA1(25211a9af01f77788578bb524619d95b5b86e241) )
ROM_LOAD16_BYTE( "29.U167", 0x100001, 0x080000, CRC(453c3d3f) SHA1(151528b6b1e7f8c059d67dbaca61e7c382e9ce04) ) ROM_LOAD16_BYTE( "29.U167", 0x100001, 0x080000, CRC(453c3d3f) SHA1(151528b6b1e7f8c059d67dbaca61e7c382e9ce04) )
ROM_LOAD16_BYTE( "16.U152", 0x200000, 0x080000, CRC(5ccc500b) SHA1(d3a2a5658cac8d788e0a1189c184309b8394b10a) ) ROM_LOAD16_BYTE( "16.U152", 0x200000, 0x080000, CRC(5ccc500b) SHA1(d3a2a5658cac8d788e0a1189c184309b8394b10a) )
ROM_LOAD16_BYTE( "17.U153", 0x300000, 0x080000, CRC(5586d086) SHA1(e43d5e8834701f40389400f68a99353e67598f6d) ) ROM_LOAD16_BYTE( "17.U153", 0x300000, 0x080000, CRC(5586d086) SHA1(e43d5e8834701f40389400f68a99353e67598f6d) )
ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */ ROM_REGION( 0x100000, "x1snd", 0 ) /* Samples */
ROM_LOAD( "30.U69", 0x000000, 0x080000, CRC(3111a98a) SHA1(75e17a0113060a10551b2b8c17b19890eb7aa0a6) ) ROM_LOAD( "30.U69", 0x000000, 0x080000, CRC(3111a98a) SHA1(75e17a0113060a10551b2b8c17b19890eb7aa0a6) )
ROM_LOAD( "31.U70", 0x080000, 0x080000, CRC(30cb2524) SHA1(85deb83262bbe481404705e163e5eb9362985b01) ) ROM_LOAD( "31.U70", 0x080000, 0x080000, CRC(30cb2524) SHA1(85deb83262bbe481404705e163e5eb9362985b01) )
ROM_END ROM_END

100
src/mame/drivers/sidearms.c
View File

@ -1002,69 +1002,69 @@ ROM_START( turtshipk )
ROM_END ROM_END
ROM_START( turtshipko ) ROM_START( turtshipko )
ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */ ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(cd789535) SHA1(3c4f94c751645b61066177fbf3157924ad177c32) ) ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(cd789535) SHA1(3c4f94c751645b61066177fbf3157924ad177c32) )
ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(253678c0) SHA1(1470fd936003462d480c759658628ea085d4bd71) ) ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(253678c0) SHA1(1470fd936003462d480c759658628ea085d4bd71) )
ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(d6fdc376) SHA1(3f4e1fde8b83e3762f9499dfe291309efe940093) ) ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(d6fdc376) SHA1(3f4e1fde8b83e3762f9499dfe291309efe940093) )
ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) ) ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
ROM_REGION( 0x04000, "gfx1", 0 ) ROM_REGION( 0x04000, "gfx1", 0 )
ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(35c3dbc5) SHA1(6700c72e5e0f7bd1429d342cb5d3daccd6b1b70f) ) /* characters */ ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(35c3dbc5) SHA1(6700c72e5e0f7bd1429d342cb5d3daccd6b1b70f) ) /* characters */
ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */ ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
ROM_REGION( 0x80000, "gfx2", 0 ) ROM_REGION( 0x80000, "gfx2", 0 )
ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */ ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) ) ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
ROM_RELOAD( 0x30000, 0x10000) ROM_RELOAD( 0x30000, 0x10000)
ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) ) ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) ) ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) ) ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
ROM_RELOAD( 0x70000, 0x10000) ROM_RELOAD( 0x70000, 0x10000)
ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) ) ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
ROM_REGION( 0x40000, "gfx3", 0 ) ROM_REGION( 0x40000, "gfx3", 0 )
ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */ ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(775ee5d9) SHA1(e39eb558cc2d5cdf4c87b96f85af72e5600b995e) ) ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(775ee5d9) SHA1(e39eb558cc2d5cdf4c87b96f85af72e5600b995e) )
ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) ) ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(a30e3346) SHA1(150a837fb5d4705df9e8e9a94f78cff0e1c57d64) ) ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(a30e3346) SHA1(150a837fb5d4705df9e8e9a94f78cff0e1c57d64) )
ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */ ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) ) ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
ROM_END ROM_END
ROM_START( turtshipkn ) ROM_START( turtshipkn )
ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */ ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + banked ROMs images */
ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(529b091c) SHA1(9a3a885dbf1f9d3c3c326418efdcb4f6f96eb4ae) ) ROM_LOAD( "T-3.G5", 0x00000, 0x08000, CRC(529b091c) SHA1(9a3a885dbf1f9d3c3c326418efdcb4f6f96eb4ae) )
ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(d2f30195) SHA1(d64f088ed776658563943e8cde086842d0d899f8) ) ROM_LOAD( "T-2.G3", 0x08000, 0x08000, CRC(d2f30195) SHA1(d64f088ed776658563943e8cde086842d0d899f8) )
ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(2d02da90) SHA1(5cf059e04e145861f9877cefa2c7168e6ded19ac) ) ROM_LOAD( "T-1.E3", 0x10000, 0x08000, CRC(2d02da90) SHA1(5cf059e04e145861f9877cefa2c7168e6ded19ac) )
ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_REGION( 0x10000, "audiocpu", 0 )
ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) ) ROM_LOAD( "T-4.A8", 0x00000, 0x08000, CRC(1cbe48e8) SHA1(6ac5981d36a44595bb8dc847c54c7be7b374f82c) )
ROM_REGION( 0x04000, "gfx1", 0 ) ROM_REGION( 0x04000, "gfx1", 0 )
ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(5c2ee02d) SHA1(c8d3dbdaab943c1639795915cf275951501a2a77) ) /* characters */ ROM_LOAD( "T-5.K8", 0x00000, 0x04000, CRC(5c2ee02d) SHA1(c8d3dbdaab943c1639795915cf275951501a2a77) ) /* characters */
ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */ ROM_CONTINUE( 0x00000, 0x04000 ) /* A14 tied high, only upper half is used */
ROM_REGION( 0x80000, "gfx2", 0 ) ROM_REGION( 0x80000, "gfx2", 0 )
ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */ ROM_LOAD( "T-8.D1", 0x00000, 0x10000, CRC(2f0b2336) SHA1(a869e0a50aab7d29afbca46fa04bd470488a8eeb) ) /* tiles */
ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) ) ROM_LOAD( "T-10.C3", 0x10000, 0x10000, CRC(6a0072f4) SHA1(d74b53ed90a4d01020a179f263a39b7547b8f82e) )
ROM_RELOAD( 0x30000, 0x10000) ROM_RELOAD( 0x30000, 0x10000)
ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) ) ROM_LOAD( "T-11.D3", 0x20000, 0x10000, CRC(53da6cb1) SHA1(52720746298adb01828f959f81b385d268c94343) )
ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) ) ROM_LOAD( "T-6.A1", 0x40000, 0x10000, CRC(a7cce654) SHA1(f6c99622dcacc1d76021ca29b0bbceefbb75c499) )
ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) ) ROM_LOAD( "T-7.C1", 0x50000, 0x10000, CRC(90dd8415) SHA1(8e9d43ff9164fb287ab82df7da8890976b9d21c7) )
ROM_RELOAD( 0x70000, 0x10000) ROM_RELOAD( 0x70000, 0x10000)
ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) ) ROM_LOAD( "T-9.A3", 0x60000, 0x10000, CRC(44762916) SHA1(3427066fc02d1b9b71a59ac41d3332d5cd8d1423) )
ROM_REGION( 0x40000, "gfx3", 0 ) ROM_REGION( 0x40000, "gfx3", 0 )
ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */ ROM_LOAD( "T-13.I1", 0x00000, 0x10000, CRC(1cc87f50) SHA1(d7d8a4376b556675dafa0a407bb34b6017f17e7d) ) /* sprites */
ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(3bf91fb8) SHA1(1c8368dc8d52c3c48a85391f00c91a80fa5d781d) ) ROM_LOAD( "T-15.I3", 0x10000, 0x10000, CRC(3bf91fb8) SHA1(1c8368dc8d52c3c48a85391f00c91a80fa5d781d) )
ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) ) ROM_LOAD( "T-12.G1", 0x20000, 0x10000, CRC(57783312) SHA1(57942e8c3b7be63ea62bae3c104cb2842eb6b755) )
ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(ee162dc0) SHA1(127b3cb3ddd47aa8ee70cad2d54b1306ad8f10e8) ) ROM_LOAD( "T-14.G3", 0x30000, 0x10000, CRC(ee162dc0) SHA1(127b3cb3ddd47aa8ee70cad2d54b1306ad8f10e8) )
ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */ ROM_REGION( 0x08000, "gfx4", 0 ) /* background tilemaps */
ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) ) ROM_LOAD( "T-16.F9", 0x00000, 0x08000, CRC(9b377277) SHA1(4858560e35144727aea958023f3df785baa994a8) )
ROM_END ROM_END

2
src/mame/drivers/suna8.c
View File

@ -2165,7 +2165,7 @@ static MACHINE_CONFIG_START( sparkman, suna8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w)) // two sample roms MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w)) // two sample roms
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)

2
src/mame/drivers/vamphalf.c
View File

@ -458,7 +458,7 @@ static ADDRESS_MAP_START( misncrft_io, AS_IO, 16, vamphalf_state )
ADDRESS_MAP_END ADDRESS_MAP_END
static ADDRESS_MAP_START( coolmini_io, AS_IO, 16, vamphalf_state ) static ADDRESS_MAP_START( coolmini_io, AS_IO, 16, vamphalf_state )
// AM_RANGE(0x002, 0x003) AM_WRITE(mrkicker_oki_bank_w) // not coolmini?, installed on init // AM_RANGE(0x002, 0x003) AM_WRITE(mrkicker_oki_bank_w) // not coolmini?, installed on init
AM_RANGE(0x200, 0x203) AM_WRITE(flipscreen_w) AM_RANGE(0x200, 0x203) AM_WRITE(flipscreen_w)
AM_RANGE(0x300, 0x303) AM_READ_PORT("SYSTEM") AM_RANGE(0x300, 0x303) AM_READ_PORT("SYSTEM")
AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2") AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2")

1
src/mame/etc/doxy_driver.h
View File

@ -37,4 +37,3 @@
@sa http://www.stack.nl/~dimitri/doxygen/manual/commands.html @sa http://www.stack.nl/~dimitri/doxygen/manual/commands.html
@todo needs discussion for accepted standardized syntax @todo needs discussion for accepted standardized syntax
*/ */

2
src/mame/includes/ladybug.h
View File

@ -22,7 +22,7 @@ public:
m_palette(*this, "palette"), m_palette(*this, "palette"),
m_port_dsw0(*this, "DSW0"), m_port_dsw0(*this, "DSW0"),
m_p1_control(*this, "CONTP1"), m_p1_control(*this, "CONTP1"),
m_p2_control(*this, "CONTP2") { } m_p2_control(*this, "CONTP2") { }
/* memory pointers */ /* memory pointers */
required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram;

3
src/mame/includes/segas32.h
View File

@ -269,7 +269,7 @@ public:
protected: protected:
virtual machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
// virtual void device_start(); // virtual void device_start();
// virtual void device_reset(); // virtual void device_reset();
}; };
@ -299,4 +299,3 @@ protected:
extern const UINT8 ga2_v25_opcode_table[]; extern const UINT8 ga2_v25_opcode_table[];
extern const device_type SEGA_S32_PCB; extern const device_type SEGA_S32_PCB;

14
src/mame/machine/m1comm.h
View File

@ -57,7 +57,7 @@ public:
DECLARE_READ8_MEMBER(fg_r); DECLARE_READ8_MEMBER(fg_r);
DECLARE_WRITE8_MEMBER(fg_w); DECLARE_WRITE8_MEMBER(fg_w);
// IRQ logic - 5 = VINT, 7 = DLC // IRQ logic - 5 = VINT, 7 = DLC
void check_vint_irq(); void check_vint_irq();
protected: protected:
@ -68,12 +68,12 @@ protected:
private: private:
UINT8 m_shared[0x1000]; // 2x 2k = 4k; model1 accesses this with 16bit data and 11bit address (A0 to A10) UINT8 m_shared[0x1000]; // 2x 2k = 4k; model1 accesses this with 16bit data and 11bit address (A0 to A10)
UINT8 m_dlc_reg[0x20]; // MB89374 registers UINT8 m_dlc_reg[0x20]; // MB89374 registers
UINT8 m_dma_reg[0x20]; // MB89237A registers UINT8 m_dma_reg[0x20]; // MB89237A registers
UINT8 m_syn; // bit0 is stored; purpose unknown, bit1 is used to enable/disable VINT/IRQ5 UINT8 m_syn; // bit0 is stored; purpose unknown, bit1 is used to enable/disable VINT/IRQ5
UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored UINT8 m_zfg; // z80 flip gate? purpose unknown, bit0 is stored
UINT8 m_cn; // bit0 is used to enable/disable the comm board UINT8 m_cn; // bit0 is used to enable/disable the comm board
UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0 UINT8 m_fg; // flip gate? purpose unknown, bit0 is stored, bit7 is connected to ZFG bit 0
emu_file m_line_rx; // rx line - can be either differential, simple serial or toslink emu_file m_line_rx; // rx line - can be either differential, simple serial or toslink
emu_file m_line_tx; // tx line - is differential, simple serial and toslink emu_file m_line_tx; // tx line - is differential, simple serial and toslink

1
src/mame/nl.lst
View File

@ -29,4 +29,3 @@ pong // (c) 1972 Atari
pongd // (c) 1975 Atari pongd // (c) 1975 Atari
pongf // (c) 1972 Atari pongf // (c) 1972 Atari
breakout // (c) 1976 Atari breakout // (c) 1976 Atari

Some files were not shown because too many files have changed in this diff Show More