Merge branch 'master' of https://github.com/86Box/86Box

src/qt/languages/ja-JP.po

@@ -1205,13 +1205,13 @@ msgid "Mouse sensitivity:"
 msgstr "マウスの感度:"
 
 msgid "Select media images from program working directory"
-msgstr "プログラムの作業ディレクトリからメディア画像を選択する"
+msgstr "プログラムの作業ディレクトリからメディアイメージを選択する"
 
 msgid "PIT mode:"
 msgstr "PITモード:"
 
 msgid "Auto"
-msgstr "オート"
+msgstr "自動"
 
 msgid "Slow"
 msgstr "遅い"

src/qt/languages/zh-CN.po

@@ -1202,20 +1202,20 @@ msgid "The network configuration will be switched to the null driver"
 msgstr "网络配置将切换为空驱动程序"
 
 msgid "Mouse sensitivity:"
-msgstr "小鼠敏感性:"
+msgstr "鼠标敏感度:"
 
 msgid "Select media images from program working directory"
-msgstr "从程序工作目录中选择媒体图像"
+msgstr "从程序工作目录中选择介质镜像"
 
 msgid "PIT mode:"
 msgstr "PIT 模式:"
 
 msgid "Auto"
-msgstr "汽车"
+msgstr "自动"
 
 msgid "Slow"
 msgstr "慢"
 
 msgid "Fast"
-msgstr "快速"
+msgstr "快"
 

src/qt/languages/zh-TW.po

@@ -1196,26 +1196,26 @@ msgid "(System Default)"
 msgstr "(系統預設)"
 
 msgid "Failed to initialize network driver"
-msgstr "初始化網絡驅動程序失敗"
+msgstr "初始化網路驅動程式失敗"
 
 msgid "The network configuration will be switched to the null driver"
-msgstr "網絡配置將切換為空驅動程序"
+msgstr "網路設定將切換為空驅動程式"
 
 msgid "Mouse sensitivity:"
-msgstr "鼠標靈敏度:"
+msgstr "滑鼠靈敏度:"
 
 msgid "Select media images from program working directory"
-msgstr "從程序工作目錄中選擇媒體圖像"
+msgstr "從程式工作目錄中選擇介質映像"
 
 msgid "PIT mode:"
-msgstr "點模式:"
+msgstr "PIT模式:"
 
 msgid "Auto"
-msgstr "汽車"
+msgstr "自動"
 
 msgid "Slow"
-msgstr "慢的"
+msgstr "慢"
 
 msgid "Fast"
-msgstr "快速地"
+msgstr "快"
 

src/video/vid_cl54xx.c

@@ -1636,7 +1636,7 @@ gd543x_recalc_mapping(gd54xx_t *gd54xx)
     uint32_t base;
     uint32_t size;
 
-    if ((gd54xx->pci && (!(gd54xx->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM))) || (gd54xx->mca && (!(gd54xx->pos_regs[2] & 1)))) {
+    if (gd54xx->pci && (!(gd54xx->pci_regs[PCI_REG_COMMAND] & PCI_COMMAND_MEM))) {
         mem_mapping_disable(&svga->mapping);
         mem_mapping_disable(&gd54xx->linear_mapping);
         mem_mapping_disable(&gd54xx->mmio_mapping);
@@ -3863,13 +3863,16 @@ gd5428_mca_write(int port, uint8_t val, void *priv)
         return;
 
     gd54xx->pos_regs[port & 7] = val;
-    gd543x_recalc_mapping(gd54xx);
+    mem_mapping_disable(&gd54xx->bios_rom.mapping);
+    if (gd54xx->pos_regs[2] & 0x01)
+        mem_mapping_enable(&gd54xx->bios_rom.mapping);
 }
 
 static uint8_t
-gd5428_mca_feedb(UNUSED(void *priv))
+gd5428_mca_feedb(void *priv)
 {
-    return 1;
+    gd54xx_t *gd54xx = (gd54xx_t *) priv;
+    return gd54xx->pos_regs[2] & 0x01;
 }
 
 static void
@@ -3891,7 +3894,7 @@ gd54xx_reset(void *priv)
     io_sethandler(0x03c0, 0x0020, gd54xx_in, NULL, NULL, gd54xx_out, NULL, NULL, gd54xx);
 
     mem_mapping_disable(&gd54xx->vgablt_mapping);
-    if (gd54xx->has_bios && gd54xx->pci)
+    if (gd54xx->has_bios && (gd54xx->pci || gd54xx->mca))
         mem_mapping_disable(&gd54xx->bios_rom.mapping);
 
     memset(gd54xx->pci_regs, 0x00, 256);
@@ -4235,6 +4238,7 @@ gd54xx_init(const device_t *info)
     if (gd54xx->mca) {
         gd54xx->pos_regs[0] = svga->crtc[0x27] == CIRRUS_ID_CLGD5426 ? 0x82 : 0x7b;
         gd54xx->pos_regs[1] = svga->crtc[0x27] == CIRRUS_ID_CLGD5426 ? 0x81 : 0x91;
+        mem_mapping_disable(&gd54xx->bios_rom.mapping);
         mca_add(gd5428_mca_read, gd5428_mca_write, gd5428_mca_feedb, NULL, gd54xx);
         io_sethandler(0x46e8, 0x0001, gd54xx_in, NULL, NULL, gd54xx_out, NULL, NULL, gd54xx);
     }