Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CL Volume Indicator and Some Minor ya2d Optimizations #391

Merged
merged 3 commits into from
Aug 14, 2024
Merged

CL Volume Indicator and Some Minor ya2d Optimizations #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8a6840
Allow controller to read volume buttons by calling from kernel. Also …
maodus Aug 14, 2024
d0bcfdf
Added volume indicator in CL
maodus Aug 14, 2024
8f6fb7e
Remove redundant dcache writebacks for images
maodus Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion extras/menus/arkMenu/include/controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ class Controller{
SceCtrlData pad;

u32 nowpad, newpad, oldpad;

int n;

void *_ksceCtrlReadBufferPositive;

void clCtrlReadBufferPositive();

public:

Expand All @@ -25,6 +28,9 @@ class Controller{

// generic wait for user input, returns true if cross pressed, false if circle is pressed
bool wait(void* busy_wait=NULL);

// Return the current pad data
u32 get_buttons();

// check for accept or decline from user (depending on the button configuration)
bool any();
Expand All @@ -45,6 +51,7 @@ class Controller{
bool start();
bool select();
bool home();
bool volume();
};


Expand Down
36 changes: 32 additions & 4 deletions extras/menus/arkMenu/src/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
#include "controller.h"
#include "common.h"
#include <kubridge.h>
#include <systemctrl.h>

#define CONTROL_DELAY 10

Controller::Controller(){
this->nowpad = this->newpad = this->oldpad = 0;
this->n = 0;
this->_ksceCtrlReadBufferPositive = (void *)sctrlHENFindFunction("sceController_Service", "sceCtrl_driver", 0x1F803938);
}

Controller::~Controller(){
}

void Controller::clCtrlReadBufferPositive(){
if (_ksceCtrlReadBufferPositive != NULL){
struct KernelCallArg args;
args.arg1 = (u32)&pad; // Pad
args.arg2 = 1; // Count
args.arg3 = 0; // ??
args.arg4 = 0; // Mode

kuKernelCall(_ksceCtrlReadBufferPositive, &args); // Call from kernel mode to get access to more inputs
}else { // Fallback to usermode
sceCtrlReadBufferPositive(&pad, 1);
}
}

void Controller::update(int ignore){

for (int i=0; i<ignore; i++)
sceCtrlReadBufferPositive(&pad, 1);
clCtrlReadBufferPositive();

nowpad = pad.Buttons;
newpad = nowpad & ~oldpad;
Expand All @@ -33,7 +49,10 @@ void Controller::update(int ignore){

void Controller::flush(){
while (pad.Buttons)
sceCtrlReadBufferPositive(&pad, 1);
// Only read from usermode as a work-around for now.
// Kernel mode has some sort of bit mask intercept that always sets a certain button to be activated
// TODO: Unset kernel bit intercept to allow for kernel mode flushing : https://github.com/Valantin/sceCtrlDriver/blob/master/pspctrl_kernel.h
sceCtrlReadBufferPositive(&pad, 1);
}

bool Controller::wait(void* busy_wait){
Expand All @@ -56,6 +75,10 @@ bool Controller::wait(void* busy_wait){
return ret;
}

u32 Controller::get_buttons() {
return newpad;
}

bool Controller::any(){
return (newpad!=0);
}
Expand Down Expand Up @@ -118,4 +141,9 @@ bool Controller::select(){

bool Controller::home(){
return (newpad & PSP_CTRL_HOME);
}
}

bool Controller::volume(){
return (newpad & (PSP_CTRL_VOLUP | PSP_CTRL_VOLDOWN));
}

105 changes: 70 additions & 35 deletions extras/menus/arkMenu/src/system_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ static int pEntryIndex;
static int cur_entry = 0;
static int page_start = 0;

//static int menu_anim_state = 0;
//static int menu_draw_state = 0;
static int volume = 0;
static clock_t volume_time = 0;

static int MAX_ENTRIES = 0;
static SystemEntry** entries = NULL;
Expand Down Expand Up @@ -124,7 +124,6 @@ static void systemController(Controller* pad){

if (pEntryIndex == page_start && page_start > 0){
page_start--;
//menu_draw_state = 1; Dead code
}

common::playMenuSound();
Expand All @@ -137,7 +136,6 @@ static void systemController(Controller* pad){

if (pEntryIndex - page_start >= getNumPageItems()){
page_start++;
//menu_draw_state = -1; Dead code
}

common::playMenuSound();
Expand Down Expand Up @@ -203,31 +201,6 @@ static void drawOptionsMenuCommon(){

x += x_step;
}

/* Dead code

switch (menu_draw_state){
case -1:
menu_anim_state -= 20;

if (menu_anim_state <= -160){
menu_draw_state = 0;
}

break;
case 0:
menu_anim_state = 0;
break;
case 1:
menu_anim_state += 20;

if (menu_anim_state >= 160){
menu_draw_state = 0;
}

break;
}
*/
}

static void drawDateTime() {
Expand Down Expand Up @@ -276,6 +249,24 @@ static void drawBattery(){
}
}

static void drawVolume(){
const int max_slider_width = 480 / 4;
const int volume_y = 255;

const int outer_hndl_w = 3, outer_hndle_h = 6; // Inner handle will just be -1 these dimensions

int slider_width = max(0, (int)((float)max_slider_width * ((float)volume / 30)) - outer_hndl_w);
const int slider_x = (480 / 2) - (max_slider_width / 2);

ya2d_draw_rect(slider_x - 1, volume_y - 1, max_slider_width + 1, 3, BLACK, 0); // Volume background outline

ya2d_draw_rect(slider_x, volume_y, max_slider_width, 2, GRAY, 1); // Slider background
ya2d_draw_rect(slider_x, volume_y, slider_width, 2, WHITE, 1); // Slider

ya2d_draw_rect(slider_x + slider_width, volume_y - outer_hndle_h / 2, outer_hndl_w, outer_hndle_h, RED, 0); // Outer slider handle
ya2d_draw_rect(slider_x + slider_width + 1, volume_y - outer_hndle_h / 2 + 1, outer_hndl_w - 1, outer_hndle_h - 1, WHITE, 1); // Inner slider handle
}

static void systemDrawer(){
switch (optionsDrawState){
case 0:
Expand Down Expand Up @@ -307,6 +298,15 @@ static void systemDrawer(){
optionsDrawState = 0;
break;
}

clock_t volume_elapsed = clock() - volume_time;
double time_elapsed = ((double)volume_elapsed) / CLOCKS_PER_SEC;

// Only show volume for 3 seconds and protect against clock_t wrap-around
if (volume_time && time_elapsed < 3 && volume_elapsed < volume_time){
drawVolume();
}

}

void SystemMgr::drawScreen(){
Expand Down Expand Up @@ -344,6 +344,9 @@ static int drawThread(SceSize _args, void *_argp){
return 0;
}

static void *_sceImposeGetParam; // int (*)(int)
static void *_sceImposeSetParam; // int (*)(int, int)

static int controlThread(SceSize _args, void *_argp){
static int screensaver_times[] = {0, 5, 10, 20, 30, 60};
Controller pad;
Expand All @@ -352,42 +355,71 @@ static int controlThread(SceSize _args, void *_argp){
while (running){
int screensaver_time = screensaver_times[common::getConf()->screensaver];
pad.update();

if (pad.triangle() && !screensaver){
changeMenuState();
}
else if (pad.home()){
} else if (pad.home()){
screensaver = !screensaver;
pad.flush();
last_pressed = clock();
continue;
}
else if (!screensaver){
} else if (pad.volume() && _sceImposeGetParam != NULL && _sceImposeSetParam != NULL) {
struct KernelCallArg args;
args.arg1 = 0x1; // PSP_IMPOSE_MAIN_VOLUME

kuKernelCall(_sceImposeGetParam, &args);
int new_volume = args.ret1;

volume_time = clock();

// Unfortunate impose driver fix
// Impose will sometimes register an extra volume input press in the opposite direction
u32 buttons = pad.get_buttons();

if (buttons & 0x100000 && new_volume < volume){
args.arg2 = ++new_volume;
kuKernelCall(_sceImposeSetParam, &args);
} else if (buttons & 0x200000 && new_volume > volume){
args.arg2 = --new_volume;
kuKernelCall(_sceImposeSetParam, &args);
}
// end of unfortunate impose driver fix :)

if (new_volume != volume){
volume = new_volume;
common::playMenuSound();
}
} else if (!screensaver){
if (system_menu) systemController(&pad);
else entries[cur_entry]->control(&pad);
}

if (pad.any()){
last_pressed = clock();
if (screensaver){
screensaver = 0;
continue;
}
}

if (screensaver_time > 0 && !stillLoading()){
clock_t elapsed = clock() - last_pressed;
double time_taken = ((double)elapsed)/CLOCKS_PER_SEC;
if (time_taken > screensaver_time){
screensaver = 1;
}
}
else if (stillLoading()){
} else if (stillLoading()){
last_pressed = clock();
}

sceKernelDelayThread(0);
}

sceKernelExitDeleteThread(0);
return 0;
}


void SystemMgr::initMenu(SystemEntry** e, int ne){
draw_sema = sceKernelCreateSema("draw_sema", 0, 1, 1, NULL);
entries = e;
Expand All @@ -410,6 +442,9 @@ void SystemMgr::initMenu(SystemEntry** e, int ne){
u32 fwminor = (fw>>16)&0xF;
u32 fwmicro = (fw>>8)&0xF;

_sceImposeGetParam = (void *)sctrlHENFindFunction("sceImpose_Driver", "sceImpose_driver", 0xDC3BECFF);
_sceImposeSetParam = (void *)sctrlHENFindFunction("sceImpose_Driver", "sceImpose_driver", 0x3C318569);

stringstream version;
version << "FW " << fwmajor << "." << fwminor << fwmicro;
version << " ARK " << major << "." << minor;
Expand Down
5 changes: 0 additions & 5 deletions extras/menus/arkMenu/src/ya2d++.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Image::Image(){
Image::Image(ya2d_texture* tex){
this->texture = tex;
this->is_system_image = false;
flush();
}

Image::Image(string filename, int place){
Expand All @@ -24,7 +23,6 @@ Image::Image(string filename, int place){
else if (ext == "bmp"){
this->texture = ya2d_load_BMP_file(filename.c_str(), place);
}
flush();
}

Image::Image(void* buffer, int place){
Expand All @@ -34,20 +32,17 @@ Image::Image(void* buffer, int place){
this->texture = ya2d_load_PNG_buffer(buffer, place);
else if (magic == BMP_MAGIC)
this->texture = ya2d_load_BMP_buffer(buffer, place);
flush();
}

Image::Image(void* buffer, unsigned long buffer_size, int place){
this->is_system_image = false;
if ( (*(u32*)buffer & 0x0000FFFF) == JPG_MAGIC)
this->texture = ya2d_load_JPEG_buffer(buffer, buffer_size, place);
flush();
}

Image::Image(string filename, int place, SceOff offset){
this->is_system_image = false;
this->texture = ya2d_load_PNG_file_offset(filename.c_str(), place, offset);
flush();
}

Image::~Image(){
Expand Down
Loading