From 7852b53acc951cc311cacd87d15198ef18d519e8 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 26 Apr 2017 00:37:25 +0200 Subject: audio: Remove Unused OPL_TYPE_* Since we removed the previous unused devices, they are not used anymore. Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-13-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.c | 16 ---------------- hw/audio/fmopl.h | 3 --- 2 files changed, 19 deletions(-) (limited to 'hw') diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index b1cb4b46d6..9171001030 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -1188,28 +1188,12 @@ unsigned char OPLRead(FM_OPL *OPL,int a) switch(OPL->address) { case 0x05: /* KeyBoard IN */ - if(OPL->type&OPL_TYPE_KEYBOARD) - { - if(OPL->keyboardhandler_r) - return OPL->keyboardhandler_r(OPL->keyboard_param); - else { - LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n")); - } - } return 0; #if 0 case 0x0f: /* ADPCM-DATA */ return 0; #endif case 0x19: /* I/O DATA */ - if(OPL->type&OPL_TYPE_IO) - { - if(OPL->porthandler_r) - return OPL->porthandler_r(OPL->port_param); - else { - LOG(LOG_WAR,("OPL:read unmapped I/O port\n")); - } - } return 0; case 0x1a: /* PCM-DATA */ return 0; diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index c23628724c..8ef0b3e3c3 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -12,9 +12,6 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param); /* !!!!! here is private section , do not access there member direct !!!!! */ #define OPL_TYPE_WAVESEL 0x01 /* waveform select */ -#define OPL_TYPE_ADPCM 0x02 /* DELTA-T ADPCM unit */ -#define OPL_TYPE_KEYBOARD 0x04 /* keyboard interface */ -#define OPL_TYPE_IO 0x08 /* I/O port */ /* Saving is necessary for member of the 'R' mark for suspend/resume */ /* ---------- OPL one of slot ---------- */ -- cgit v1.2.1