Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.

src/sound/dbopl.cpp

@@ -20,10 +20,9 @@
 
 /* $Id: dbopl.cpp,v 1.10 2009-06-10 19:54:51 harekiet Exp $ */
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-//#include "dosbox.h"
+#include <math.h>
 #include "dbopl.h"
 
 

src/sound/midi.c

@@ -1,24 +1,26 @@
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include "../device.h"
-#include "midi.h"
 #include "../ibm.h"
-
 #include "../win/plat_midi.h"
 #include "../win/plat_ticks.h"
+#include "midi.h"
+#include "midi_system.h"
 #ifdef USE_FLUIDSYNTH
 # include "midi_fluidsynth.h"
 #endif
 #ifdef USE_MUNT
 # include "midi_mt32.h"
 #endif
-#include "midi_system.h"
+
 
 int midi_device_current = 0;
 static int midi_device_last = 0;
 
+
 typedef struct
 {
         const char *name;

src/sound/midi_fluidsynth.c

@@ -1,23 +1,26 @@
 /* some code borrowed from scummvm */
 #ifdef USE_FLUIDSYNTH
 
-
-#include <stdlib.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include <fluidsynth.h>
 #include "../config.h"
 #include "../win/plat_dynld.h"
 #include "../win/plat_thread.h"
 #include "../win/plat_ui.h"
 #include "../device.h"
-#include "midi_fluidsynth.h"
 #include "midi.h"
+#include "midi_fluidsynth.h"
 #include "sound.h"
 
+
 #define RENDER_RATE 100
 #define BUFFER_SEGMENTS 10
 
+
 extern void givealbuffer_midi(void *buf, uint32_t size);
 extern void pclog(const char *format, ...);
 extern void al_set_midi(int freq, int buf_size);

src/sound/midi_mt32.c

@@ -1,15 +1,18 @@
+#include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include "munt/c_interface/c_interface.h"
 #include "../win/plat_thread.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../mem.h"
 #include "../rom.h"
-#include "midi_mt32.h"
-#include "midi.h"
 #include "sound.h"
+#include "midi.h"
+#include "midi_mt32.h"
+
 
 extern void givealbuffer_midi(void *buf, uint32_t size);
 extern void pclog(const char *format, ...);

src/sound/midi_system.c

@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include "../device.h"
 #include "../win/plat_midi.h"
-#include "midi_system.h"
 #include "midi.h"
+#include "midi_system.h"
+
 
 void* system_midi_init()
 {

src/sound/openal.c

@@ -1,7 +1,9 @@
 #define USE_OPENAL
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #ifdef USE_OPENAL
 # undef AL_API
 # undef ALC_API

src/sound/snd_ad1848.c

@@ -2,6 +2,10 @@
 
   AD1848 CODEC emulation (Windows Sound System compatible)*/
 
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
 #include <math.h>
 #include "../ibm.h"
 #include "../dma.h"

src/sound/snd_adlib.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../mca.h"

src/sound/snd_adlibgold.c

@@ -1,5 +1,8 @@
-#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../dma.h"

src/sound/snd_cms.c

@@ -1,5 +1,8 @@
 #include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../device.h"

src/sound/snd_emu8k.c

@@ -1,14 +1,18 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include <math.h>
 #include "../ibm.h"
 #include "../device.h"
 #include "../io.h"
 #include "../mem.h"
 #include "../rom.h"
+#include "../timer.h"
 #include "sound.h"
 #include "snd_emu8k.h"
-#include "../timer.h"
-#include <inttypes.h>
+
 
 #if !defined FILTER_INITIAL && !defined FILTER_MOOG && !defined FILTER_CONSTANT
 #define FILTER_MOOG
@@ -2088,7 +2092,7 @@ void emu8k_init(emu8k_t *emu8k, int onboard_ram)
         int c;
         double out;
  
-        f = romfopen(L"roms/sound/awe32.raw", L"rb");
+        f = rom_fopen(L"roms/sound/awe32.raw", L"rb");
         if (!f)
                 fatal("AWE32.RAW not found\n");
         

src/sound/snd_gus.c

@@ -1,6 +1,8 @@
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../pic.h"

src/sound/snd_lpt_dac.c

@@ -1,11 +1,15 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../cpu/cpu.h"
-#include "filters.h"
 #include "../lpt.h"
-#include "snd_lpt_dac.h"
-#include "sound.h"
 #include "../timer.h"
+#include "sound.h"
+#include "filters.h"
+#include "snd_lpt_dac.h"
 
 typedef struct lpt_dac_t
 {

src/sound/snd_lpt_dss.c

@@ -1,11 +1,15 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../cpu/cpu.h"
-#include "filters.h"
-#include "../lpt.h"
-#include "snd_lpt_dss.h"
-#include "sound.h"
 #include "../timer.h"
+#include "../lpt.h"
+#include "sound.h"
+#include "filters.h"
+#include "snd_lpt_dss.h"
 
 typedef struct dss_t
 {

src/sound/snd_mpu401.c

@@ -8,29 +8,31 @@
  *
  *		Roland MPU-401 emulation.
  *
- * Version:	@(#)sound_mpu401.c	1.0.1	2017/06/19
+ * Version:	@(#)snd_mpu401.c	1.0.2	2017/09/24
  *
- * Author:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		DOSBox Team,
  *		Miran Grca, <mgrca8@gmail.com>
  *		TheCollector1995, <mariogplayer@gmail.com>
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2008-2017 DOSBox Team.
- *		Copyright 2016-2017 Miran Grca.
- *		Copyright 2016-2017 TheCollector1995.
+ *		Copyright 2016,2017 Miran Grca.
  */
-
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../device.h"
 #include "../io.h"
 #include "../pic.h"
 #include "../timer.h"
-#include "midi.h"
 #include "sound.h"
 #include "snd_mpu401.h"
+#include "midi.h"
 
-#include <malloc.h>
-#include <stdarg.h>
 
 enum
 {

src/sound/snd_opl.c

@@ -1,8 +1,11 @@
 /* Copyright holders: Sarah Walker, SA1988
    see COPYING for more details
 */
+#include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../timer.h"
@@ -11,7 +14,7 @@
 #include "snd_dbopl.h"
 
 
-/*Interfaces between PCem and the actual OPL emulator*/
+/*Interfaces between 86Box and the actual OPL emulator*/
 
 
 uint8_t opl2_read(uint16_t a, void *priv)

src/sound/snd_pas16.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../pic.h"
@@ -7,10 +11,10 @@
 #include "../timer.h"
 #include "../device.h"
 #include "sound.h"
+#include "filters.h"
 #include "snd_opl.h"
 #include "snd_pas16.h"
 #include "snd_sb_dsp.h"
-#include "filters.h"
 
 
 /*      Original PAS uses

src/sound/snd_ps1.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../pic.h"

src/sound/snd_pssj.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../dma.h"

src/sound/snd_sb.c

@@ -8,17 +8,19 @@
  *
  *		Sound Blaster emulation.
  *
- * Version:	@(#)sound_sb.c	1.0.0	2017/05/30
+ * Version:	@(#)sound_sb.c	1.0.1	2017/09/24
  *
- * Author:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		TheCollector1995, <mariogplayer@gmail.com>
  *		Copyright 2008-2017 Sarah Walker.
- *		Copyright 2016-2017 Miran Grca.
- *		Copyright 2016-2017 TheCollector1995.
+ *		Copyright 2016,2017 Miran Grca.
  */
-
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../mca.h"
@@ -26,13 +28,13 @@
 #include "../rom.h"
 #include "../device.h"
 #include "sound.h"
+#include "filters.h"
 #include "snd_dbopl.h"
 #include "snd_emu8k.h"
 #include "snd_mpu401.h"
 #include "snd_opl.h"
 #include "snd_sb.h"
 #include "snd_sb_dsp.h"
-#include "filters.h"
 
 
 typedef struct sb_mixer_t

src/sound/snd_sb_dsp.c

@@ -3,16 +3,18 @@
   486-33 - 20kHz
   486-50 - 32kHz
   Pentium - 45kHz*/
-#include <stdint.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../pic.h"
 #include "../dma.h"
 #include "../timer.h"
 #include "../device.h"
-#include "midi.h"
 #include "sound.h"
+#include "midi.h"
 #include "snd_mpu401.h"
 #include "snd_sb_dsp.h"
 

src/sound/snd_sn76489.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include <time.h>
 #include "../ibm.h"
 #include "../io.h"

src/sound/snd_speaker.c

@@ -1,3 +1,7 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "sound.h"
 #include "snd_speaker.h"

src/sound/snd_ssi2001.c

@@ -1,4 +1,8 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../io.h"
 #include "../device.h"

src/sound/snd_wss.c

@@ -2,7 +2,11 @@
 
   Windows Sound System emulation*/
 
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include <math.h>  
 #include "../ibm.h"
 #include "../io.h"

src/sound/snd_ym7128.c

@@ -1,3 +1,7 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "snd_ym7128.h"
 

src/sound/sound.c

@@ -8,23 +8,25 @@
  *
  *		Sound emulation core.
  *
- * Version:	@(#)sound.c	1.0.3	2017/09/03
+ * Version:	@(#)sound.c	1.0.4	2017/09/24
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
-#include <stdint.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <string.h>
 #include <stdlib.h>
+#include <wchar.h>
 #include "../ibm.h"
 #include "../device.h"
 #include "../timer.h"
 #include "../cdrom/cdrom.h"
 #include "../win/plat_thread.h"
-#include "midi.h"
 #include "sound.h"
+#include "midi.h"
 #include "snd_opl.h"
 #include "snd_adlib.h"
 #include "snd_adlibgold.h"