From 5d1e026f7df2ab61be6321eaf3ab1ca6061f1ae6 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Wed, 8 Sep 2021 13:49:04 +0600 Subject: [PATCH 1/2] Add help command This commit also adds PrintScreen key mapping. --- src/unix/unix.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/unix/unix.c b/src/unix/unix.c index d8df7f655..ec71dee84 100644 --- a/src/unix/unix.c +++ b/src/unix/unix.c @@ -158,7 +158,8 @@ static const uint16_t sdl_to_xt[0x200] = [SDL_SCANCODE_LGUI] = 0x15B, [SDL_SCANCODE_RGUI] = 0x15C, - [SDL_SCANCODE_APPLICATION] = 0x15D + [SDL_SCANCODE_APPLICATION] = 0x15D, + [SDL_SCANCODE_PRINTSCREEN] = 0x137 }; typedef struct sdl_blit_params @@ -759,8 +760,26 @@ void monitor_thread(void* param) xargv[cmdargc++] = local_strsep(&linecpy, " "); if (xargv[cmdargc - 1] == NULL || cmdargc >= 512) break; } - cmdargc--; - if (strncasecmp(xargv[0], "exit", 4) == 0) + cmdargc--; + if (strncasecmp(xargv[0], "help", 4) == 0) + { + printf( + "fddload - Load floppy disk image into drive .\n" + "cdload - Load CD-ROM image into drive .\n" + "zipload - Load ZIP image into ZIP drive .\n" + "cartload - Load cartridge image into cartridge drive .\n" + "moload - Load MO image into MO drive .\n\n" + "fddeject - eject disk from floppy drive .\n" + "cdeject - eject disc from CD-ROM drive .\n" + "zipeject - eject ZIP image from ZIP drive .\n" + "carteject - eject cartridge from drive .\n" + "moeject - eject image from MO drive .\n\n" + "hardreset - hard reset the emulated system.\n" + "pause - pause the the emulated system.\n" + "fullscreen - toggle fullscreen.\n" + "exit - exit 86Box.\n"); + } + else if (strncasecmp(xargv[0], "exit", 4) == 0) { exit_event = 1; } From bae38e23a7bfdba5ccca75d5797995c8b450e146 Mon Sep 17 00:00:00 2001 From: TC1995 Date: Wed, 8 Sep 2021 18:40:37 +0200 Subject: [PATCH 2/2] Corrected SUBSYS information of the Velocity 100, now it displays fine. --- src/video/vid_voodoo_banshee.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index 23805cb41..c77b2368e 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -2407,7 +2407,7 @@ static uint8_t banshee_pci_read(int func, int addr, void *p) case 0x00: ret = 0x1a; break; /*3DFX*/ case 0x01: ret = 0x12; break; - case 0x02: ret = (banshee->type == TYPE_BANSHEE) ? 0x03 : ((banshee->type == TYPE_VELOCITY100) ? 0x04 : 0x05); break; + case 0x02: ret = (banshee->type == TYPE_BANSHEE) ? 0x03 : 0x05; break; case 0x03: ret = 0x00; break; case 0x04: ret = banshee->pci_regs[0x04] & 0x27; break; @@ -2858,7 +2858,14 @@ static void *banshee_init_common(const device_t *info, char *fn, int has_sgram, banshee->pci_regs[0x2e] = 0x3a; banshee->pci_regs[0x2f] = 0x00; break; - } + + case TYPE_VELOCITY100: + banshee->pci_regs[0x2c] = 0x1a; + banshee->pci_regs[0x2d] = 0x12; + banshee->pci_regs[0x2e] = 0x4b; + banshee->pci_regs[0x2f] = 0x00; + break; + } video_inform(VIDEO_FLAG_TYPE_SPECIAL, banshee->agp ? &timing_banshee_agp : &timing_banshee);