claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1682 from 86Box/master

Browse Source 
Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-09-08 19:09:59 +02:00
committed by GitHub
parent 22481af97a b90bbcb062
commit 60e9eb4aca
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/unix/unix.c
View File

@@ -158,7 +158,8 @@ static const uint16_t sdl_to_xt[0x200] =
[SDL_SCANCODE_LGUI] = 0x15B, [SDL_SCANCODE_LGUI] = 0x15B,
[SDL_SCANCODE_RGUI] = 0x15C, [SDL_SCANCODE_RGUI] = 0x15C,
[SDL_SCANCODE_APPLICATION] = 0x15D [SDL_SCANCODE_APPLICATION] = 0x15D,
[SDL_SCANCODE_PRINTSCREEN] = 0x137
}; };
typedef struct sdl_blit_params typedef struct sdl_blit_params
@@ -759,8 +760,26 @@ void monitor_thread(void* param)
xargv[cmdargc++] = local_strsep(&linecpy, " "); xargv[cmdargc++] = local_strsep(&linecpy, " ");
if (xargv[cmdargc - 1] == NULL || cmdargc >= 512) break; if (xargv[cmdargc - 1] == NULL || cmdargc >= 512) break;
} }
cmdargc--; cmdargc--;
if (strncasecmp(xargv[0], "exit", 4) == 0) if (strncasecmp(xargv[0], "help", 4) == 0)
{
printf(
"fddload <id> <filename> <wp> - Load floppy disk image into drive <id>.\n"
"cdload <id> <filename> - Load CD-ROM image into drive <id>.\n"
"zipload <id> <filename> <wp> - Load ZIP image into ZIP drive <id>.\n"
"cartload <id> <filename> <wp> - Load cartridge image into cartridge drive <id>.\n"
"moload <id> <filename> <wp> - Load MO image into MO drive <id>.\n\n"
"fddeject <id> - eject disk from floppy drive <id>.\n"
"cdeject <id> - eject disc from CD-ROM drive <id>.\n"
"zipeject <id> - eject ZIP image from ZIP drive <id>.\n"
"carteject <id> - eject cartridge from drive <id>.\n"
"moeject <id> - eject image from MO drive <id>.\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; exit_event = 1;
} }

11
src/video/vid_voodoo_banshee.c
View File

@@ -2407,7 +2407,7 @@ static uint8_t banshee_pci_read(int func, int addr, void *p)
case 0x00: ret = 0x1a; break; /*3DFX*/ case 0x00: ret = 0x1a; break; /*3DFX*/
case 0x01: ret = 0x12; break; 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 0x03: ret = 0x00; break;
case 0x04: ret = banshee->pci_regs[0x04] & 0x27; 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[0x2e] = 0x3a;
banshee->pci_regs[0x2f] = 0x00; banshee->pci_regs[0x2f] = 0x00;
break; 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); video_inform(VIDEO_FLAG_TYPE_SPECIAL, banshee->agp ? &timing_banshee_agp : &timing_banshee);