[eframe] Rename crate

marcellocordeiro · Jan 21, 2024 · d8a2762 · d8a2762
1 parent ccf9abd
commit d8a2762
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 /build
 /target
 
-# Created by https://www.toptal.com/developers/gitignore/api/swiftpackagemanager,xcode,macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=swiftpackagemanager,xcode,macos
+# Created by https://www.toptal.com/developers/gitignore/api/macos,xcode
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,xcode
 
 ### macOS ###
 # General
@@ -37,14 +37,6 @@ Temporary Items
 # iCloud generated files
 *.icloud
 
-### SwiftPackageManager ###
-Packages
-.build/
-xcuserdata
-DerivedData/
-*.xcodeproj
-
-
 ### Xcode ###
 ## User settings
 xcuserdata/
@@ -62,7 +54,7 @@ xcuserdata/
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
 
-# End of https://www.toptal.com/developers/gitignore/api/swiftpackagemanager,xcode,macos
+# End of https://www.toptal.com/developers/gitignore/api/macos,xcode
 
 # Logs
 logs

diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ members = [
   "core/gb-core-c",
   "core/gb-core-wasm",
   "core/gb-opcode-info",
-  "platform/eframe-rust",
+  "platform/eframe",
   "platform/libretro",
   "platform/sdl2-rust",
 ]

diff --git a/core/gb-core/src/audio.rs b/core/gb-core/src/audio.rs
@@ -18,21 +18,66 @@ impl Audio {
     pub fn read(&self, address: u16) -> u8 {
         match address {
             // TODO: stubs for the DMG.
+
+            // Channel 1
+
+            // FF10 — NR10: Channel 1 sweep
             0xFF10 => 0x80,
+
+            // FF11 — NR11: Channel 1 length timer & duty cycle
             0xFF11 => 0xBF,
+
+            // FF12 — NR12: Channel 1 volume & envelope
             0xFF12 => 0xF3,
+
+            // FF13 — NR13: Channel 1 period low [write-only]
+            0xFF13 => panic!("NR13 is write-only"),
+
+            // FF14 — NR14: Channel 1 period high & control
             0xFF14 => 0xBF,
+
+            // Channel 2
+
+            // FF16 — NR21: Channel 2 length timer & duty cycle
             0xFF16 => 0x3F,
+
+            // FF12 — NR22: Channel 2 volume & envelope
             0xFF17 => 0x00,
+
+            // FF18 — NR23: Channel 2 period low [write-only]
+            0xFF18 => panic!("NR23 is write-only"),
+
+            // FF19 — NR24: Channel 2 period high & control
             0xFF19 => 0xBF,
+
+            // Channel 3
+
+            // FF1A — NR30: Channel 3 DAC enable
             0xFF1A => 0x7F,
+
+            // FF1B — NR31: Channel 3 length timer [write-only]
+            0xFF1B => panic!("NR31 is write-only"),
+
+            // FF1C — NR32: Channel 3 output level
             0xFF1C => 0x9F,
+
+            // FF1D — NR33: Channel 3 period low [write-only]
+            0xFF1D => panic!("NR33 is write-only"),
+
+            // FF1E — NR34: Channel 3 period high & control
             0xFF1E => 0xBF,
+
             0xFF21 => 0x00,
             0xFF22 => 0x00,
             0xFF23 => 0xBF,
+
+            // FF24 — NR50: Master volume & VIN panning
             0xFF24 => 0x77,
+
+            // FF25 — NR51: Sound panning
             0xFF25 => 0xF3,
+
+            // FF26 — NR52: Audio master control
             0xFF26 => 0xF1,
 
             0xFF76 => {
@@ -51,6 +96,7 @@ impl Audio {
                 0x00
             }
 
+            // _ => panic!("Invalid address"),
             _ => 0xFF,
         }
     }

diff --git a/platform/eframe-rust/Cargo.toml → platform/eframe/Cargo.toml b/platform/eframe-rust/Cargo.toml → platform/eframe/Cargo.toml
diff --git a/platform/eframe-rust/src/app.rs → platform/eframe/src/app.rs b/platform/eframe-rust/src/app.rs → platform/eframe/src/app.rs
diff --git a/platform/eframe-rust/src/cartridge.rs → platform/eframe/src/cartridge.rs b/platform/eframe-rust/src/cartridge.rs → platform/eframe/src/cartridge.rs
diff --git a/platform/eframe-rust/src/gui.rs → platform/eframe/src/gui.rs b/platform/eframe-rust/src/gui.rs → platform/eframe/src/gui.rs
diff --git a/...ame-rust/src/gui/components/color_rect.rs → ...m/eframe/src/gui/components/color_rect.rs b/...ame-rust/src/gui/components/color_rect.rs → ...m/eframe/src/gui/components/color_rect.rs
diff --git a/...orm/eframe-rust/src/gui/components/mod.rs → platform/eframe/src/gui/components/mod.rs b/...orm/eframe-rust/src/gui/components/mod.rs → platform/eframe/src/gui/components/mod.rs
diff --git a/platform/eframe-rust/src/gui/control.rs → platform/eframe/src/gui/control.rs b/platform/eframe-rust/src/gui/control.rs → platform/eframe/src/gui/control.rs
diff --git a/platform/eframe-rust/src/gui/palettes.rs → platform/eframe/src/gui/palettes.rs b/platform/eframe-rust/src/gui/palettes.rs → platform/eframe/src/gui/palettes.rs
diff --git a/platform/eframe-rust/src/gui/screen_area.rs → platform/eframe/src/gui/screen_area.rs b/platform/eframe-rust/src/gui/screen_area.rs → platform/eframe/src/gui/screen_area.rs
diff --git a/platform/eframe-rust/src/gui/state.rs → platform/eframe/src/gui/state.rs b/platform/eframe-rust/src/gui/state.rs → platform/eframe/src/gui/state.rs
diff --git a/platform/eframe-rust/src/gui/tiles.rs → platform/eframe/src/gui/tiles.rs b/platform/eframe-rust/src/gui/tiles.rs → platform/eframe/src/gui/tiles.rs
diff --git a/platform/eframe-rust/src/key_mappings.rs → platform/eframe/src/key_mappings.rs b/platform/eframe-rust/src/key_mappings.rs → platform/eframe/src/key_mappings.rs
diff --git a/platform/eframe-rust/src/main.rs → platform/eframe/src/main.rs b/platform/eframe-rust/src/main.rs → platform/eframe/src/main.rs
diff --git a/platform/eframe-rust/src/utils/mod.rs → platform/eframe/src/utils/mod.rs b/platform/eframe-rust/src/utils/mod.rs → platform/eframe/src/utils/mod.rs
diff --git a/platform/eframe-rust/src/utils/scaling.rs → platform/eframe/src/utils/scaling.rs b/platform/eframe-rust/src/utils/scaling.rs → platform/eframe/src/utils/scaling.rs