summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/pdp1
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-12-31 21:42:55 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-12-31 21:42:55 +0000
commit3b41606ca0c02056604a55a7b1f5165e80bc11fb (patch)
tree415d338c92efb4c7f1d4922255060f279d1d4fa2 /src/emu/cpu/pdp1
parent2ca38fad3e665d2e4e0212263a07819d36f4ba7f (diff)
running_device -> device_t
They both already existed. No sense in having two names for the same object type.
Diffstat (limited to 'src/emu/cpu/pdp1')
-rw-r--r--src/emu/cpu/pdp1/pdp1.c18
-rw-r--r--src/emu/cpu/pdp1/pdp1.h6
-rw-r--r--src/emu/cpu/pdp1/tx0.c14
-rw-r--r--src/emu/cpu/pdp1/tx0.h6
4 files changed, 22 insertions, 22 deletions
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index fb7594a1623..74b6fb7cbdb 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -422,7 +422,7 @@ struct _pdp1_state
int icount;
};
-INLINE pdp1_state *get_safe_token(running_device *device)
+INLINE pdp1_state *get_safe_token(device_t *device)
{
assert(device != NULL);
assert(device->type() == PDP1);
@@ -430,10 +430,10 @@ INLINE pdp1_state *get_safe_token(running_device *device)
}
static void execute_instruction(pdp1_state *cpustate);
-static void null_iot (running_device *device, int op2, int nac, int mb, int *io, int ac);
-static void lem_eem_iot(running_device *device, int op2, int nac, int mb, int *io, int ac);
-static void sbs_iot(running_device *device, int op2, int nac, int mb, int *io, int ac);
-static void type_20_sbs_iot(running_device *device, int op2, int nac, int mb, int *io, int ac);
+static void null_iot (device_t *device, int op2, int nac, int mb, int *io, int ac);
+static void lem_eem_iot(device_t *device, int op2, int nac, int mb, int *io, int ac);
+static void sbs_iot(device_t *device, int op2, int nac, int mb, int *io, int ac);
+static void type_20_sbs_iot(device_t *device, int op2, int nac, int mb, int *io, int ac);
static void pulse_start_clear(pdp1_state *cpustate);
@@ -1698,7 +1698,7 @@ no_fetch:
/*
Handle unimplemented IOT
*/
-static void null_iot(running_device *device, int op2, int nac, int mb, int *io, int ac)
+static void null_iot(device_t *device, int op2, int nac, int mb, int *io, int ac)
{
pdp1_state *cpustate = get_safe_token(device);
/* Note that the dummy IOT 0 is used to wait for the completion pulse
@@ -1721,7 +1721,7 @@ static void null_iot(running_device *device, int op2, int nac, int mb, int *io,
IOT 74: LEM/EEM
*/
-static void lem_eem_iot(running_device *device, int op2, int nac, int mb, int *io, int ac)
+static void lem_eem_iot(device_t *device, int op2, int nac, int mb, int *io, int ac)
{
pdp1_state *cpustate = get_safe_token(device);
if (! cpustate->extend_support) /* extend mode supported? */
@@ -1745,7 +1745,7 @@ static void lem_eem_iot(running_device *device, int op2, int nac, int mb, int *i
IOT 55: esm
IOT 56: cbs
*/
-static void sbs_iot(running_device *device, int op2, int nac, int mb, int *io, int ac)
+static void sbs_iot(device_t *device, int op2, int nac, int mb, int *io, int ac)
{
pdp1_state *cpustate = get_safe_token(device);
switch (op2)
@@ -1789,7 +1789,7 @@ static void sbs_iot(running_device *device, int op2, int nac, int mb, int *io, i
IOT 52: isb
IOT 53: cac
*/
-static void type_20_sbs_iot(running_device *device, int op2, int nac, int mb, int *io, int ac)
+static void type_20_sbs_iot(device_t *device, int op2, int nac, int mb, int *io, int ac)
{
pdp1_state *cpustate = get_safe_token(device);
int channel, mask;
diff --git a/src/emu/cpu/pdp1/pdp1.h b/src/emu/cpu/pdp1/pdp1.h
index 458fb5c236f..7e31766b209 100644
--- a/src/emu/cpu/pdp1/pdp1.h
+++ b/src/emu/cpu/pdp1/pdp1.h
@@ -22,9 +22,9 @@ enum
#define pdp1_pulse_start_clear(cpudevice) cpu_set_reg(cpudevice, PDP1_START_CLEAR, (UINT64)0)
#define pdp1_pulse_iot_done(cpudevice) cpu_set_reg(cpudevice, PDP1_IO_COMPLETE, (UINT64)0)
-typedef void (*pdp1_extern_iot_func)(running_device *device, int op2, int nac, int mb, int *io, int ac);
-typedef void (*pdp1_read_binary_word_func)(running_device *device);
-typedef void (*pdp1_io_sc_func)(running_device *device);
+typedef void (*pdp1_extern_iot_func)(device_t *device, int op2, int nac, int mb, int *io, int ac);
+typedef void (*pdp1_read_binary_word_func)(device_t *device);
+typedef void (*pdp1_io_sc_func)(device_t *device);
typedef struct _pdp1_reset_param_t pdp1_reset_param_t;
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c
index bc587a19196..e65a6fe812d 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -15,9 +15,9 @@
#define LOG 0
#define LOG_EXTRA 0
-static void execute_instruction_64kw(running_device *device);
-static void execute_instruction_8kw(running_device *device);
-static void pulse_reset(running_device *device);
+static void execute_instruction_64kw(device_t *device);
+static void execute_instruction_8kw(device_t *device);
+static void pulse_reset(device_t *device);
/* TX-0 Registers */
@@ -68,7 +68,7 @@ struct _tx0_state
address_space *program;
};
-INLINE tx0_state *get_safe_token(running_device *device)
+INLINE tx0_state *get_safe_token(device_t *device)
{
assert(device != NULL);
assert(device->type() == TX0_64KW ||
@@ -677,7 +677,7 @@ CPU_GET_INFO( tx0_8kw )
/* execute one instruction */
-static void execute_instruction_64kw(running_device *device)
+static void execute_instruction_64kw(device_t *device)
{
tx0_state *cpustate = get_safe_token(device);
@@ -868,7 +868,7 @@ static void indexed_address_eval(tx0_state *cpustate)
}
/* execute one instruction */
-static void execute_instruction_8kw(running_device *device)
+static void execute_instruction_8kw(device_t *device)
{
tx0_state *cpustate = get_safe_token(device);
@@ -1274,7 +1274,7 @@ static void execute_instruction_8kw(running_device *device)
reset most registers and flip-flops, and initialize a few emulator state
variables.
*/
-static void pulse_reset(running_device *device)
+static void pulse_reset(device_t *device)
{
tx0_state *cpustate = get_safe_token(device);
diff --git a/src/emu/cpu/pdp1/tx0.h b/src/emu/cpu/pdp1/tx0.h
index 71875c3f8c6..d36c48082e0 100644
--- a/src/emu/cpu/pdp1/tx0.h
+++ b/src/emu/cpu/pdp1/tx0.h
@@ -35,11 +35,11 @@ struct _tx0_reset_param_t
5: reserved (for unimplemented typ instruction?)
6: p6h
7: p7h */
- void (*io_handlers[8])(running_device *device);
+ void (*io_handlers[8])(device_t *device);
/* select instruction handler */
- void (*sel_handler)(running_device *device);
+ void (*sel_handler)(device_t *device);
/* callback called when reset line is pulsed: IO devices should reset */
- void (*io_reset_callback)(running_device *device);
+ void (*io_reset_callback)(device_t *device);
};
/* PUBLIC FUNCTIONS */