From b90cab195f3b0f1df96d517fb19bf38bbf8b5ae0 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 14 Jun 2011 14:29:57 +0000 Subject: [PATCH] Fix for listxml and centronics device (no whatsnew) --- src/emu/imagedev/printer.h | 3 --- src/emu/info.c | 2 +- src/emu/machine/ctronics.c | 8 ++++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h index b2b03750fa6..4348cf487b4 100644 --- a/src/emu/imagedev/printer.h +++ b/src/emu/imagedev/printer.h @@ -71,7 +71,4 @@ extern const device_type PRINTER; #define MCFG_PRINTER_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, PRINTER, 0) \ -#define MCFG_PRINTER_ONLINE(_online) \ - MCFG_DEVICE_CONFIG_DATAPTR(printer_interface, m_online, _online) - #endif /* __PRINTER_H__ */ diff --git a/src/emu/info.c b/src/emu/info.c index 360cbdc6c88..460cb5b03b9 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -1055,7 +1055,7 @@ void info_xml_creator::output_images() if (dev->must_be_loaded()) fprintf(m_output, " mandatory=\"1\""); - if (dev->image_interface()[0]) + if (dev->image_interface() && dev->image_interface()[0]) fprintf(m_output, " interface=\"%s\"", xml_normalize_string(dev->image_interface())); // close the XML tag diff --git a/src/emu/machine/ctronics.c b/src/emu/machine/ctronics.c index 78f35f3da98..a06cf944c8b 100644 --- a/src/emu/machine/ctronics.c +++ b/src/emu/machine/ctronics.c @@ -71,10 +71,14 @@ const centronics_interface standard_centronics = /***************************************************************************** PRINTER INTERFACE *****************************************************************************/ +const struct printer_interface centronics_printer_config = +{ + DEVCB_LINE(centronics_printer_online) +}; static MACHINE_CONFIG_FRAGMENT( centronics ) MCFG_PRINTER_ADD("printer") - MCFG_PRINTER_ONLINE(centronics_printer_online) + MCFG_DEVICE_CONFIG(centronics_printer_config) MACHINE_CONFIG_END @@ -151,7 +155,7 @@ DEVICE_GET_INFO( centronics ) sets us busy when the printer goes offline -------------------------------------------------*/ -void centronics_printer_online(device_t *device, int state) +WRITE_LINE_DEVICE_HANDLER(centronics_printer_online) { centronics_state *centronics = get_safe_token(device->owner());