Compile SGU1 as C code

Author: smokku

CMakeLists.txt

@@ -35,7 +35,7 @@ add_executable(emu
     src/chips/pwm.c
     src/chips/cgia.c
     src/chips/ria816.c
-    src/chips/sgu1.cc
+    src/chips/sgu1.c
     src/chips/tca6416a.c
     src/systems/x65.c
     src/x65.c

ext/CMakeLists.txt

@@ -1,11 +1,11 @@
 include_directories(imgui)
 
 add_library(imgui-docking STATIC
-	imgui/imgui.cpp
-	imgui/imgui.h
-	imgui/imstb_rectpack.h
-	imgui/imstb_textedit.h
-	imgui/imstb_truetype.h
+    imgui/imgui.cpp
+    imgui/imgui.h
+    imgui/imstb_rectpack.h
+    imgui/imstb_textedit.h
+    imgui/imstb_truetype.h
     imgui/imgui_demo.cpp
     imgui/imgui_draw.cpp
     imgui/imgui_internal.h
@@ -14,7 +14,7 @@ add_library(imgui-docking STATIC
 )
 
 add_library(imgui-toggle STATIC
-	imgui_toggle/imgui_offset_rect.h
+    imgui_toggle/imgui_offset_rect.h
     imgui_toggle/imgui_toggle.cpp
     imgui_toggle/imgui_toggle.h
     imgui_toggle/imgui_toggle_math.h
@@ -27,7 +27,7 @@ add_library(imgui-toggle STATIC
 )
 
 add_library(speex-resampler STATIC
-	speexdsp/libspeexdsp/resample.c
+    speexdsp/libspeexdsp/resample.c
 )
 target_include_directories(speex-resampler PUBLIC
     speexdsp/include

src/chips/sgu1.cc src/chips/sgu1.csrc/chips/sgu1.cc renamed to src/chips/sgu1.c

@@ -33,7 +33,6 @@ void sgu1_init(sgu1_t* sgu, const sgu1_desc_t* desc) {
     sgu->sample_period = (desc->tick_hz * SGU1_FIXEDPOINT_SCALE) / desc->sound_hz;
     sgu->sample_counter = sgu->sample_period;
     sgu->sample_mag = desc->magnitude;
-    // sgu->sample_accum_count[0] = sgu->sample_accum_count[1] = 1.0f;
     sgu->tick_period = (desc->tick_hz * SGU1_FIXEDPOINT_SCALE) / (CHIP_CLOCK / CHIP_DIVIDER);
     sgu->tick_counter = sgu->tick_period;
     SoundUnit_Init(&sgu->su, 65536, false);
@@ -65,7 +64,7 @@ static uint64_t _sgu1_tick(sgu1_t* sgu, uint64_t pins) {
         speex_resampler_process_interleaved_float(sgu->resampler, in, &in_len, sgu->sample, &out_len);
 
         for (int i = 0; i < SGU1_NUM_CHANNELS; i++) {
-            sgu->voice[i].sample_buffer[sgu->voice[i].sample_pos++] = (float)SoundUnit_GetSample(&sgu->su, i);
+            sgu->voice[i].sample_buffer[sgu->voice[i].sample_pos++] = (float)(SoundUnit_GetSample(&sgu->su, i));
             if (sgu->voice[i].sample_pos >= SGU1_AUDIO_SAMPLES) {
                 sgu->voice[i].sample_pos = 0;
             }

src/chips/su/su.h

@@ -106,7 +106,7 @@ void SoundUnit_Init(SoundUnit* su, size_t sampleMemSize, bool dsOutMode);
 void SoundUnit_Reset(SoundUnit* su);
 void SoundUnit_Write(SoundUnit* su, uint8_t addr, uint8_t data);
 void SoundUnit_NextSample(SoundUnit* su, int16_t* l, int16_t* r);
-inline int32_t SoundUnit_GetSample(SoundUnit* su, int32_t ch) {
+static inline int32_t SoundUnit_GetSample(SoundUnit* su, int32_t ch) {
     int32_t ret = (su->nsL[ch] + su->nsR[ch]) >> 1;
     if (ret < -32768) ret = -32768;
     if (ret > 32767) ret = 32767;