mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 20:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into dell-p60-fix

Browse Source
This commit is contained in:
win2kgamer
2025-08-28 16:03:46 -05:00
committed by GitHub
parent 0c4be448e8 c2dc468f32
commit 98e2bea7f3
76 changed files with 740 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/machine/m_tandy.c
View File

@@ -149,11 +149,11 @@ static const scancode scancode_tandy[512] = {
{ .mk = { 0x51, 0 }, .brk = { 0xd1, 0 } }, /* 051 */
{ .mk = { 0x52, 0 }, .brk = { 0xd2, 0 } }, /* 052 */
{ .mk = { 0x56, 0 }, .brk = { 0xd6, 0 } }, /* 053 */
{ .mk = { 0 }, .brk = { 0 } }, /* 054 */
{ .mk = { 0x54, 0 }, .brk = { 0xd4, 0 } }, /* 054 */
{ .mk = { 0 }, .brk = { 0 } }, /* 055 */
{ .mk = { 0 }, .brk = { 0 } }, /* 056 */
{ .mk = { 0 }, .brk = { 0 } }, /* 057 */
{ .mk = { 0 }, .brk = { 0 } }, /* 058 */
{ .mk = { 0x59, 0 }, .brk = { 0xd9, 0 } }, /* 057 */
{ .mk = { 0x5a, 0 }, .brk = { 0xda, 0 } }, /* 058 */
{ .mk = { 0 }, .brk = { 0 } }, /* 059 */
{ .mk = { 0 }, .brk = { 0 } }, /* 05a */
{ .mk = { 0 }, .brk = { 0 } }, /* 05b */
@@ -392,7 +392,7 @@ static const scancode scancode_tandy[512] = {
{ .mk = { 0 }, .brk = { 0 } }, /* 144 */
{ .mk = { 0 }, .brk = { 0 } }, /* 145 */
{ .mk = { 0x46, 0 }, .brk = { 0xc6, 0 } }, /* 146 */
{ .mk = { 0x47, 0 }, .brk = { 0xc7, 0 } }, /* 147 */
{ .mk = { 0x58, 0 }, .brk = { 0xd8, 0 } }, /* 147 */
{ .mk = { 0x29, 0 }, .brk = { 0xa9, 0 } }, /* 148 */
{ .mk = { 0x49, 0 }, .brk = { 0xc9, 0 } }, /* 149 */
{ .mk = { 0 }, .brk = { 0 } }, /* 14a */
@@ -403,7 +403,7 @@ static const scancode scancode_tandy[512] = {
{ .mk = { 0x4f, 0 }, .brk = { 0xcf, 0 } }, /* 14f */
{ .mk = { 0x4a, 0 }, .brk = { 0xca, 0 } }, /* 150 */
{ .mk = { 0x51, 0 }, .brk = { 0xd1, 0 } }, /* 151 */
{ .mk = { 0x52, 0 }, .brk = { 0xd2, 0 } }, /* 152 */
{ .mk = { 0x55, 0 }, .brk = { 0xd5, 0 } }, /* 152 */
{ .mk = { 0x53, 0 }, .brk = { 0xd3, 0 } }, /* 153 */
{ .mk = { 0 }, .brk = { 0 } }, /* 154 */
{ .mk = { 0 }, .brk = { 0 } }, /* 155 */

4
src/machine/machine_table.c
View File

@@ -11390,7 +11390,7 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00012900,
.kbc_p1 = 0x00000cf0,
.kbc_p1 = 0x00001010,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &batman_device,
@@ -11976,7 +11976,7 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00012900,
.kbc_p1 = 0x00000cf0,
.kbc_p1 = 0x00001010,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &plato_device,