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

Merge pull request #2117 from lemondrops/master

Browse Source 
Miscellaneous fixes
This commit is contained in:
Miran Grča
2022-02-13 17:07:21 +01:00
committed by GitHub
parent d6a24489f0 a0a0bfbc79
commit 43b2216276
9 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -182,7 +182,7 @@ if(NOT EMU_BUILD_NUM)
set(EMU_BUILD_NUM 0) set(EMU_BUILD_NUM 0)
endif() endif()
if(NOT EMU_COPYRIGHT_YEAR) if(NOT EMU_COPYRIGHT_YEAR)
set(EMU_COPYRIGHT_YEAR 2021) set(EMU_COPYRIGHT_YEAR 2022)
endif() endif()
add_subdirectory(src) add_subdirectory(src)

2
src/chipset/intel_piix.c
View File

@@ -1648,7 +1648,7 @@ const device_t piix3_device =
const device_t piix3_ioapic_device = const device_t piix3_ioapic_device =
{ {
"Intel 82371SB (PIIX3) (Boards with I/O APIC)", "Intel 82371SB (PIIX3) (Boards with I/O APIC)",
"piix3", "piix3_ioapic",
DEVICE_PCI, DEVICE_PCI,
0x70001403, 0x70001403,
piix_init, piix_init,

20
src/device/isamem.c
View File

@@ -68,11 +68,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/io.h> #include <86box/io.h>
@@ -994,7 +996,7 @@ static const device_t ev159_device = {
}; };
#ifdef USE_ISAMEM_BRAT #if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
static const device_config_t brat_config[] = static const device_config_t brat_config[] =
{ {
{ {
@@ -1066,7 +1068,7 @@ static const device_config_t brat_config[] =
"size", "Memory Size", CONFIG_SPINNER, "", 128, "size", "Memory Size", CONFIG_SPINNER, "", 128,
"", "",
{ 0, 8192, 512 }, { 0, 8192, 512 },
{ 0 } { { 0 } }
}, },
{ {
"", "", -1 "", "", -1
@@ -1085,7 +1087,7 @@ static const device_t brat_device = {
#endif #endif
#ifdef USE_ISAMEM_RAMPAGE #if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE)
static const device_config_t rampage_config[] = static const device_config_t rampage_config[] =
{ {
{ {
@@ -1169,7 +1171,7 @@ static const device_config_t rampage_config[] =
"size", "Memory Size", CONFIG_SPINNER, "", 128, "size", "Memory Size", CONFIG_SPINNER, "", 128,
"", "",
{ 0, 8192, 128 }, { 0, 8192, 128 },
{ 0 } { { 0 } }
}, },
{ {
"", "", -1 "", "", -1
@@ -1188,7 +1190,7 @@ static const device_t rampage_device = {
#endif #endif
#ifdef USE_ISAMEM_IAB #if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
static const device_config_t iab_config[] = static const device_config_t iab_config[] =
{ {
{ {
@@ -1272,7 +1274,7 @@ static const device_config_t iab_config[] =
"size", "Memory Size", CONFIG_SPINNER, "", 128, "size", "Memory Size", CONFIG_SPINNER, "", 128,
"", "",
{ 0, 8192, 128 }, { 0, 8192, 128 },
{ 0 } { { 0 } }
}, },
{ {
"", "", -1 "", "", -1
@@ -1313,13 +1315,13 @@ static const struct {
{ &a6pak_device }, { &a6pak_device },
{ &ems5150_device }, { &ems5150_device },
{ &ev159_device }, { &ev159_device },
#ifdef USE_ISAMEM_BRAT #if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
{ &brat_device }, { &brat_device },
#endif #endif
#ifdef USE_ISAMEM_RAMPAGE #if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE)
{ &rampage_device }, { &rampage_device },
#endif #endif
#ifdef USE_ISAMEM_IAB #if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
{ &iab_device }, { &iab_device },
#endif #endif
{ NULL } { NULL }

2
src/include_make/86box/version.h
View File

@@ -32,7 +32,7 @@
#define EMU_VERSION_FULL EMU_VERSION #define EMU_VERSION_FULL EMU_VERSION
#define EMU_VERSION_FULL_W EMU_VERSION_W #define EMU_VERSION_FULL_W EMU_VERSION_W
#define COPYRIGHT_YEAR "2021" #define COPYRIGHT_YEAR "2022"
/* Web URL info. */ /* Web URL info. */
#define EMU_SITE L"86box.net" #define EMU_SITE L"86box.net"

4
src/printer/prt_cpmap.c
View File

@@ -10,12 +10,12 @@
* *
* *
* *
* Authors: Michael Dr<EFBFBD>ing, <michael@drueing.de> * Authors: Michael Drüing, <michael@drueing.de>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Based on code by Frederic Weymann (originally for DosBox.) * Based on code by Frederic Weymann (originally for DosBox.)
* *
* Copyright 2018 Michael Dr<EFBFBD>ing. * Copyright 2018 Michael Drüing.
* Copyright 2018 Fred N. van Kempen. * Copyright 2018 Fred N. van Kempen.
* *
* Redistribution and use in source and binary forms, with * Redistribution and use in source and binary forms, with

4
src/printer/prt_escp.c
View File

@@ -10,12 +10,12 @@
* *
* *
* *
* Authors: Michael Dr<EFBFBD>ing, <michael@drueing.de> * Authors: Michael Drüing, <michael@drueing.de>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Based on code by Frederic Weymann (originally for DosBox.) * Based on code by Frederic Weymann (originally for DosBox.)
* *
* Copyright 2018,2019 Michael Dr<EFBFBD>ing. * Copyright 2018,2019 Michael Drüing.
* Copyright 2019,2019 Fred N. van Kempen. * Copyright 2019,2019 Fred N. van Kempen.
* *
* Redistribution and use in source and binary forms, with * Redistribution and use in source and binary forms, with

4
src/qt/languages/pl-PL.po
View File

@@ -1007,7 +1007,7 @@ msgid "Disk image too large"
msgstr "Obraz dysku jest za duży" msgstr "Obraz dysku jest za duży"
msgid "Remember to partition and format the newly-created drive." msgid "Remember to partition and format the newly-created drive."
msgstr "Nie zapomnij o partycjonowaniu u sformatowaniu nowo utworzego dysku" msgstr "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzego dysku"
msgid "The selected file will be overwritten. Are you sure you want to use it?" msgid "The selected file will be overwritten. Are you sure you want to use it?"
msgstr "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?" msgstr "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?"
@@ -1052,7 +1052,7 @@ msgid "Select the parent VHD"
msgstr "Wybierz nadrzędny plik VHD" msgstr "Wybierz nadrzędny plik VHD"
msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?" msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?" msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?"
msgid "Parent and child disk timestamps do not match" msgid "Parent and child disk timestamps do not match"
msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się" msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się"

4
src/qt/qt_sdl.c
View File

@@ -15,10 +15,10 @@
* *
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Michael Dr<EFBFBD>ing, <michael@drueing.de> * Michael Drüing, <michael@drueing.de>
* *
* Copyright 2018-2020 Fred N. van Kempen. * Copyright 2018-2020 Fred N. van Kempen.
* Copyright 2018-2020 Michael Dr<EFBFBD>ing. * Copyright 2018-2020 Michael Drüing.
* *
* Redistribution and use in source and binary forms, with * Redistribution and use in source and binary forms, with
* or without modification, are permitted provided that the * or without modification, are permitted provided that the

4
src/win/win_sdl.c
View File

@@ -15,10 +15,10 @@
* *
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Michael Dr<EFBFBD>ing, <michael@drueing.de> * Michael Drüing, <michael@drueing.de>
* *
* Copyright 2018-2020 Fred N. van Kempen. * Copyright 2018-2020 Fred N. van Kempen.
* Copyright 2018-2020 Michael Dr<EFBFBD>ing. * Copyright 2018-2020 Michael Drüing.
* *
* Redistribution and use in source and binary forms, with * Redistribution and use in source and binary forms, with
* or without modification, are permitted provided that the * or without modification, are permitted provided that the