summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/z80sio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/machine/z80sio.c')
-rw-r--r--src/emu/machine/z80sio.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index 0df63d098d0..a449ae6d400 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -179,12 +179,12 @@ struct _z80sio
sio_channel chan[2]; /* 2 channels */
UINT8 int_state[8]; /* interrupt states */
- void (*irq_cb)(const device_config *device, int state);
+ void (*irq_cb)(running_device *device, int state);
write8_device_func dtr_changed_cb;
write8_device_func rts_changed_cb;
write8_device_func break_changed_cb;
write8_device_func transmit_cb;
- int (*receive_poll_cb)(const device_config *device, int channel);
+ int (*receive_poll_cb)(running_device *device, int channel);
};
@@ -253,9 +253,9 @@ static TIMER_CALLBACK( serial_callback );
FUNCTION PROTOTYPES
***************************************************************************/
-static int z80sio_irq_state(const device_config *device);
-static int z80sio_irq_ack(const device_config *device);
-static void z80sio_irq_reti(const device_config *device);
+static int z80sio_irq_state(running_device *device);
+static int z80sio_irq_ack(running_device *device);
+static void z80sio_irq_reti(running_device *device);
@@ -263,7 +263,7 @@ static void z80sio_irq_reti(const device_config *device);
INLINE FUNCTIONS
***************************************************************************/
-INLINE z80sio *get_safe_token(const device_config *device)
+INLINE z80sio *get_safe_token(running_device *device)
{
assert(device != NULL);
assert(device->token != NULL);
@@ -272,7 +272,7 @@ INLINE z80sio *get_safe_token(const device_config *device)
}
-INLINE void interrupt_check(const device_config *device)
+INLINE void interrupt_check(running_device *device)
{
/* if we have a callback, update it with the current state */
z80sio *sio = get_safe_token(device);
@@ -297,7 +297,7 @@ INLINE attotime compute_time_per_character(z80sio *sio, int which)
reset_channel - reset a single SIO channel
-------------------------------------------------*/
-static void reset_channel(const device_config *device, int ch)
+static void reset_channel(running_device *device, int ch)
{
z80sio *sio = get_safe_token(device);
attotime tpc = compute_time_per_character(sio, ch);
@@ -524,7 +524,7 @@ READ8_DEVICE_HANDLER( z80sio_get_rts )
static TIMER_CALLBACK( change_input_line )
{
- const device_config *device = (const device_config *)ptr;
+ running_device *device = (running_device *)ptr;
z80sio *sio = get_safe_token(device);
sio_channel *chan = &sio->chan[param & 1];
UINT8 line = (param >> 8) & 0xff;
@@ -607,7 +607,7 @@ WRITE8_DEVICE_HANDLER( z80sio_receive_data )
static TIMER_CALLBACK( serial_callback )
{
- const device_config *device = (const device_config *)ptr;
+ running_device *device = (running_device *)ptr;
z80sio *sio = get_safe_token(device);
sio_channel *chan = &sio->chan[param];
int ch = param;
@@ -699,7 +699,7 @@ static const UINT8 int_priority[] =
};
-static int z80sio_irq_state(const device_config *device)
+static int z80sio_irq_state(running_device *device)
{
z80sio *sio = get_safe_token(device);
int state = 0;
@@ -727,7 +727,7 @@ static int z80sio_irq_state(const device_config *device)
}
-static int z80sio_irq_ack(const device_config *device)
+static int z80sio_irq_ack(running_device *device)
{
z80sio *sio = get_safe_token(device);
int i;
@@ -754,7 +754,7 @@ static int z80sio_irq_ack(const device_config *device)
}
-static void z80sio_irq_reti(const device_config *device)
+static void z80sio_irq_reti(running_device *device)
{
z80sio *sio = get_safe_token(device);
int i;
@@ -782,7 +782,7 @@ static void z80sio_irq_reti(const device_config *device)
static DEVICE_START( z80sio )
{
- const z80sio_interface *intf = (const z80sio_interface *)device->static_config;
+ const z80sio_interface *intf = (const z80sio_interface *)device->baseconfig().static_config;
z80sio *sio = get_safe_token(device);
void *ptr = (void *)device;
astring tempstring;