summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/apexc/apexcdsm.c12
-rw-r--r--src/emu/cpu/mcs48/mcs48.h4
-rw-r--r--src/emu/cpu/mn10200/mn10200.c170
-rw-r--r--src/emu/cpu/mn10200/mn10200.h2
-rw-r--r--src/emu/cpu/mn10200/mn102dis.c2
-rw-r--r--src/emu/debugint/debugint.c14
-rw-r--r--src/emu/driver.h2
-rw-r--r--src/emu/drivers/xtal.h2
-rw-r--r--src/emu/emuopts.c6
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/machine/i8255a.c4
-rw-r--r--src/emu/sound/zsg2.c28
-rw-r--r--src/emu/sound/zsg2.h2
-rw-r--r--src/emu/ui.c6
-rw-r--r--src/emu/uimenu.c4
-rw-r--r--src/emu/validity.c34
-rw-r--r--src/emu/video/hd63484.c4
17 files changed, 150 insertions, 150 deletions
diff --git a/src/emu/cpu/apexc/apexcdsm.c b/src/emu/cpu/apexc/apexcdsm.c
index ad210469d36..f6a9a2c4c89 100644
--- a/src/emu/cpu/apexc/apexcdsm.c
+++ b/src/emu/cpu/apexc/apexcdsm.c
@@ -52,14 +52,14 @@
For vector instructions, replace the first space on the right of the mnemonic
with a 'v'.
- 01-Feb-2010 (Robbbert):
- I've added the actual address, (as shown in the extreme left of the debugger
- output), so that you can see much easier how the program will flow. Example:
+ 01-Feb-2010 (Robbbert):
+ I've added the actual address, (as shown in the extreme left of the debugger
+ output), so that you can see much easier how the program will flow. Example:
- +C XXX(##/##) XXX(##/##)
+ +C XXX(##/##) XXX(##/##)
- The X value shows where the data word is located, and the Y value is the
- address of the next instruction.
+ The X value shows where the data word is located, and the Y value is the
+ address of the next instruction.
*/
enum _format_type {branch, shiftl, shiftr, multiply, store, swap, one_address, two_address};
typedef enum _format_type format_type;
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h
index 8a586bb951c..347c4b069d9 100644
--- a/src/emu/cpu/mcs48/mcs48.h
+++ b/src/emu/cpu/mcs48/mcs48.h
@@ -116,8 +116,8 @@ enum
***************************************************************************/
/* Official Intel MCS-48 parts */
-CPU_GET_INFO( i8021 ); /* 1k internal ROM, 64 bytes internal RAM */
-CPU_GET_INFO( i8022 ); /* 2k internal ROM, 128 bytes internal RAM */
+CPU_GET_INFO( i8021 ); /* 1k internal ROM, 64 bytes internal RAM */
+CPU_GET_INFO( i8022 ); /* 2k internal ROM, 128 bytes internal RAM */
CPU_GET_INFO( i8035 ); /* external ROM, 64 bytes internal RAM */
CPU_GET_INFO( i8048 ); /* 1k internal ROM, 64 bytes internal RAM */
CPU_GET_INFO( i8648 ); /* 1k internal OTP ROM, 64 bytes internal RAM */
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 45fbe9b2e18..a38b9431d6a 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -2,7 +2,7 @@
Panasonic MN10200 emulator
Written by Olivier Galibert
- MAME conversion by R. Belmont
+ MAME conversion by R. Belmont
*/
@@ -167,7 +167,7 @@ static void unemul(mn102_info *mn102)
INLINE INT32 r24u(mn102_info *mn102, offs_t adr)
{
return mn102_read_word(mn102, adr)|(mn102_read_byte(mn102, adr+2)<<16);
-}
+}
INLINE void w24(mn102_info *mn102, offs_t adr, UINT32 val)
{
@@ -330,7 +330,7 @@ INLINE void do_jsr(mn102_info *mn102, UINT32 to, UINT32 ret)
void mn102_force_irq(mn102_info *mn102, int level, int group, int entry)
{
- if(!(mn102->psw & 0x800))
+ if(!(mn102->psw & 0x800))
{
if(group != 1 || entry != 3)
log_event("MN102", "Dropping irq %d %d %d, pc=%x, a3=%x", level, group, entry, mn102->pc, mn102->a[3]);
@@ -355,7 +355,7 @@ static CPU_EXECUTE(mn10200)
mn102->cycles = cycles;
- while(mn102->cycles > 0)
+ while(mn102->cycles > 0)
{
UINT8 opcode;
@@ -366,7 +366,7 @@ static CPU_EXECUTE(mn10200)
// mov dm, (an)
case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07:
case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x0c: case 0x0d: case 0x0e: case 0x0f:
- mn102->cycles -= 1;
+ mn102->cycles -= 1;
mn102_write_word(mn102, mn102->a[(opcode>>2)&3], (UINT16)mn102->d[opcode & 3]);
mn102->pc += 1;
break;
@@ -374,7 +374,7 @@ static CPU_EXECUTE(mn10200)
// movb dm, (an)
case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
case 0x18: case 0x19: case 0x1a: case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f:
- mn102->cycles -= 1;
+ mn102->cycles -= 1;
mn102_write_byte(mn102, mn102->a[(opcode>>2)&3], (UINT8)mn102->d[opcode & 3]);
mn102->pc += 1;
break;
@@ -382,7 +382,7 @@ static CPU_EXECUTE(mn10200)
// mov (an), dm
case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27:
case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f:
- mn102->cycles -= 1;
+ mn102->cycles -= 1;
mn102->d[opcode & 3] = (INT16)mn102_read_word(mn102, mn102->a[(opcode>>2)&3]);
mn102->pc += 1;
break;
@@ -390,7 +390,7 @@ static CPU_EXECUTE(mn10200)
// movbu (an), dm
case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37:
case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f:
- mn102->cycles -= 1;
+ mn102->cycles -= 1;
mn102->d[opcode & 3] = mn102_read_byte(mn102, mn102->a[(opcode>>2)&3]);
mn102->pc += 1;
break;
@@ -440,7 +440,7 @@ static CPU_EXECUTE(mn10200)
mn102->cycles -= 1;
mn102->d[opcode & 3] = (INT8)mn102_read_byte(mn102, mn102->pc+1);
mn102->pc += 2;
- break;
+ break;
// add dn, dm
case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97:
@@ -540,16 +540,16 @@ static CPU_EXECUTE(mn10200)
mn102->cycles -= 1;
mn102->a[opcode & 3] = mn102_read_word(mn102, mn102->pc+1);
mn102->pc += 3;
- break;
+ break;
// blt label8
case 0xe0:
- if(((mn102->psw & 0x0a) == 2) || ((mn102->psw & 0x0a) == 8))
+ if(((mn102->psw & 0x0a) == 2) || ((mn102->psw & 0x0a) == 8))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -558,12 +558,12 @@ static CPU_EXECUTE(mn10200)
// bgt label8
case 0xe1:
- if(((mn102->psw & 0x0b) == 0) || ((mn102->psw & 0x0b) == 0xa))
+ if(((mn102->psw & 0x0b) == 0) || ((mn102->psw & 0x0b) == 0xa))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -572,12 +572,12 @@ static CPU_EXECUTE(mn10200)
// bge label8
case 0xe2:
- if(((mn102->psw & 0x0a) == 0) || ((mn102->psw & 0x0a) == 0xa))
+ if(((mn102->psw & 0x0a) == 0) || ((mn102->psw & 0x0a) == 0xa))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -586,12 +586,12 @@ static CPU_EXECUTE(mn10200)
// ble label8
case 0xe3:
- if((mn102->psw & 0x01) || ((mn102->psw & 0x0a) == 2) || ((mn102->psw & 0x0a) == 8))
+ if((mn102->psw & 0x01) || ((mn102->psw & 0x0a) == 2) || ((mn102->psw & 0x0a) == 8))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -600,12 +600,12 @@ static CPU_EXECUTE(mn10200)
// bcs label8
case 0xe4:
- if(mn102->psw & 0x04)
+ if(mn102->psw & 0x04)
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -614,12 +614,12 @@ static CPU_EXECUTE(mn10200)
// bhi label8
case 0xe5:
- if(!(mn102->psw & 0x05))
+ if(!(mn102->psw & 0x05))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -628,12 +628,12 @@ static CPU_EXECUTE(mn10200)
// bcc label8
case 0xe6:
- if(!(mn102->psw & 0x04))
+ if(!(mn102->psw & 0x04))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -642,12 +642,12 @@ static CPU_EXECUTE(mn10200)
// bls label8
case 0xe7:
- if(mn102->psw & 0x05)
+ if(mn102->psw & 0x05)
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -656,12 +656,12 @@ static CPU_EXECUTE(mn10200)
// beq label8
case 0xe8:
- if(mn102->psw & 0x01)
+ if(mn102->psw & 0x01)
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -670,12 +670,12 @@ static CPU_EXECUTE(mn10200)
// bne label8
case 0xe9:
- if(!(mn102->psw & 0x01))
+ if(!(mn102->psw & 0x01))
{
mn102->cycles -= 2;
mn102_change_pc(mn102, mn102->pc+2+(INT8)mn102_read_byte(mn102, mn102->pc+1));
- }
- else
+ }
+ else
{
mn102->cycles -= 1;
mn102->pc += 2;
@@ -1733,7 +1733,7 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
case 0x056: {
// const char *modes[4] = { "l", "h", "fall", "rise" };
// log_event("MN102", "irq3=%s irq2=%s irq1=%s irq0=%s",
-// modes[(data >> 6) & 3], modes[(data >> 4) & 3], modes[(data >> 2) & 3], modes[data & 3]);
+// modes[(data >> 6) & 3], modes[(data >> 4) & 3], modes[(data >> 2) & 3], modes[data & 3]);
break;
}
@@ -1754,9 +1754,9 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
mn102->serial[ser].ctrll = data;
// log_event("MN102", "Serial %d length=%c, parity=%s, stop=%c, source=%s",
-// ser,
-// data & 0x80 ? '8' : '7', parity[(data >> 4) & 7],
-// data & 8 ? '2' : '1', source[data & 3]);
+// ser,
+// data & 0x80 ? '8' : '7', parity[(data >> 4) & 7],
+// data & 8 ? '2' : '1', source[data & 3]);
break;
}
@@ -1764,10 +1764,10 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
int ser = (adr-0x180) >> 4;
mn102->serial[ser].ctrlh = data;
// log_event("MN102", "Serial %d transmit=%s, recieve=%s, break=%s, proto=%s, order=%s",
-// ser,
-// data & 0x80 ? "on" : "off", data & 0x40 ? "on" : "off",
-// data & 0x20 ? "on" : "off", data & 8 ? "sync" : "async",
-// data & 2 ? "msb" : "lsb");
+// ser,
+// data & 0x80 ? "on" : "off", data & 0x40 ? "on" : "off",
+// data & 0x20 ? "on" : "off", data & 8 ? "sync" : "async",
+// data & 2 ? "msb" : "lsb");
break;
}
@@ -1777,7 +1777,7 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
log_event("MN102", "Serial %d buffer=%02x", ser, data);
break;
}
-
+
case 0x1a0:
log_event("MN102", "AN %s timer7=%s /%d %s %s",
data & 0x80 ? "on" : "off", data & 0x40 ? "on" : "off",
@@ -1822,19 +1822,19 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
// const char *modes[4] = { "single", "double", "ioa", "iob" };
// const char *sources[8] = { "pres.0", "pres.1", "iob", "sysclk", "*4", "*1", "6", "7" };
// log_event("MN102", "Timer %d comp=%s on_1=%s on_match=%s phase=%s source=%s",
-// 10 + ((adr-0x230) >> 4),
-// modes[data >> 6], data & 0x20 ? "cleared" : "not cleared", data & 0x10 ? "cleared" : "not cleared",
-// data & 8 ? "tff" : "rsff", sources[data & 7]);
+// 10 + ((adr-0x230) >> 4),
+// modes[data >> 6], data & 0x20 ? "cleared" : "not cleared", data & 0x10 ? "cleared" : "not cleared",
+// data & 8 ? "tff" : "rsff", sources[data & 7]);
break;
}
case 0x231: case 0x241: case 0x251: {
// const char *modes[4] = { "up", "down", "up on ioa", "up on iob" };
// log_event("MN102", "Timer %d %s ff=%s op=%s ext_trig=%s %s",
-// 10 + ((adr-0x230) >> 4),
-// data & 0x80 ? "enable" : "disable", data & 0x40 ? "operate" : "clear",
-// modes[(data >> 4) & 3], data & 2 ? "on" : "off", data & 1 ? "one-shot" : "repeat");
-
+// 10 + ((adr-0x230) >> 4),
+// data & 0x80 ? "enable" : "disable", data & 0x40 ? "operate" : "clear",
+// modes[(data >> 4) & 3], data & 2 ? "on" : "off", data & 1 ? "one-shot" : "repeat");
+
break;
}
@@ -1869,9 +1869,9 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
case 0x260: case 0x261: {
// const char *mode[4] = { "sysbuf", "4-phase", "4-phase 1/2", "3" };
// log_event("MN102", "Sync Output %c timing=%s out=%s dir=%s mode=%s",
-// adr == 0x261 ? 'B' : 'A',
-// data & 0x10 ? "12A" : "1", data & 8 ? "sync a" :"P13-10",
-// data & 4 ? "ccw" : "cw", mode[data & 3]);
+// adr == 0x261 ? 'B' : 'A',
+// data & 0x10 ? "12A" : "1", data & 8 ? "sync a" :"P13-10",
+// data & 4 ? "ccw" : "cw", mode[data & 3]);
break;
}
@@ -1949,7 +1949,7 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
/* static const char *trans[4] = { "M-IO", "M-M", "M-X1", "m-X2" };
static const char *start[32] = {
"soft", "a/d", "ser0tx", "set0rx", "ser1tx", "ser1rx",
- "timer0", "timer1", "timer2", "timer3", "timer4", "timer5", "timer6", "timer7", "timer8", "timer9",
+ "timer0", "timer1", "timer2", "timer3", "timer4", "timer5", "timer6", "timer7", "timer8", "timer9",
"timer10u", "timer10a", "timer10b",
"timer11u", "timer11a", "timer12b",
"timer12a", "timer12b",
@@ -1966,20 +1966,20 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
start[data & 31]);
break;
}
-
+
case 0x28b: case 0x29b: case 0x2ab: case 0x2bb: case 0x2cb: case 0x2db: case 0x2eb: case 0x2fb: {
// static const char *tradr[4] = { "inc", "dec", "fixed", "reserved" };
int dma = (adr-0x280) >> 4;
mn102->dma[dma].ctrlh = data;
/* log_event("MN102", "DMA %d control %s irq=%s %s %s dir=%s %s %s",
- dma,
- data & 0x80 ? "enable" : "disable",
- data & 0x40 ? "off" : "on",
- data & 0x20 ? "byte" : "word",
- data & 0x10 ? "burst" : "single",
- data & 0x08 ? "dst" : "src",
- data & 0x04 ? "continue" : "normal",
- tradr[data & 3]);*/
+ dma,
+ data & 0x80 ? "enable" : "disable",
+ data & 0x40 ? "off" : "on",
+ data & 0x20 ? "byte" : "word",
+ data & 0x10 ? "burst" : "single",
+ data & 0x08 ? "dst" : "src",
+ data & 0x04 ? "continue" : "normal",
+ tradr[data & 3]);*/
break;
}
@@ -2049,28 +2049,28 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type)
mn102->ddr[0] = data;
break;
- case 0x3e1: // port1 ddr
+ case 0x3e1: // port1 ddr
mn102->ddr[1] = data;
break;
- case 0x3e2: // port2 ddr
+ case 0x3e2: // port2 ddr
mn102->ddr[2] = data;
break;
- case 0x3e3: // port3 ddr
+ case 0x3e3: // port3 ddr
mn102->ddr[3] = data;
break;
case 0x3f3:
/* log_event("MN102", "Port 3 bits 4=%s 3=%s 2=%s 1=%s 0=%s",
- data & 0x10 ? data & 0x40 ? "serial_1" : "tm9" : "p34",
- data & 0x08 ? data & 0x20 ? "serial_0" : "tm8" : "p33",
- data & 0x04 ? "tm7" : "p32",
- data & 0x04 ? "tm6" : "p31",
- data & 0x04 ? "tm5" : "p30");*/
+ data & 0x10 ? data & 0x40 ? "serial_1" : "tm9" : "p34",
+ data & 0x08 ? data & 0x20 ? "serial_0" : "tm8" : "p33",
+ data & 0x04 ? "tm7" : "p32",
+ data & 0x04 ? "tm6" : "p31",
+ data & 0x04 ? "tm5" : "p30");*/
break;
-
-
+
+
default:
log_event("MN102", "internal_w %04x, %02x (%03x)", adr+0xfc00, data, adr);
break;
@@ -2124,16 +2124,16 @@ static UINT32 mn10200_r(mn102_info *mn102, UINT32 adr, int type)
break;
case 0x264: // port 1 data
- return memory_read_byte_8le(mn102->io, MN10200_PORT1);
+ return memory_read_byte_8le(mn102->io, MN10200_PORT1);
case 0x3c0: // port 0 data
- return memory_read_byte_8le(mn102->io, MN10200_PORT0);
+ return memory_read_byte_8le(mn102->io, MN10200_PORT0);
case 0x3c2: // port 2 data
- return memory_read_byte_8le(mn102->io, MN10200_PORT2);
+ return memory_read_byte_8le(mn102->io, MN10200_PORT2);
case 0x3c3: // port 3 data
- return memory_read_byte_8le(mn102->io, MN10200_PORT3);
+ return memory_read_byte_8le(mn102->io, MN10200_PORT3);
default:
log_event("MN102", "internal_r %04x (%03x)", adr+0xfc00, adr);
@@ -2196,7 +2196,7 @@ CPU_GET_INFO( mn10200 )
case CPUINFO_INT_PC: /* intentional fallthrough */
case CPUINFO_INT_REGISTER + MN10200_PC: info->i = cpustate->pc; break;
- case CPUINFO_INT_REGISTER + MN10200_PSW: info->i = cpustate->psw; break;
+ case CPUINFO_INT_REGISTER + MN10200_PSW: info->i = cpustate->psw; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(mn10200); break;
@@ -2216,7 +2216,7 @@ CPU_GET_INFO( mn10200 )
case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
case CPUINFO_STR_FLAGS: // intentional fallthrough
- case CPUINFO_STR_REGISTER + MN10200_PSW: sprintf(info->s, "S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
+ case CPUINFO_STR_REGISTER + MN10200_PSW: sprintf(info->s, "S=%d irq=%s im=%d %c%c%c%c %c%c%c%c",
(cpustate->psw >> 12) & 3,
cpustate->psw & 0x0800 ? "on" : "off",
(cpustate->psw >> 8) & 7,
diff --git a/src/emu/cpu/mn10200/mn10200.h b/src/emu/cpu/mn10200/mn10200.h
index b59773e3d6f..2d0c1a7e264 100644
--- a/src/emu/cpu/mn10200/mn10200.h
+++ b/src/emu/cpu/mn10200/mn10200.h
@@ -2,7 +2,7 @@
Panasonic MN10200 emulator
Written by Olivier Galibert
- MAME conversion by R. Belmont
+ MAME conversion by R. Belmont
*/
diff --git a/src/emu/cpu/mn10200/mn102dis.c b/src/emu/cpu/mn10200/mn102dis.c
index 586bea248a5..ef2fa123afc 100644
--- a/src/emu/cpu/mn10200/mn102dis.c
+++ b/src/emu/cpu/mn10200/mn102dis.c
@@ -117,7 +117,7 @@ int mn102_disassemble(char *buffer, UINT32 pc, const UINT8 *oprom)
case 0x80: case 0x85: case 0x8a: case 0x8f:
sprintf(buffer, "mov %s, d%d", i8str(program_read_byte(pc+1)), opcode & 3);
- return 2;
+ return 2;
case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97:
case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f:
diff --git a/src/emu/debugint/debugint.c b/src/emu/debugint/debugint.c
index d969a2da90d..48968940aaf 100644
--- a/src/emu/debugint/debugint.c
+++ b/src/emu/debugint/debugint.c
@@ -44,11 +44,11 @@ enum
enum
{
- VIEW_STATE_BUTTON = 0x01,
- VIEW_STATE_MOVING = 0x02,
- VIEW_STATE_SIZING = 0x04,
+ VIEW_STATE_BUTTON = 0x01,
+ VIEW_STATE_MOVING = 0x02,
+ VIEW_STATE_SIZING = 0x04,
VIEW_STATE_NEEDS_UPDATE = 0x08,
- VIEW_STATE_FOLLOW_CPU = 0x10,
+ VIEW_STATE_FOLLOW_CPU = 0x10,
};
/***************************************************************************
@@ -270,8 +270,8 @@ INLINE void dview_set_state(DView *dv, int state, int onoff)
***************************************************************************/
static render_font * debug_font;
-static int debug_font_width;
-static int debug_font_height;
+static int debug_font_width;
+static int debug_font_height;
static float debug_font_aspect;
static DView * list;
static DView * focus_view;
@@ -1376,7 +1376,7 @@ static void handle_menus(running_machine *machine)
CreateMainMenu(machine);
/* turn on editor if requested */
//if (ui_input_pressed(machine, IPT_UI_UP) && focus_view->editor.active)
- // cur_editor = &focus_view->editor;
+ // cur_editor = &focus_view->editor;
handle_editor(machine);
}
}
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 60f5a9b8974..f4e042d218e 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -43,7 +43,7 @@
#define GAME_IS_BIOS_ROOT 0x00001000 /* this driver entry is a BIOS root */
#define GAME_NO_STANDALONE 0x00002000 /* this driver cannot stand alone */
#define GAME_REQUIRES_ARTWORK 0x00004000 /* the driver requires external artwork for key elements of the game */
-#define GAME_UNOFFICIAL 0x00008000 /* unofficial hardware change */
+#define GAME_UNOFFICIAL 0x00008000 /* unofficial hardware change */
#define GAME_NO_SOUND_HW 0x00010000 /* sound hardware not available */
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
index 9c40a3662b7..78f8f322623 100644
--- a/src/emu/drivers/xtal.h
+++ b/src/emu/drivers/xtal.h
@@ -94,7 +94,7 @@ enum
XTAL_12MHz = 12000000, /* Extremely common, used on 100's of PCBs */
XTAL_12_096MHz = 12096000, /* Some early 80's Atari games */
XTAL_12_288MHz = 12288000, /* Sega Model 3 digital audio board */
- XTAL_12_48MHz = 12480000, /* TRS-80 Model II */
+ XTAL_12_48MHz = 12480000, /* TRS-80 Model II */
XTAL_12_5MHz = 12500000, /* Red Alert audio board */
XTAL_12_9792MHz = 12979200, /* Exidy 440 */
XTAL_13_3MHz = 13300000, /* BMC bowling */
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index adf27712942..363913f27e1 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -130,9 +130,9 @@ const options_entry mame_core_options[] =
{ "joystick_deadzone;joy_deadzone;jdz", "0.3", 0, "center deadzone range for joystick where change is ignored (0.0 center, 1.0 end)" },
{ "joystick_saturation;joy_saturation;jsat", "0.85", 0, "end of axis saturation range for joystick where change is ignored (0.0 center, 1.0 end)" },
{ "natural;nat", "0", OPTION_BOOLEAN, "specifies whether to use a natural keyboard or not" },
- { "uimodekey;umk", "auto", 0, "specifies the key used to toggle between full and partial UI mode" },
-
-
+ { "uimodekey;umk", "auto", 0, "specifies the key used to toggle between full and partial UI mode" },
+
+
/* input autoenable options */
{ NULL, NULL, OPTION_HEADER, "CORE INPUT AUTOMATIC ENABLE OPTIONS" },
{ "paddle_device;paddle", "keyboard", 0, "enable (none|keyboard|mouse|lightgun|joystick) if a paddle control is present" },
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 91fe849ed1c..3799fbd0930 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -2524,7 +2524,7 @@ profiler_mark_start(PROFILER_INPUT);
/* hook for MESS's natural keyboard support */
input_port_update_hook(machine, port, &port->state->digital);
-
+
/* handle playback/record */
playback_port(port);
record_port(port);
@@ -5303,7 +5303,7 @@ void inputx_post_utf8(running_machine *machine, const char *text)
void inputx_post_utf8_rate(running_machine *machine, const char *text, attotime rate)
{
inputx_postn_utf8_rate(machine, text, strlen(text), rate);
-}
+}
/***************************************************************************
diff --git a/src/emu/machine/i8255a.c b/src/emu/machine/i8255a.c
index 8f5eb73ff04..203c8635bd0 100644
--- a/src/emu/machine/i8255a.c
+++ b/src/emu/machine/i8255a.c
@@ -588,7 +588,7 @@ static void set_mode(running_device *device, UINT8 data)
i8255a->inte[PORT_A] = 0;
i8255a->inte1 = 0;
i8255a->inte2 = 0;
-
+
if (port_mode(i8255a, PORT_A) == MODE_OUTPUT)
{
devcb_call_write8(&i8255a->out_port_func[PORT_A], 0, i8255a->output[PORT_A]);
@@ -612,7 +612,7 @@ static void set_mode(running_device *device, UINT8 data)
i8255a->ibf[PORT_B] = 0;
i8255a->obf[PORT_B] = 1;
i8255a->inte[PORT_B] = 0;
-
+
if (port_mode(i8255a, PORT_B) == MODE_OUTPUT)
{
devcb_call_write8(&i8255a->out_port_func[PORT_B], 0, i8255a->output[PORT_B]);
diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c
index 5118a732126..9b01a03096b 100644
--- a/src/emu/sound/zsg2.c
+++ b/src/emu/sound/zsg2.c
@@ -34,7 +34,7 @@
The samples are compressed with a 2:1 ratio. Each bloc of 4-bytes
becomes 4 16-bits samples. Reading the 4 bytes as a *little-endian*
32bits values, the structure is:
-
+
1444 4444 1333 3333 1222 2222 ssss1111
's' is a 4-bit scale value. '1', '2', '3', '4' are signed 7-bits
@@ -77,7 +77,7 @@ INLINE zsg2_state *get_safe_token(running_device *device)
static STREAM_UPDATE( update_stereo )
{
-// zsg2_state *info = (zsg2_state *)param;
+// zsg2_state *info = (zsg2_state *)param;
stream_sample_t *dest1 = outputs[0];
stream_sample_t *dest2 = outputs[1];
@@ -116,9 +116,9 @@ static void keyon(zsg2_state *info, int chan)
static void control_w(zsg2_state *info, int reg, UINT16 data)
{
- switch(reg)
+ switch(reg)
{
- case 0x00: case 0x02: case 0x04:
+ case 0x00: case 0x02: case 0x04:
{
int base = (reg & 6) << 3;
int i;
@@ -128,7 +128,7 @@ static void control_w(zsg2_state *info, int reg, UINT16 data)
break;
}
- case 0x08: case 0x0a: case 0x0c:
+ case 0x08: case 0x0a: case 0x0c:
{
int base = (reg & 6) << 3;
int i;
@@ -152,26 +152,26 @@ static void control_w(zsg2_state *info, int reg, UINT16 data)
default:
// log_event("ZOOMCTRL", "%02x = %04x", reg, data);
break;
- }
+ }
}
static UINT16 control_r(zsg2_state *info, int reg)
{
- switch(reg)
+ switch(reg)
{
case 0x28:
return 0xff00;
- case 0x3c: case 0x3e:
+ case 0x3c: case 0x3e:
{
UINT32 adr = (info->ahigh << 16) | info->alow;
UINT32 val = *(unsigned int *)(info->bank_samples+adr);
-// log_event("ZOOMCTRL", "rom read.%c %06x = %08x", reg == 0x3e ? 'h' : 'l', adr, val);
+// log_event("ZOOMCTRL", "rom read.%c %06x = %08x", reg == 0x3e ? 'h' : 'l', adr, val);
return (reg == 0x3e) ? (val >> 16) : val;
}
}
-// log_event("ZOOMCTRL", "read %02x", reg);
+// log_event("ZOOMCTRL", "read %02x", reg);
return 0xffff;
}
@@ -191,7 +191,7 @@ WRITE16_DEVICE_HANDLER( zsg2_w )
int reg = (adr >> 1) & 15;
chan_w(info, chan, reg, data);
- }
+ }
else
{
control_w(info, adr - 0x600, data);
@@ -205,12 +205,12 @@ READ16_DEVICE_HANDLER( zsg2_r )
assert(mem_mask == 0xffff); // we only support full 16-bit accesses
- if (adr < 0x600)
+ if (adr < 0x600)
{
int chan = adr >> 5;
int reg = (adr >> 1) & 15;
return chan_r(info, chan, reg);
- }
+ }
else
{
return control_r(info, adr - 0x600);
@@ -237,7 +237,7 @@ static DEVICE_START( zsg2 )
/**************************************************************************
* Generic get_info
**************************************************************************/
-
+
DEVICE_GET_INFO( zsg2 )
{
switch (state)
diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h
index 4947c8c143c..27c72cd367c 100644
--- a/src/emu/sound/zsg2.h
+++ b/src/emu/sound/zsg2.h
@@ -1,5 +1,5 @@
/*
- ZOOM ZSG-2 custom wavetable synthesizer
+ ZOOM ZSG-2 custom wavetable synthesizer
*/
#pragma once
diff --git a/src/emu/ui.c b/src/emu/ui.c
index c6df5d95e79..f34daaf8c6f 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -125,7 +125,7 @@ static slider_state *slider_current;
static int ui_active;
/* natural keyboard info */
static int ui_use_natural_keyboard;
-static UINT8 non_char_keys_down[(ARRAY_LENGTH(non_char_keys) + 7) / 8];
+static UINT8 non_char_keys_down[(ARRAY_LENGTH(non_char_keys) + 7) / 8];
/***************************************************************************
@@ -254,11 +254,11 @@ int ui_init(running_machine *machine)
/* reset globals */
single_step = FALSE;
- ui_set_handler(handler_messagebox, 0);
+ ui_set_handler(handler_messagebox, 0);
ui_active = 0;
/* retrieve options */
ui_use_natural_keyboard = options_get_bool(mame_options(), OPTION_NATURAL_KEYBOARD);
-
+
return 0;
}
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index 671e34dfc56..517b6c02f0b 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -1535,8 +1535,8 @@ static void menu_main_populate(running_machine *machine, ui_menu *menu, void *st
ui_mess_main_menu_populate(machine, menu);
#endif /* MESS */
- /* add keyboard mode menu */
- if (input_machine_has_keyboard(machine) && inputx_can_post(machine))
+ /* add keyboard mode menu */
+ if (input_machine_has_keyboard(machine) && inputx_can_post(machine))
ui_menu_item_append(menu, "Keyboard Mode", NULL, 0, (void *)ui_menu_keyboard_mode);
/* add sliders menu */
diff --git a/src/emu/validity.c b/src/emu/validity.c
index bdbeb7604e2..3f72ac6c891 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -405,7 +405,7 @@ static int validate_driver(int drivnum, const machine_config *config, game_drive
mame_printf_error("%s: both compatible_with and clone_of are specified\n", driver->name);
error = TRUE;
}
-
+
/* find any recursive dependencies on the current driver */
for (other_drv = driver_get_compatible(driver); other_drv != NULL; other_drv = driver_get_compatible(other_drv))
{
@@ -443,18 +443,18 @@ static int validate_roms(int drivnum, const machine_config *config, region_array
int error = FALSE;
/* check for duplicate ROM entries */
-/*
- if (driver->rom != NULL && (driver->flags & GAME_NO_STANDALONE) == 0)
- {
- char romaddr[20];
- sprintf(romaddr, "%p", driver->rom);
- if (roms.add(romaddr, driver, FALSE) == TMERR_DUPLICATE)
- {
- const game_driver *match = roms.find(romaddr);
- mame_printf_error("%s: %s uses the same ROM set as (%s, %s)\n", driver->source_file, driver->description, match->source_file, match->name);
- error = TRUE;
- }
- }
+/*
+ if (driver->rom != NULL && (driver->flags & GAME_NO_STANDALONE) == 0)
+ {
+ char romaddr[20];
+ sprintf(romaddr, "%p", driver->rom);
+ if (roms.add(romaddr, driver, FALSE) == TMERR_DUPLICATE)
+ {
+ const game_driver *match = roms.find(romaddr);
+ mame_printf_error("%s: %s uses the same ROM set as (%s, %s)\n", driver->source_file, driver->description, match->source_file, match->name);
+ error = TRUE;
+ }
+ }
*/
/* iterate, starting with the driver's ROMs and continuing with device ROMs */
for (const rom_source *source = rom_first_source(driver, config); source != NULL; source = rom_next_source(driver, config, source))
@@ -1192,10 +1192,10 @@ static int validate_inputs(int drivnum, const machine_config *config, int_map &d
}
}
}
-
+
error = error || validate_natural_keyboard_statics();
-
- /* free the config */
+
+ /* free the config */
return error;
}
@@ -1575,7 +1575,7 @@ int mame_validitychecks(const game_driver *curdriver)
machine_config_free(config);
}
-
+
#if (REPORT_TIMES)
mame_printf_info("Prep: %8dm\n", (int)(prep / 1000000));
mame_printf_info("Expansion: %8dm\n", (int)(expansion / 1000000));
diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c
index 24b8513555f..ae0cd62bb4e 100644
--- a/src/emu/video/hd63484.c
+++ b/src/emu/video/hd63484.c
@@ -9,9 +9,9 @@
- sigmab52.c
ACRTC memory map:
-
+
00000-3ffff = RAM
- 40000-7ffff = ROM handled with a hack in the drivers
+ 40000-7ffff = ROM handled with a hack in the drivers
80000-bffff = unused
c0000-fffff = unused