APU init

.gitignore

@@ -1,6 +1,8 @@
 .vs/
+.vscode/
 build/
 *.DS_Store
 cmake-build-debug/
 .idea/
 src/.vscode/
+CMakeSettings.json

CMakeLists.txt

@@ -8,9 +8,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON")
 
+find_package(SDL2 REQUIRED)
+
 if (DEBUG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG")
 endif()
 
 add_executable(${PROJECT_NAME} src/main.cpp)
+target_link_libraries(${PROJECT_NAME} SDL2::SDL2 SDL2::SDL2main)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -5,6 +5,7 @@ set(SOURCES
         gameBoy.cpp
         mmap.cpp
         graphics.cpp
+        sound.cpp
 
         # -------
         # Header Files
@@ -13,6 +14,7 @@ set(SOURCES
         mmap.h
         types.h
         graphics.h
+        sound.h
         )
 
 target_sources(${PROJECT_NAME} PRIVATE ${SOURCES})

src/gameBoy.cpp

@@ -15,6 +15,10 @@ GBE::GBE()
 	// Initialize the Graphics
 	gbe_graphics = new PPU();
 
+	// Initialize the APU
+	gbe_sound = new APU();
+
+
 	// Unify the CPU and MemoryMap
 	gbe_cpu->setMemory(gbe_mMap);
 
@@ -24,14 +28,19 @@ GBE::GBE()
 	// Unify the PPU and MmeoryMap
 	gbe_graphics->setMemoryMap(gbe_mMap);
 
+	// Unify the CPU and MemoryMap
+	gbe_sound->setMemoryMap(gbe_mMap);
+
+	gbe_sound->test();
+
 	gbe_graphics->init();
 
 	// Open the Boot ROM
-	if ((bootROM = fopen("../src/dmg_boot.gb", "rb")) == NULL)
+	if ((bootROM = fopen("../../../src/dmg_boot.gb", "rb")) == NULL)
 		printf("boot rom file not opened");
 
 	// Open the Game ROM
-	if ((gameROM = fopen("../tests/pkmnred.gb", "rb")) == NULL)
+	if ((gameROM = fopen("../../../tests/pacman.gb", "rb")) == NULL)
 		printf("game rom file not opened");
 
 	// Set the Boot ROM
@@ -98,7 +107,6 @@ GBE::GBE()
 	gbe_mMap->debugWriteMemory(0x133, 0x3E);
 
 	executeBootROM();
-
 	update();
 }
 

src/gameBoy.h

@@ -3,6 +3,7 @@
 #include "cpu.h"
 #include "mmap.h"
 #include "graphics.h"
+#include "sound.h"
 
 // GBE stands for GameBoyEmulator
 
@@ -28,6 +29,9 @@ class GBE
 	// Pointer to the Graphics
 	PPU* gbe_graphics;
 
+	// Pointer to the Sound
+	APU* gbe_sound;
+
 	// File pointer for Boot ROM
 	FILE* bootROM;
 

src/graphics.cpp

@@ -35,7 +35,7 @@ PPU::PPU()
 bool PPU::init()
 {
 	// Initialize SDL
-	if (SDL_Init(SDL_INIT_VIDEO) < 0)
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0)
 	{
 		printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
 		return false;

src/mmap.cpp

@@ -419,7 +419,7 @@ void MemoryMap::mapRom()
 
 	// Set the RAM Existence Mask
 	// Tells if External RAM is available in the Cartridge
-	if ((mbcMode == 2 or mbcMode == 3) and ramBanks > 0)
+	if ((mbcMode == 2 || mbcMode == 3) && ramBanks > 0)
 	{
 		ramExistenceMask = 1;
 	}

src/sound.cpp

@@ -0,0 +1,17 @@
+#include "sound.h"
+#include "types.h"
+
+APU::APU()
+{
+    mMap = nullptr;
+
+}
+
+void APU::test()
+{
+    for (int i = 0; i < 0x20; i++)
+    {
+    printf("------------------------ at register FF%d: %d\n\n", i, mMap->readMemory(0xff10 + i) );
+    }
+
+}

src/sound.h

@@ -0,0 +1,74 @@
+#pragma once
+#include "types.h"
+#include "mmap.h"
+#include <stdio.h>
+#include <SDL.h>
+
+
+class MasterController
+{
+
+};
+
+class PulseChannel
+{
+private:
+    // https://gbdev.io/pandocs/Audio_Registers.html
+
+    // NRx0 
+    Byte sweepPace;
+    Byte sweepChange;
+    Byte sweepSlope;
+
+    // NRx1 
+    Byte waveDuty;
+    Byte lengthTimer;
+
+    // NRx2
+    Byte envelopeVolume;
+    Byte envelopeDirection;
+    Byte envelopeSweepPace;
+
+    // Nrx3
+    // needs 11 bits - 3 bits from NRX4 + 8 bits from NRx3  
+    Word periodValue; 
+
+    // NRx4
+    bool trigger;
+    bool soundLengthEnable;
+
+
+
+};
+
+class WaveChannel
+{
+private:
+
+};
+
+class NoiseChannel
+{
+private:
+
+};
+
+
+class APU
+{
+private:
+    // memory map     
+    MemoryMap* mMap;
+
+    PulseChannel* channel1;
+    PulseChannel* channel2;
+
+    // WaveChannel* channel3;
+
+    // NoiseChannel* channel4;
+
+public:
+    APU();
+    void setMemoryMap(MemoryMap* m){ mMap = m; }
+    void test();
+};