Skip to content

Commit e084512

Browse files
committed
audio_driver: Drop audio_driver in favour of kuKernelCall
1 parent 3fa4844 commit e084512

8 files changed

Lines changed: 23 additions & 67 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ Mkfile.old
5454
dkms.conf
5555

5656
# CMFileManager PSP Specific objects
57-
app/drivers/audio_driver.S
5857
app/drivers/display_driver.S
5958
app/drivers/fs_driver.S
6059
app/drivers/module_driver.S

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS = audio_driver display_driver fs_driver module_driver app launcher
1+
SUBDIRS = display_driver fs_driver module_driver app launcher
22

33
all:
44
@for dir in $(SUBDIRS); do $(MAKE) -C $$dir; done

app/include/kernel_functions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extern "C" {
1212
// Kernel function prototypes
1313

1414
// audio_driver functions
15-
extern int pspAudioSetFrequency(int frequency);
15+
int pspAudioSetFrequency(int frequency);
1616

1717
// display_driver functions
1818
extern int pspDisplayEnable(void);

app/source/kernel_functions.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
1+
#include <pspaudio_kernel.h>
2+
13
#include "kernel_functions.h"
4+
#include "kubridge.h"
5+
#include "log.h"
6+
#include "systemctrl.h"
7+
#include "utils.h"
28

39
// audio_driver functions
4-
int pspAudioSetFrequency(int frequency);
10+
int pspAudioSetFrequency(int frequency) {
11+
struct KernelCallArg args = { 0 };
12+
void *func_addr = nullptr;
13+
int ret = 0;
14+
15+
func_addr = (void*)sctrlHENFindFunction("sceAudio_driver", "sceAudio_driver", 0xA2BEAA6C);
16+
args.arg1 = static_cast<u32>(frequency);
17+
18+
if (R_FAILED(ret = kuKernelCall(func_addr, &args)))
19+
Log::Error("%s: pspAudioSetFrequency returns 0x%08X\n", __func__, args.ret1);
20+
21+
return args.ret1;
22+
}
523

624
// display driver functions
725
int pspDisplayEnable(void);

app/source/utils.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ enum PspCtrlButtons PSP_CTRL_ENTER, PSP_CTRL_CANCEL;
2121
BROWSE_STATE device = BROWSE_STATE_EXTERNAL;
2222
int g_psp_language = PSP_SYSTEMPARAM_LANGUAGE_ENGLISH;
2323

24-
extern unsigned char audio_driver_prx_start[], display_driver_prx_start[], fs_driver_prx_start[], module_driver_prx_start[];
25-
extern unsigned int audio_driver_prx_size, display_driver_prx_size, fs_driver_prx_size, module_driver_prx_size;
24+
extern unsigned char display_driver_prx_start[], fs_driver_prx_start[], module_driver_prx_start[];
25+
extern unsigned int display_driver_prx_size, fs_driver_prx_size, module_driver_prx_size;
2626

2727
namespace Utils {
2828
constexpr unsigned int CTRL_DEADZONE_DELAY = 500000;
@@ -43,7 +43,6 @@ namespace Utils {
4343
} Module;
4444

4545
static std::vector<Module> kernel_modules {
46-
{ "audio_driver.prx", -1, audio_driver_prx_start, audio_driver_prx_size },
4746
{ "display_driver.prx", -1, display_driver_prx_start, display_driver_prx_size },
4847
{ "fs_driver.prx", -1, fs_driver_prx_start, fs_driver_prx_size }
4948
};

audio_driver/Makefile

Lines changed: 0 additions & 24 deletions
This file was deleted.

audio_driver/audio_driver.c

Lines changed: 0 additions & 20 deletions
This file was deleted.

audio_driver/exports.exp

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)