80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2021-11-22 17:09:15 -03:00
parent 8e45511c81 2adaedd16e
commit 9c8e4d690a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/keyboard_at.c
View File

@@ -1051,11 +1051,11 @@ add_data_kbd(uint16_t val)
static void static void
write_output(atkbd_t *dev, uint8_t val) write_output(atkbd_t *dev, uint8_t val)
{ {
uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
uint8_t old = dev->output_port; uint8_t old = dev->output_port;
kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->output_port); kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->output_port);
if ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF)) uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
if ((kbc_ven != KBC_VEN_OLIVETTI) && ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF)))
val |= ((dev->mem[0] << 4) & 0x10); val |= ((dev->mem[0] << 4) & 0x10);
/*IRQ 12*/ /*IRQ 12*/
@@ -2104,7 +2104,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
case 0xd0: /* read output port */ case 0xd0: /* read output port */
kbd_log("ATkbc: read output port\n"); kbd_log("ATkbc: read output port\n");
mask = 0xff; mask = 0xff;
if (((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10)) if ((kbc_ven != KBC_VEN_OLIVETTI) && ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10))
mask &= 0xbf; mask &= 0xbf;
add_to_kbc_queue_front(dev, dev->output_port & mask, 0, 0x00); add_to_kbc_queue_front(dev, dev->output_port & mask, 0, 0x00);
break; break;

4
src/win/languages/pt-BR.rc
View File

@@ -102,7 +102,7 @@ BEGIN
MENUITEM "&Configurações...", IDM_CONFIG MENUITEM "&Configurações...", IDM_CONFIG
MENUITEM "&Atualizar ícones da barra de status", IDM_UPDATE_ICONS MENUITEM "&Atualizar ícones da barra de status", IDM_UPDATE_ICONS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Alterar &configurações do programa...", IDM_PREFERENCES MENUITEM "&Preferências...", IDM_PREFERENCES
# ifdef USE_DISCORD # ifdef USE_DISCORD
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Ativar integração com o &Discord", IDM_DISCORD MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
@@ -274,7 +274,7 @@ END
// Dialog // Dialog
// //
#define STR_PREFERENCES "Configurações do programa" #define STR_PREFERENCES "Preferências do 86Box"
#define STR_SND_GAIN "Ganho de som" #define STR_SND_GAIN "Ganho de som"
#define STR_NEW_FLOPPY "Nova imagem de disquete" #define STR_NEW_FLOPPY "Nova imagem de disquete"
#define STR_CONFIG "Configurações do 86Box" #define STR_CONFIG "Configurações do 86Box"

4
src/win/languages/zh-CN.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "设置(&S)...", IDM_CONFIG MENUITEM "设置(&S)...", IDM_CONFIG
MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Preferences...", IDM_PREFERENCES MENUITEM "&偏好选项(语言等)...", IDM_PREFERENCES
# ifdef USE_DISCORD # ifdef USE_DISCORD
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog // Dialog
// //
#define STR_PREFERENCES "86Box Preferences" #define STR_PREFERENCES "86Box 偏好选项"
#define STR_SND_GAIN "音量增益" #define STR_SND_GAIN "音量增益"
#define STR_NEW_FLOPPY "新建镜像" #define STR_NEW_FLOPPY "新建镜像"
#define STR_CONFIG "86Box 设置" #define STR_CONFIG "86Box 设置"