github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-02-11 02:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Add DPMS to RTG

Browse Source 
This uses the Pi monitor control to turn the monitor off and on. Turning
on requires a full reinit of RTG including creating a new InitWindow so
the reinit functionality has been changed slightly.

It is enabled by setting the variable "rtg-dpms" in the config file.
This commit is contained in:
Andrew Hutchings
2021-08-04 10:38:10 +01:00
parent f12b0f0488
commit 5e939adb8c
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amiga.cfg
View File

@@ -47,6 +47,8 @@ platform amiga
#setvar enable_rtc_emulation 0
# Uncomment to enable RTG
#setvar rtg
# Uncomment to enable DPMS (monitor turns off) when RTG sleeps
#setvar rtg-dpms
# Uncomment to enable CDTV mode (not working, requires Kickstart 1.3+CDTV extended ROM)
#setvar cdtv

7
platforms/amiga/amiga-platform.c
View File

@@ -70,6 +70,7 @@ uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0, kick13_mode = 0,
uint8_t a314_emulation_enabled = 0, a314_initialized = 0;
extern uint32_t piscsi_base, pistorm_dev_base;
extern uint8_t rtg_dpms;
extern void stop_cpu_emulation(uint8_t disasm_cur);
@@ -443,7 +444,11 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) {
adjust_ranges_amiga(cfg);
}
else
printf("[AMIGA} Failed to enable RTG.\n");
printf("[AMIGA] Failed to enable RTG.\n");
}
if (CHKVAR("rtg-dpms")) {
rtg_dpms = 1;
printf("[AMIGA] DPMS enabled for RTG.\n");
}
if CHKVAR("kick13") {
printf("[AMIGA] Kickstart 1.3 mode enabled, Z3 PICs will not be enumerated.\n");

17
platforms/amiga/rtg/rtg-output-raylib.c
View File

@@ -14,6 +14,8 @@
#include <string.h>
#include <unistd.h>
#include "interface/vmcs_host/vc_tvservice.h"
#define RTG_INIT_ERR(a) { printf(a); *data->running = 0; }
//#define DEBUG_RAYLIB_RTG
@@ -24,7 +26,7 @@
#define DEBUG(...)
#endif
uint8_t busy = 0, rtg_on = 0, rtg_initialized = 0, emulator_exiting = 0, rtg_output_in_vblank = 0;
uint8_t busy = 0, rtg_on = 0, rtg_initialized = 0, emulator_exiting = 0, rtg_output_in_vblank = 0, reinit = 0, rtg_dpms = 0;
extern uint8_t *rtg_mem, display_enabled;
extern uint32_t framebuffer_addr;
extern uint32_t framebuffer_addr_adj;
@@ -191,7 +193,7 @@ void *rtgThread(void *args) {
printf("RTG thread running\n");
fflush(stdout);
int reinit = 0, old_filter_mode = -1;
int old_filter_mode = -1;
rtg_on = 1;
uint32_t *indexed_buf = NULL;
@@ -216,6 +218,7 @@ void *rtgThread(void *args) {
Texture raylib_clut_texture;
Image raylib_fb, raylib_cursor, raylib_clut;
reinit_raylib:;
InitWindow(GetScreenWidth(), GetScreenHeight(), "Pistorm RTG");
HideCursor();
SetTargetFPS(60);
@@ -242,7 +245,6 @@ void *rtgThread(void *args) {
raylib_cursor.data = cursor_data;
raylib_cursor_texture = LoadTextureFromImage(raylib_cursor);
reinit_raylib:;
if (reinit) {
printf("Reinitializing raylib...\n");
width = rtg_display_width;
@@ -363,7 +365,7 @@ reinit_raylib:;
DrawText("RTG is currently sleeping.", 16, 16, 12, RAYWHITE);
EndDrawing();
}
if (pitch != *data->pitch || height != *data->height || width != *data->width || format != *data->format) {
if (pitch != *data->pitch || height != *data->height || width != *data->width || format != *data->format || reinit) {
printf("Reinitializing due to something change.\n");
reinit = 1;
goto shutdown_raylib;
@@ -405,6 +407,10 @@ void rtg_set_clut_entry(uint8_t index, uint32_t xrgb) {
void rtg_init_display() {
int err;
if (rtg_dpms) {
vc_tv_hdmi_power_on_preferred();
}
reinit = 1;
rtg_on = 1;
if (!rtg_initialized) {
@@ -427,6 +433,9 @@ void rtg_shutdown_display() {
printf("RTG display disabled.\n");
rtg_on = 0;
display_enabled = 0xFF;
if (rtg_dpms) {
vc_tv_power_off();
}
}
void rtg_enable_mouse_cursor() {