get rid of signed integer division

floooh · Aug 22, 2024 · e471b78 · e471b78
1 parent 2440a20
commit e471b78
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/emus/bombjack/bombjack.zig b/emus/bombjack/bombjack.zig
@@ -12,7 +12,7 @@ export fn init() void {
     host.prof.init();
     sys.initInPlace(.{
         .audio = .{
-            .sample_rate = host.audio.sampleRate(),
+            .sample_rate = @intCast(host.audio.sampleRate()),
             .callback = host.audio.push,
         },
         .roms = .{

diff --git a/emus/kc85/kc85.zig b/emus/kc85/kc85.zig
@@ -38,7 +38,7 @@ export fn init() void {
     host.prof.init();
     sys.initInPlace(.{
         .audio = .{
-            .sample_rate = host.audio.sampleRate(),
+            .sample_rate = @intCast(host.audio.sampleRate()),
             .volume = 0.5,
             .callback = host.audio.push,
         },

diff --git a/emus/namco/namco.zig b/emus/namco/namco.zig
@@ -22,7 +22,7 @@ export fn init() void {
     host.prof.init();
     sys.initInPlace(.{
         .audio = .{
-            .sample_rate = host.audio.sampleRate(),
+            .sample_rate = @intCast(host.audio.sampleRate()),
             .callback = host.audio.push,
         },
         .roms = switch (model) {

diff --git a/src/chips/ay3891.zig b/src/chips/ay3891.zig
@@ -217,7 +217,7 @@ pub fn Type(comptime cfg: TypeConfig) type {
         }
 
         pub fn init(opts: Options) Self {
-            const sample_period: i32 = @intCast(@divFloor(opts.tick_hz * FIXEDPOINT_SCALE, opts.sound_hz));
+            const sample_period: i32 = @intCast((opts.tick_hz * FIXEDPOINT_SCALE) / opts.sound_hz);
             var self = Self{
                 .cs_mask = @as(u8, opts.chip_select) << 4,
                 .noise = .{

diff --git a/src/common/audio.zig b/src/common/audio.zig
@@ -32,7 +32,7 @@ pub fn Type(cfg: TypeConfig) type {
         /// runtime audio options
         pub const Options = struct {
             /// host audio frequency in Hz
-            sample_rate: i32,
+            sample_rate: u32,
             /// output volume modulator (0..1)
             volume: f32 = 0.75,
             /// called when new chunk of audio data is ready

diff --git a/src/systems/namco.zig b/src/systems/namco.zig
@@ -810,7 +810,7 @@ pub fn Type(comptime sys: System) type {
 
         fn initWSG(opts: Options) WSG {
             assert(opts.audio.sample_rate > 0);
-            const period: i32 = @divFloor(CPU_FREQUENCY * AUDIO.SAMPLE_SCALE, opts.audio.sample_rate);
+            const period: i32 = @intCast((CPU_FREQUENCY * AUDIO.SAMPLE_SCALE) / opts.audio.sample_rate);
             return .{
                 .tick_counter = AUDIO.PERIOD,
                 .sample_period = period,