summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/nec/necpriv.h2
-rw-r--r--src/emu/cpu/nec/v25priv.h2
-rw-r--r--src/emu/machine/6850acia.c4
-rw-r--r--src/emu/machine/s3c2410.h12
-rw-r--r--src/emu/machine/s3c2440.h32
-rw-r--r--src/emu/machine/s3c24xx.c128
-rw-r--r--src/emu/machine/z80ctc.h4
-rw-r--r--src/emu/video/mc6845.c2
8 files changed, 93 insertions, 93 deletions
diff --git a/src/emu/cpu/nec/necpriv.h b/src/emu/cpu/nec/necpriv.h
index aa7e52a0220..c1fb4f7caef 100644
--- a/src/emu/cpu/nec/necpriv.h
+++ b/src/emu/cpu/nec/necpriv.h
@@ -279,7 +279,7 @@ typedef enum {
#define XchgAWReg(Reg) \
WORD tmp; \
tmp = Wreg(Reg); \
- Wreg(Reg) = Wreg(AW); \
+ Wreg(Reg) = Wreg(AW); \
Wreg(AW) = tmp
#define ROL_BYTE nec_state->CarryVal = dst & 0x80; dst = (dst << 1)+CF
diff --git a/src/emu/cpu/nec/v25priv.h b/src/emu/cpu/nec/v25priv.h
index fbf292ade41..50ac646754e 100644
--- a/src/emu/cpu/nec/v25priv.h
+++ b/src/emu/cpu/nec/v25priv.h
@@ -312,7 +312,7 @@ void v25_write_word(v25_state_t *nec_state, unsigned a, unsigned d);
#define XchgAWReg(Reg) \
WORD tmp; \
tmp = Wreg(Reg); \
- Wreg(Reg) = Wreg(AW); \
+ Wreg(Reg) = Wreg(AW); \
Wreg(AW) = tmp
#define ROL_BYTE nec_state->CarryVal = dst & 0x80; dst = (dst << 1)+CF
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index ffe77dddbad..5721109cf8c 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -736,7 +736,7 @@ void acia6850_device::rx_clock_in()
/*-------------------------------------------------
- set_rx_clock - set receiver clock
+ set_rx_clock - set receiver clock
-------------------------------------------------*/
void acia6850_device::set_rx_clock(int clock)
@@ -763,7 +763,7 @@ void acia6850_set_rx_clock(running_device *device, int clock)
/*-------------------------------------------------
- set_tx_clock - set receiver clock
+ set_tx_clock - set receiver clock
-------------------------------------------------*/
void acia6850_device::set_tx_clock(int clock)
diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h
index fc745340b12..76cacf1a20b 100644
--- a/src/emu/machine/s3c2410.h
+++ b/src/emu/machine/s3c2410.h
@@ -527,12 +527,12 @@ typedef struct
typedef struct
{
- UINT32 nfconf;
- UINT32 nfcmd;
- UINT32 nfaddr;
- UINT32 nfdata;
- UINT32 nfstat;
- UINT32 nfecc;
+ UINT32 nfconf;
+ UINT32 nfcmd;
+ UINT32 nfaddr;
+ UINT32 nfdata;
+ UINT32 nfstat;
+ UINT32 nfecc;
} s3c24xx_nand_regs_t;
typedef struct
diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h
index 3aa520f6d15..85a44bb4dfe 100644
--- a/src/emu/machine/s3c2440.h
+++ b/src/emu/machine/s3c2440.h
@@ -557,22 +557,22 @@ typedef struct
typedef struct
{
- UINT32 nfconf;
- UINT32 nfcont;
- UINT32 nfcmd;
- UINT32 nfaddr;
- UINT32 nfdata;
- UINT32 nfmeccd0;
- UINT32 nfmeccd1;
- UINT32 nfseccd;
- UINT32 nfstat;
- UINT32 nfestat0;
- UINT32 nfestat1;
- UINT32 nfmecc0;
- UINT32 nfmecc1;
- UINT32 nfsecc;
- UINT32 nfsblk;
- UINT32 nfeblk;
+ UINT32 nfconf;
+ UINT32 nfcont;
+ UINT32 nfcmd;
+ UINT32 nfaddr;
+ UINT32 nfdata;
+ UINT32 nfmeccd0;
+ UINT32 nfmeccd1;
+ UINT32 nfseccd;
+ UINT32 nfstat;
+ UINT32 nfestat0;
+ UINT32 nfestat1;
+ UINT32 nfmecc0;
+ UINT32 nfmecc1;
+ UINT32 nfsecc;
+ UINT32 nfsblk;
+ UINT32 nfeblk;
} s3c24xx_nand_regs_t;
typedef struct
diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c
index b807e6da052..5386e668ecf 100644
--- a/src/emu/machine/s3c24xx.c
+++ b/src/emu/machine/s3c24xx.c
@@ -246,45 +246,45 @@ static void s3c24xx_lcd_dma_init( running_device *device)
/*
static UINT32 s3c24xx_lcd_dma_read( running_device *device)
{
- s3c24xx_t *s3c24xx = get_token( device);
- address_space* space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- UINT8 *vram, data[4];
- vram = (UINT8 *)space->get_read_ptr( s3c24xx->lcd.vramaddr_cur);
- for (int i = 0; i < 2; i++)
- {
- data[i*2+0] = *vram++;
- data[i*2+1] = *vram++;
- s3c24xx->lcd.vramaddr_cur += 2;
- s3c24xx->lcd.pagewidth_cur++;
- if (s3c24xx->lcd.pagewidth_cur >= s3c24xx->lcd.pagewidth_max)
- {
- s3c24xx->lcd.vramaddr_cur += s3c24xx->lcd.offsize << 1;
- s3c24xx->lcd.pagewidth_cur = 0;
- vram = (UINT8 *)space->get_read_ptr( s3c24xx->lcd.vramaddr_cur);
- }
- }
- if (s3c24xx->lcd.hwswp == 0)
- {
- if (s3c24xx->lcd.bswp == 0)
- {
- return (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | (data[0] << 0);
- }
- else
- {
- return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | (data[3] << 0);
- }
- }
- else
- {
- if (s3c24xx->lcd.bswp == 0)
- {
- return (data[1] << 24) | (data[0] << 16) | (data[3] << 8) | (data[2] << 0);
- }
- else
- {
- return (data[2] << 24) | (data[3] << 16) | (data[0] << 8) | (data[1] << 0);
- }
- }
+ s3c24xx_t *s3c24xx = get_token( device);
+ address_space* space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ UINT8 *vram, data[4];
+ vram = (UINT8 *)space->get_read_ptr( s3c24xx->lcd.vramaddr_cur);
+ for (int i = 0; i < 2; i++)
+ {
+ data[i*2+0] = *vram++;
+ data[i*2+1] = *vram++;
+ s3c24xx->lcd.vramaddr_cur += 2;
+ s3c24xx->lcd.pagewidth_cur++;
+ if (s3c24xx->lcd.pagewidth_cur >= s3c24xx->lcd.pagewidth_max)
+ {
+ s3c24xx->lcd.vramaddr_cur += s3c24xx->lcd.offsize << 1;
+ s3c24xx->lcd.pagewidth_cur = 0;
+ vram = (UINT8 *)space->get_read_ptr( s3c24xx->lcd.vramaddr_cur);
+ }
+ }
+ if (s3c24xx->lcd.hwswp == 0)
+ {
+ if (s3c24xx->lcd.bswp == 0)
+ {
+ return (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | (data[0] << 0);
+ }
+ else
+ {
+ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | (data[3] << 0);
+ }
+ }
+ else
+ {
+ if (s3c24xx->lcd.bswp == 0)
+ {
+ return (data[1] << 24) | (data[0] << 16) | (data[3] << 8) | (data[2] << 0);
+ }
+ else
+ {
+ return (data[2] << 24) | (data[3] << 16) | (data[0] << 8) | (data[1] << 0);
+ }
+ }
}
*/
@@ -1154,12 +1154,12 @@ static UINT16 s3c24xx_pwm_calc_observation( running_device *device, int ch)
double timeleft, x1, x2;
UINT32 cnto;
timeleft = attotime_to_double( timer_timeleft( s3c24xx->pwm.timer[ch]));
-// printf( "timeleft %f freq %d cntb %d cmpb %d\n", timeleft, s3c24xx->pwm.freq[ch], s3c24xx->pwm.cnt[ch], s3c24xx->pwm.cmp[ch]);
+// printf( "timeleft %f freq %d cntb %d cmpb %d\n", timeleft, s3c24xx->pwm.freq[ch], s3c24xx->pwm.cnt[ch], s3c24xx->pwm.cmp[ch]);
x1 = 1 / ((double)s3c24xx->pwm.freq[ch] / (s3c24xx->pwm.cnt[ch]- s3c24xx->pwm.cmp[ch] + 1));
x2 = x1 / timeleft;
-// printf( "x1 %f\n", x1);
+// printf( "x1 %f\n", x1);
cnto = s3c24xx->pwm.cmp[ch] + ((s3c24xx->pwm.cnt[ch]- s3c24xx->pwm.cmp[ch]) / x2);
-// printf( "cnto %d\n", cnto);
+// printf( "cnto %d\n", cnto);
return cnto;
}
@@ -1219,7 +1219,7 @@ static void s3c24xx_pwm_start( running_device *device, int timer)
{
// todo
freq = (double)pclk / (prescaler + 1) / 1;
- }
+ }
switch (timer)
{
case 0 :
@@ -1263,7 +1263,7 @@ static void s3c24xx_pwm_start( running_device *device, int timer)
}
break;
}
-// hz = freq / (cnt - cmp + 1);
+// hz = freq / (cnt - cmp + 1);
if (cnt < 2)
{
hz = freq;
@@ -1384,7 +1384,7 @@ static void s3c24xx_dma_trigger( running_device *device, int ch)
curr_src = S3C24XX_DCSRC_GET_CURR_SRC( regs->dcsrc);
curr_dst = S3C24XX_DCDST_GET_CURR_DST( regs->dcdst);
servmode = S3C24XX_DCON_GET_SERVMODE( regs->dcon);
- tsz = S3C24XX_DCON_GET_TSZ( regs->dcon);
+ tsz = S3C24XX_DCON_GET_TSZ( regs->dcon);
#if defined(DEVICE_S3C2400)
inc_src = BIT( regs->disrc, 29);
inc_dst = BIT( regs->didst, 29);
@@ -1525,12 +1525,12 @@ static void s3c24xx_dma_w( running_device *device, UINT32 ch, UINT32 offset, UIN
case S3C24XX_DCON :
{
/* --- is this code necessary ???
- if ((data & (1 << 22)) != 0) // reload
- {
- s3c24xx_dma_regs_t *regs = &s3c24xx->dma[ch].regs;
- regs->dmasktrig &= ~(1 << 1); // clear on/off
- }
- */
+ if ((data & (1 << 22)) != 0) // reload
+ {
+ s3c24xx_dma_regs_t *regs = &s3c24xx->dma[ch].regs;
+ regs->dmasktrig &= ~(1 << 1); // clear on/off
+ }
+ */
}
break;
case S3C24XX_DMASKTRIG :
@@ -1847,14 +1847,14 @@ static void s3c24xx_uart_w( running_device *device, UINT32 ch, UINT32 offset, UI
static READ32_DEVICE_HANDLER( s3c24xx_uart_0_r )
{
UINT32 data = s3c24xx_uart_r( device, 0, offset);
-// verboselog( device->machine, 9, "(UART 0) %08X -> %08X\n", S3C24XX_BASE_UART_0 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 0) %08X -> %08X\n", S3C24XX_BASE_UART_0 + (offset << 2), data);
return data;
}
static READ32_DEVICE_HANDLER( s3c24xx_uart_1_r )
{
UINT32 data = s3c24xx_uart_r( device, 1, offset);
-// verboselog( device->machine, 9, "(UART 1) %08X -> %08X\n", S3C24XX_BASE_UART_1 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 1) %08X -> %08X\n", S3C24XX_BASE_UART_1 + (offset << 2), data);
return data;
}
@@ -1863,7 +1863,7 @@ static READ32_DEVICE_HANDLER( s3c24xx_uart_1_r )
static READ32_DEVICE_HANDLER( s3c24xx_uart_2_r )
{
UINT32 data = s3c24xx_uart_r( device, 2, offset);
-// verboselog( device->machine, 9, "(UART 2) %08X -> %08X\n", S3C24XX_BASE_UART_2 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 2) %08X -> %08X\n", S3C24XX_BASE_UART_2 + (offset << 2), data);
return data;
}
@@ -1871,13 +1871,13 @@ static READ32_DEVICE_HANDLER( s3c24xx_uart_2_r )
static WRITE32_DEVICE_HANDLER( s3c24xx_uart_0_w )
{
-// verboselog( device->machine, 9, "(UART 0) %08X <- %08X\n", S3C24XX_BASE_UART_0 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 0) %08X <- %08X\n", S3C24XX_BASE_UART_0 + (offset << 2), data);
s3c24xx_uart_w( device, 0, offset, data, mem_mask);
}
static WRITE32_DEVICE_HANDLER( s3c24xx_uart_1_w )
{
-// verboselog( device->machine, 9, "(UART 1) %08X <- %08X\n", S3C24XX_BASE_UART_1 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 1) %08X <- %08X\n", S3C24XX_BASE_UART_1 + (offset << 2), data);
s3c24xx_uart_w( device, 1, offset, data, mem_mask);
}
@@ -1885,7 +1885,7 @@ static WRITE32_DEVICE_HANDLER( s3c24xx_uart_1_w )
static WRITE32_DEVICE_HANDLER( s3c24xx_uart_2_w )
{
-// verboselog( device->machine, 9, "(UART 2) %08X <- %08X\n", S3C24XX_BASE_UART_2 + (offset << 2), data);
+// verboselog( device->machine, 9, "(UART 2) %08X <- %08X\n", S3C24XX_BASE_UART_2 + (offset << 2), data);
s3c24xx_uart_w( device, 2, offset, data, mem_mask);
}
@@ -1893,7 +1893,7 @@ static WRITE32_DEVICE_HANDLER( s3c24xx_uart_2_w )
static void s3c24xx_uart_fifo_w( running_device *device, int uart, UINT8 data)
{
-// printf( "s3c24xx_uart_fifo_w (%c)\n", data);
+// printf( "s3c24xx_uart_fifo_w (%c)\n", data);
s3c24xx_t *s3c24xx = get_token( device);
s3c24xx->uart[uart].regs.urxh = data;
s3c24xx->uart[uart].regs.utrstat |= 1; // [bit 0] Receive buffer data ready
@@ -2183,7 +2183,7 @@ static WRITE32_DEVICE_HANDLER( s3c24xx_iic_w )
if (s3c24xx->iic.count == 0)
{
iic_start( device);
-
+
}
else
{
@@ -2212,7 +2212,7 @@ static WRITE32_DEVICE_HANDLER( s3c24xx_iic_w )
if (s3c24xx->iic.count == 0)
{
iic_start( device);
-
+
}
else
{
@@ -2385,7 +2385,7 @@ static void s3c24xx_rtc_recalc( running_device *device)
double freq;
ttc = BITS( s3c24xx->rtc.regs.ticnt, 6, 0);
freq = 128 / (ttc + 1);
-// printf( "ttc %d freq %f\n", ttc, freq);
+// printf( "ttc %d freq %f\n", ttc, freq);
timer_adjust_periodic( s3c24xx->rtc.timer_tick_count, ATTOTIME_IN_HZ( freq), 0, ATTOTIME_IN_HZ( freq));
}
else
@@ -2866,7 +2866,7 @@ static READ32_DEVICE_HANDLER( s3c24xx_nand_r )
#if defined(DEVICE_S3C2440)
case S3C24XX_NFMECC0 :
{
-
+
data = (s3c24xx->nand.mecc[3] << 24) | (s3c24xx->nand.mecc[2] << 16) | (s3c24xx->nand.mecc[1] << 8) | (s3c24xx->nand.mecc[0] << 0);
}
break;
@@ -3043,7 +3043,7 @@ static DEVICE_RESET( s3c24xx )
{
s3c24xx_t *s3c24xx = get_token( device);
s3c24xx->iis.fifo_index = 0;
-// s3c24xx->iic.data_index = 0;
+// s3c24xx->iic.data_index = 0;
}
static DEVICE_START( s3c24xx )
@@ -3069,7 +3069,7 @@ static DEVICE_GET_INFO( s3c24xx )
/* --- the following bits of info are returned as 64-bit signed integers --- */
case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(s3c24xx_t); break;
case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = 0; break;
-// case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break;
+// case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(s3c24xx); break;
case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(s3c24xx); break;
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index 32cef797e01..405ddd0ed02 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -4,7 +4,7 @@
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
-
+
****************************************************************************
_____ _____
D4 1 |* \_/ | 28 D3
@@ -21,7 +21,7 @@
_INT 12 | | 17 _RESET
IEI 13 | | 16 _CE
_M1 14 |_____________| 15 CLK
-
+
***************************************************************************/
#ifndef __Z80CTC_H__
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 88e33cd2904..5d42795d214 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -54,7 +54,7 @@ enum
#define MODE_DISPLAY_ENABLE_SKEW(d) (((d)->mode_control & 0x10) != 0)
#define MODE_ROW_COLUMN_ADDRESSING(d) (((d)->mode_control & 0x04) != 0)
-/* capabilities */ /* MC6845 MC6845-1 C6545-1 R6545-1 H46505 HD6845 SY6545-1 SY6845E */
+/* capabilities */ /* MC6845 MC6845-1 C6545-1 R6545-1 H46505 HD6845 SY6545-1 SY6845E */
static const int supports_disp_start_addr_r[NUM_TYPES] = { TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE };
static const int supports_vert_sync_width[NUM_TYPES] = { FALSE, TRUE, TRUE, TRUE, FALSE, TRUE, TRUE, TRUE };
static const int supports_status_reg_d5[NUM_TYPES] = { FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, TRUE };