summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/3812intf.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound/3812intf.h')
-rw-r--r--src/emu/sound/3812intf.h64
1 files changed, 9 insertions, 55 deletions
diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h
index bd7c5ac818c..7f1fe932cdb 100644
--- a/src/emu/sound/3812intf.h
+++ b/src/emu/sound/3812intf.h
@@ -3,67 +3,21 @@
#ifndef __3812INTF_H__
#define __3812INTF_H__
-
typedef struct _ym3812_interface ym3812_interface;
struct _ym3812_interface
{
- void (*handler)(running_machine *machine, int linestate);
+ void (*handler)(const device_config *device, int linestate);
};
-#define ym3526_interface ym3812_interface
-
-typedef struct _y8950_interface y8950_interface;
-struct _y8950_interface
-{
- void (*handler)(running_machine *machine, int linestate);
-
- read8_device_func keyboardread;
- write8_device_func keyboardwrite;
- read8_device_func portread;
- write8_device_func portwrite;
-};
-
-
-/* YM3812 */
-READ8_HANDLER ( ym3812_status_port_0_r );
-WRITE8_HANDLER( ym3812_control_port_0_w );
-READ8_HANDLER( ym3812_read_port_0_r );
-WRITE8_HANDLER( ym3812_write_port_0_w );
-
-READ8_HANDLER ( ym3812_status_port_1_r );
-WRITE8_HANDLER( ym3812_control_port_1_w );
-READ8_HANDLER( ym3812_read_port_1_r );
-WRITE8_HANDLER( ym3812_write_port_1_w );
-
-SND_GET_INFO( ym3812 );
-#define SOUND_YM3812 SND_GET_INFO_NAME( ym3812 )
-
-/* YM3526 */
-READ8_HANDLER ( ym3526_status_port_0_r );
-WRITE8_HANDLER( ym3526_control_port_0_w );
-READ8_HANDLER( ym3526_read_port_0_r );
-WRITE8_HANDLER( ym3526_write_port_0_w );
-
-READ8_HANDLER ( ym3526_status_port_1_r );
-WRITE8_HANDLER( ym3526_control_port_1_w );
-READ8_HANDLER( ym3526_read_port_1_r );
-WRITE8_HANDLER( ym3526_write_port_1_w );
-
-SND_GET_INFO( ym3526 );
-#define SOUND_YM3526 SND_GET_INFO_NAME( ym3526 )
-
-/* Y8950 */
-READ8_HANDLER ( y8950_status_port_0_r );
-WRITE8_HANDLER( y8950_control_port_0_w );
-READ8_HANDLER ( y8950_read_port_0_r );
-WRITE8_HANDLER( y8950_write_port_0_w );
+READ8_DEVICE_HANDLER( ym3812_r );
+WRITE8_DEVICE_HANDLER( ym3812_w );
-READ8_HANDLER ( y8950_status_port_1_r );
-WRITE8_HANDLER( y8950_control_port_1_w );
-READ8_HANDLER ( y8950_read_port_1_r );
-WRITE8_HANDLER( y8950_write_port_1_w );
+READ8_DEVICE_HANDLER( ym3812_status_port_r );
+READ8_DEVICE_HANDLER( ym3812_read_port_r );
+WRITE8_DEVICE_HANDLER( ym3812_control_port_w );
+WRITE8_DEVICE_HANDLER( ym3812_write_port_w );
-SND_GET_INFO( y8950 );
-#define SOUND_Y8950 SND_GET_INFO_NAME( y8950 )
+DEVICE_GET_INFO( ym3812 );
+#define SOUND_YM3812 DEVICE_GET_INFO_NAME( ym3812 )
#endif /* __3812INTF_H__ */