[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1042-g7b0304a

[darcagn <da...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  7b0304a5462a93cdbb247b05d5652fe8cf65d290 (commit)
       via  6a427e8ec7f4131f95d4bd12fa48f849ac3de3ca (commit)
      from  a98b02e22ee448b3d3f82193dbf3ed11f5616244 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b0304a5462a93cdbb247b05d5652fe8cf65d290
Merge: a98b02e 6a427e8
Author: darcagn <da...@pr...>
Date:   Sat Sep 2 11:05:12 2023 -0500

    Merge pull request #287 from KallistiOS/vmu_beep_fix
    
    Fixing missing vmu_beep_waveform() symbol

commit 6a427e8ec7f4131f95d4bd12fa48f849ac3de3ca
Author: Falco Girgis <gyr...@gm...>
Date:   Sat Sep 2 01:45:43 2023 -0500

    Fixing missing vmu_beep_waveform() symbol
    
    - Big VMU driver update accidentally had a name mismatch between the
      header and source file
    - vmu_beep_waveform() would've been an unresolved symbol if used
    - changed vmu_beep() in vmu.c to vmu_beep_waveform(), as advertised in
      the header

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/hardware/maple/vmu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/maple/vmu.c b/kernel/arch/dreamcast/hardware/maple/vmu.c
index fb6a0f0..6abdb59 100644
--- a/kernel/arch/dreamcast/hardware/maple/vmu.c
+++ b/kernel/arch/dreamcast/hardware/maple/vmu.c
@@ -287,8 +287,10 @@ int vmu_beep_raw(maple_device_t *dev, uint32_t beep) {
     return MAPLE_EOK;
 }
 
-int vmu_beep(maple_device_t *dev, uint8_t period, uint8_t duty) {
-    const uint32_t raw_beep = ((period << 24) | ((period - duty)) << 16);
+int vmu_beep_waveform(maple_device_t *dev, uint8_t period1, uint8_t duty_cycle1, uint8_t period2, uint8_t duty_cycle2) {
+    const uint32_t raw_beep = (((period2 - duty_cycle2) << 24) | (period2 << 16) |
+                               ((period1 - duty_cycle1) <<  8) | (period1));
+
     return vmu_beep_raw(dev, raw_beep);
 }
 


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.