[Qemu-devel] [6541] Revert changes to fmopl.c

[Qemu-devel] [6541] Revert changes to fmopl.c

[Anthony Liguori]

Revision: 6541
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6541
Author:   aliguori
Date:     2009-02-06 00:15:19 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
Revert changes to fmopl.c

fmopl.c was taken from MAME and doesn't include QEMU header files so we cannot
use qemu_malloc in it.  It happens to build because C is a silly language.

Unfortunately, it doesn't play nicely with the QEMU headers so lets just revert
the changes that were made to it.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/fmopl.c

Modified: trunk/hw/fmopl.c
===================================================================
--- trunk/hw/fmopl.c	2009-02-05 22:36:32 UTC (rev 6540)
+++ trunk/hw/fmopl.c	2009-02-06 00:15:19 UTC (rev 6541)
@@ -619,10 +619,26 @@
 	double pom;
 
 	/* allocate dynamic tables */
-	TL_TABLE = qemu_malloc(TL_MAX*2*sizeof(INT32));
-	SIN_TABLE = qemu_malloc(SIN_ENT*4 *sizeof(INT32 *));
-	AMS_TABLE = qemu_malloc(AMS_ENT*2 *sizeof(INT32));
-	VIB_TABLE = qemu_malloc(VIB_ENT*2 *sizeof(INT32));
+	if( (TL_TABLE = malloc(TL_MAX*2*sizeof(INT32))) == NULL)
+		return 0;
+	if( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(INT32 *))) == NULL)
+	{
+		free(TL_TABLE);
+		return 0;
+	}
+	if( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(INT32))) == NULL)
+	{
+		free(TL_TABLE);
+		free(SIN_TABLE);
+		return 0;
+	}
+	if( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(INT32))) == NULL)
+	{
+		free(TL_TABLE);
+		free(SIN_TABLE);
+		free(AMS_TABLE);
+		return 0;
+	}
 	/* make total level table */
 	for (t = 0;t < EG_ENT-1 ;t++){
 		rate = ((1<<TL_BITS)-1)/pow(10,EG_STEP*t/20);	/* dB -> voltage */
@@ -1205,7 +1221,8 @@
 	if(type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
 #endif
 	/* allocate memory block */
-	ptr = qemu_malloc(state_size);
+	ptr = malloc(state_size);
+	if(ptr==NULL) return NULL;
 	/* clear */
 	memset(ptr,0,state_size);
 	OPL        = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL);