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

LPT4 was a thing in the pre PS/2 era

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-30 19:15:27 -05:00
parent 9ffa688c13
commit e1c845e393
23 changed files with 101 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/86box.h
View File

@@ -23,7 +23,7 @@
/* Configuration values. */
#define SERIAL_MAX 4
#define PARALLEL_MAX 3
#define PARALLEL_MAX 4
#define SCREEN_RES_X 640
#define SCREEN_RES_Y 480

14
src/include/86box/lpt.h
View File

@@ -33,6 +33,20 @@ extern void lpt1_remove_ams(void);
#define lpt3_irq(a) lpt_port_irq(2, a)
#define lpt3_remove() lpt_port_remove(2)
#define lpt4_init(a) lpt_port_init(3, a)
#define lpt4_irq(a) lpt_port_irq(3, a)
#define lpt4_remove() lpt_port_remove(3)
/*
#define lpt5_init(a) lpt_port_init(4, a)
#define lpt5_irq(a) lpt_port_irq(4, a)
#define lpt5_remove() lpt_port_remove(4)
#define lpt6_init(a) lpt_port_init(5, a)
#define lpt6_irq(a) lpt_port_irq(5, a)
#define lpt6_remove() lpt_port_remove(5)
*/
void lpt_devices_init(void);
void lpt_devices_close(void);

45
src/include/86box/resource.h
View File

@@ -170,31 +170,32 @@
#define IDC_COMBO_LPT1 1070 /* ports config */
#define IDC_COMBO_LPT2 1071
#define IDC_COMBO_LPT3 1072
#define IDC_CHECK_SERIAL1 1073
#define IDC_CHECK_SERIAL2 1074
#define IDC_CHECK_SERIAL3 1075
#define IDC_CHECK_SERIAL4 1076
#define IDC_CHECK_PARALLEL1 1077
#define IDC_COMBO_LPT4 1073
#define IDC_CHECK_SERIAL1 1074
#define IDC_CHECK_SERIAL2 1075
#define IDC_CHECK_SERIAL3 1076
#define IDC_CHECK_SERIAL4 1077
#define IDC_CHECK_PARALLEL1 1078
#define IDC_CHECK_PARALLEL2 1078
#define IDC_CHECK_PARALLEL3 1079
#define IDC_CHECK_PARALLEL3 1080
#define IDC_OTHER_PERIPH 1080 /* storage controllers config */
#define IDC_COMBO_HDC 1081
#define IDC_CONFIGURE_HDC 1082
#define IDC_CHECK_IDE_TER 1083
#define IDC_BUTTON_IDE_TER 1084
#define IDC_CHECK_IDE_QUA 1085
#define IDC_BUTTON_IDE_QUA 1086
#define IDC_GROUP_SCSI 1087
#define IDC_OTHER_PERIPH 1081 /* storage controllers config */
#define IDC_COMBO_HDC 1082
#define IDC_CONFIGURE_HDC 1083
#define IDC_CHECK_IDE_TER 1084
#define IDC_BUTTON_IDE_TER 1085
#define IDC_CHECK_IDE_QUA 1086
#define IDC_BUTTON_IDE_QUA 1087
#define IDC_GROUP_SCSI 1088
#define IDC_COMBO_SCSI_1 1088
#define IDC_COMBO_SCSI_2 1089
#define IDC_COMBO_SCSI_3 1090
#define IDC_COMBO_SCSI_4 1091
#define IDC_CONFIGURE_SCSI_1 1092
#define IDC_CONFIGURE_SCSI_2 1093
#define IDC_CONFIGURE_SCSI_3 1094
#define IDC_CONFIGURE_SCSI_4 1095
#define IDC_CHECK_CASSETTE 1096
#define IDC_COMBO_SCSI_2 1090
#define IDC_COMBO_SCSI_3 1091
#define IDC_COMBO_SCSI_4 1092
#define IDC_CONFIGURE_SCSI_1 1093
#define IDC_CONFIGURE_SCSI_2 1094
#define IDC_CONFIGURE_SCSI_3 1095
#define IDC_CONFIGURE_SCSI_4 1096
#define IDC_CHECK_CASSETTE 1097
#define IDC_HARD_DISKS 1100 /* hard disks config */
#define IDC_LIST_HARD_DISKS 1101

4
src/lpt.c
View File

@@ -176,8 +176,8 @@ void
lpt_init(void)
{
int i;
uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc };
uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7 };
uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc, 0x268 }; /*, 0x27c, 0x26c }; */
uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7, 5 }; /* , 7, 5 }; */
for (i = 0; i < PARALLEL_MAX; i++) {
lpt_ports[i].addr = 0xffff;

8
src/win/languages/cs-CZ.rc
View File

@@ -329,9 +329,10 @@ END
#define STR_PCAP "PCap zařízení:"
#define STR_NET "Síťový adaptér:"
#define STR_LPT1 "Zařízení na LPT1"
#define STR_LPT2 "Zařízení na LPT2"
#define STR_LPT3 "Zařízení na LPT3"
#define STR_LPT1 "Zařízení na LPT1:"
#define STR_LPT2 "Zařízení na LPT2:"
#define STR_LPT3 "Zařízení na LPT3:"
#define STR_LPT4 "Zařízení na LPT4:"
#define STR_SERIAL1 "Povolit port COM1"
#define STR_SERIAL2 "Povolit port COM2"
#define STR_SERIAL3 "Povolit port COM3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Povolit port LPT1"
#define STR_PARALLEL2 "Povolit port LPT2"
#define STR_PARALLEL3 "Povolit port LPT3"
#define STR_PARALLEL4 "Povolit port LPT4"
#define STR_HDC "Řadič disku:"
#define STR_FDC "Disketový řadič:"

8
src/win/languages/de-DE.rc
View File

@@ -329,9 +329,10 @@ END
#define STR_PCAP "PCap-Gerät:"
#define STR_NET "Netzwerkadapter:"
#define STR_LPT1 "LPT1-Gerät"
#define STR_LPT2 "LPT2-Gerät"
#define STR_LPT3 "LPT3-Gerät"
#define STR_LPT1 "LPT1-Gerät:"
#define STR_LPT2 "LPT2-Gerät:"
#define STR_LPT3 "LPT3-Gerät:"
#define STR_LPT4 "LPT4-Gerät:"
#define STR_SERIAL1 "Serielle Schnittstelle 1"
#define STR_SERIAL2 "Serielle Schnittstelle 2"
#define STR_SERIAL3 "Serielle Schnittstelle 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Parallelport 1"
#define STR_PARALLEL2 "Parallelport 2"
#define STR_PARALLEL3 "Parallelport 3"
#define STR_PARALLEL4 "Parallelport 4"
#define STR_HDC "HDD-Controller:"
#define STR_FDC "FD-Controller:"

22
src/win/languages/dialogs.rc
View File

@@ -225,21 +225,27 @@ BEGIN
COMBOBOX IDC_COMBO_LPT3,71,45,189,120,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
LTEXT STR_LPT4,IDT_1720,7,66,61,10
COMBOBOX IDC_COMBO_LPT4,71,64,189,120,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL STR_SERIAL1,IDC_CHECK_SERIAL1,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,64,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,83,94,10
CONTROL STR_SERIAL2,IDC_CHECK_SERIAL2,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,147,64,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,147,83,94,10
CONTROL STR_SERIAL3,IDC_CHECK_SERIAL3,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,82,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,101,94,10
CONTROL STR_SERIAL4,IDC_CHECK_SERIAL4,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,147,82,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,147,101,94,10
CONTROL STR_PARALLEL1,IDC_CHECK_PARALLEL1,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,119,94,10
CONTROL STR_PARALLEL2,IDC_CHECK_PARALLEL2,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,147,100,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,147,119,94,10
CONTROL STR_PARALLEL3,IDC_CHECK_PARALLEL3,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,118,94,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,137,94,10
CONTROL STR_PARALLEL4,IDC_CHECK_PARALLEL4,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,147,137,94,10
END
DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203
@@ -525,6 +531,7 @@ END
#undef STR_LPT1
#undef STR_LPT2
#undef STR_LPT3
#undef STR_LPT4
#undef STR_SERIAL1
#undef STR_SERIAL2
#undef STR_SERIAL3
@@ -532,6 +539,7 @@ END
#undef STR_PARALLEL1
#undef STR_PARALLEL2
#undef STR_PARALLEL3
#undef STR_PARALLEL4
#undef STR_HDC
#undef STR_FDC

2
src/win/languages/en-GB.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1 Device:"
#define STR_LPT2 "LPT2 Device:"
#define STR_LPT3 "LPT3 Device:"
#define STR_LPT4 "LPT4 Device:"
#define STR_SERIAL1 "Serial port 1"
#define STR_SERIAL2 "Serial port 2"
#define STR_SERIAL3 "Serial port 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Parallel port 1"
#define STR_PARALLEL2 "Parallel port 2"
#define STR_PARALLEL3 "Parallel port 3"
#define STR_PARALLEL4 "Parallel port 4"
#define STR_HDC "HD Controller:"
#define STR_FDC "FD Controller:"

2
src/win/languages/en-US.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1 Device:"
#define STR_LPT2 "LPT2 Device:"
#define STR_LPT3 "LPT3 Device:"
#define STR_LPT4 "LPT4 Device:"
#define STR_SERIAL1 "Serial port 1"
#define STR_SERIAL2 "Serial port 2"
#define STR_SERIAL3 "Serial port 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Parallel port 1"
#define STR_PARALLEL2 "Parallel port 2"
#define STR_PARALLEL3 "Parallel port 3"
#define STR_PARALLEL4 "Parallel port 4"
#define STR_HDC "HD Controller:"
#define STR_FDC "FD Controller:"

2
src/win/languages/es-ES.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Dispositivo LPT1:"
#define STR_LPT2 "Dispositivo LPT2:"
#define STR_LPT3 "Dispositivo LPT3:"
#define STR_LPT4 "Dispositivo LPT4:"
#define STR_SERIAL1 "Puerto serie 1"
#define STR_SERIAL2 "Puerto serie 2"
#define STR_SERIAL3 "Puerto serie 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Puerto paralelo 1"
#define STR_PARALLEL2 "Puerto paralelo 2"
#define STR_PARALLEL3 "Puerto paralelo 3"
#define STR_PARALLEL4 "Puerto paralelo 4"
#define STR_HDC "Controladora HD:"
#define STR_FDC "Controladora FD:"

2
src/win/languages/fi-FI.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1-laite:"
#define STR_LPT2 "LPT2-laite:"
#define STR_LPT3 "LPT3-laite:"
#define STR_LPT4 "LPT4-laite:"
#define STR_SERIAL1 "Sarjaportti 1"
#define STR_SERIAL2 "Sarjaportti 2"
#define STR_SERIAL3 "Sarjaportti 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Rinnakkaisportti 1"
#define STR_PARALLEL2 "Rinnakkaisportti 2"
#define STR_PARALLEL3 "Rinnakkaisportti 3"
#define STR_PARALLEL4 "Rinnakkaisportti 4"
#define STR_HDC "Kiintolevyohjain:"
#define STR_FDC "Levykeohjain:"

2
src/win/languages/fr-FR.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Dispositif LPT1:"
#define STR_LPT2 "Dispositif LPT2:"
#define STR_LPT3 "Dispositif LPT3:"
#define STR_LPT4 "Dispositif LPT4:"
#define STR_SERIAL1 "Port série 1"
#define STR_SERIAL2 "Port série 2"
#define STR_SERIAL3 "Port série 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Port parallèle 1"
#define STR_PARALLEL2 "Port parallèle 2"
#define STR_PARALLEL3 "Port parallèle 3"
#define STR_PARALLEL4 "Port parallèle 4"
#define STR_HDC "Contrôleur HD:"
#define STR_FDC "Contrôleur FD:"

2
src/win/languages/hr-HR.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Uređaj LPT1:"
#define STR_LPT2 "Uređaj LPT2:"
#define STR_LPT3 "Uređaj LPT3:"
#define STR_LPT4 "Uređaj LPT4:"
#define STR_SERIAL1 "Serijska vrata 1"
#define STR_SERIAL2 "Serijska vrata 2"
#define STR_SERIAL3 "Serijska vrata 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Paralelna vrata 1"
#define STR_PARALLEL2 "Paralelna vrata 2"
#define STR_PARALLEL3 "Paralelna vrata 3"
#define STR_PARALLEL4 "Paralelna vrata 4"
#define STR_HDC "Kontroler tvrdog diska:"
#define STR_FDC "Kontroler diskete:"

4
src/win/languages/hu-HU.rc
View File

@@ -11,6 +11,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
#pragma code_page(65001)
#endif //_WIN32
#define AUTHORS
/////////////////////////////////////////////////////////////////////////////
//
// Menu
@@ -335,6 +337,7 @@ END
#define STR_LPT1 "LPT1 eszköz:"
#define STR_LPT2 "LPT2 eszköz:"
#define STR_LPT3 "LPT3 eszköz:"
#define STR_LPT4 "LPT4 eszköz:"
#define STR_SERIAL1 "Soros port 1"
#define STR_SERIAL2 "Soros port 2"
#define STR_SERIAL3 "Soros port 3"
@@ -342,6 +345,7 @@ END
#define STR_PARALLEL1 "Párhuzamos port 1"
#define STR_PARALLEL2 "Párhuzamos port 2"
#define STR_PARALLEL3 "Párhuzamos port 3"
#define STR_PARALLEL4 "Párhuzamos port 4"
#define STR_HDC "Merevl.-vezérlő:"
#define STR_FDC "Floppy-vezérlő:"

5
src/win/languages/it-IT.rc
View File

@@ -6,7 +6,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
#pragma code_page(65001)
#endif //_WIN32
#define explorerdotexe
// explorerdotexe
#define AUTHORS
/////////////////////////////////////////////////////////////////////////////
//
@@ -332,6 +333,7 @@ END
#define STR_LPT1 "Dispositivo LPT1:"
#define STR_LPT2 "Dispositivo LPT2:"
#define STR_LPT3 "Dispositivo LPT3:"
#define STR_LPT4 "Dispositivo LPT4:"
#define STR_SERIAL1 "Porta seriale 1"
#define STR_SERIAL2 "Porta seriale 2"
#define STR_SERIAL3 "Porta seriale 3"
@@ -339,6 +341,7 @@ END
#define STR_PARALLEL1 "Porta parallela 1"
#define STR_PARALLEL2 "Porta parallela 2"
#define STR_PARALLEL3 "Porta parallela 3"
#define STR_PARALLEL4 "Porta parallela 4"
#define STR_HDC "Controller HD:"
#define STR_FDC "Controller FD:"

2
src/win/languages/ja-JP.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1デバイス:"
#define STR_LPT2 "LPT2デバイス:"
#define STR_LPT3 "LPT3デバイス:"
#define STR_LPT4 "LPT4デバイス:"
#define STR_SERIAL1 "シリアルポート1"
#define STR_SERIAL2 "シリアルポート2"
#define STR_SERIAL3 "シリアルポート3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "パラレルポート1"
#define STR_PARALLEL2 "パラレルポート2"
#define STR_PARALLEL3 "パラレルポート3"
#define STR_PARALLEL4 "パラレルポート4"
#define STR_HDC "HDコントローラー:"
#define STR_FDC "FDコントローラー:"

2
src/win/languages/ko-KR.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1 장치:"
#define STR_LPT2 "LPT2 장치:"
#define STR_LPT3 "LPT3 장치:"
#define STR_LPT4 "LPT4 장치:"
#define STR_SERIAL1 "직렬 포트 1"
#define STR_SERIAL2 "직렬 포트 2"
#define STR_SERIAL3 "직렬 포트 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "병렬 포트 1"
#define STR_PARALLEL2 "병렬 포트 2"
#define STR_PARALLEL3 "병렬 포트 3"
#define STR_PARALLEL4 "병렬 포트 4"
#define STR_HDC "HD 컨트롤러:"
#define STR_FDC "FD 컨트롤러:"

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

@@ -335,6 +335,7 @@ END
#define STR_LPT1 "Dispositivo LPT1:"
#define STR_LPT2 "Dispositivo LPT2:"
#define STR_LPT3 "Dispositivo LPT3:"
#define STR_LPT4 "Dispositivo LPT4:"
#define STR_SERIAL1 "Porta serial 1"
#define STR_SERIAL2 "Porta serial 2"
#define STR_SERIAL3 "Porta serial 3"
@@ -342,6 +343,7 @@ END
#define STR_PARALLEL1 "Porta paralela 1"
#define STR_PARALLEL2 "Porta paralela 2"
#define STR_PARALLEL3 "Porta paralela 3"
#define STR_PARALLEL4 "Porta paralela 4"
#define STR_HDC "Controlador HD:"
#define STR_FDC "Controlador FD:"

2
src/win/languages/pt-PT.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Dispositivo LPT1:"
#define STR_LPT2 "Dispositivo LPT2:"
#define STR_LPT3 "Dispositivo LPT3:"
#define STR_LPT4 "Dispositivo LPT4:"
#define STR_SERIAL1 "Porta de série 1"
#define STR_SERIAL2 "Porta de série 2"
#define STR_SERIAL3 "Porta de série 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Porta paralela 1"
#define STR_PARALLEL2 "Porta paralela 2"
#define STR_PARALLEL3 "Porta paralela 3"
#define STR_PARALLEL4 "Porta paralela 4"
#define STR_HDC "Controlador HD:"
#define STR_FDC "Controlador FD:"

2
src/win/languages/ru-RU.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Устройство LPT1:"
#define STR_LPT2 "Устройство LPT2:"
#define STR_LPT3 "Устройство LPT3:"
#define STR_LPT4 "Устройство LPT4:"
#define STR_SERIAL1 "Последов. порт COM1"
#define STR_SERIAL2 "Последов. порт COM2"
#define STR_SERIAL3 "Последов. порт COM3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Параллельный порт LPT1"
#define STR_PARALLEL2 "Параллельный порт LPT2"
#define STR_PARALLEL3 "Параллельный порт LPT3"
#define STR_PARALLEL4 "Параллельный порт LPT4"
#define STR_HDC "Контроллер HD:"
#define STR_FDC "Контроллер FD:"

2
src/win/languages/sl-SI.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "Naprava LPT1:"
#define STR_LPT2 "Naprava LPT2:"
#define STR_LPT3 "Naprava LPT3:"
#define STR_LPT4 "Naprava LPT4:"
#define STR_SERIAL1 "Serijska vrata 1"
#define STR_SERIAL2 "Serijska vrata 2"
#define STR_SERIAL3 "Serijska vrata 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Paralelna vrata 1"
#define STR_PARALLEL2 "Paralelna vrata 2"
#define STR_PARALLEL3 "Paralelna vrata 3"
#define STR_PARALLEL4 "Paralelna vrata 4"
#define STR_HDC "Krmilnik trdega diska:"
#define STR_FDC "Krmilnik disketnika:"

2
src/win/languages/tr-TR.rc
View File

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1 Cihazı:"
#define STR_LPT2 "LPT2 Cihazı:"
#define STR_LPT3 "LPT3 Cihazı:"
#define STR_LPT4 "LPT4 Cihazı:"
#define STR_SERIAL1 "Seri port 1"
#define STR_SERIAL2 "Seri port 2"
#define STR_SERIAL3 "Seri port 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "Paralel port 1"
#define STR_PARALLEL2 "Paralel port 2"
#define STR_PARALLEL3 "Paralel port 3"
#define STR_PARALLEL4 "Paralel port 4"
#define STR_HDC "HD Kontrolcüsü:"
#define STR_FDC "FD Kontrolcüsü:"

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

@@ -332,6 +332,7 @@ END
#define STR_LPT1 "LPT1 设备:"
#define STR_LPT2 "LPT2 设备:"
#define STR_LPT3 "LPT3 设备:"
#define STR_LPT4 "LPT4 设备:"
#define STR_SERIAL1 "串口 1"
#define STR_SERIAL2 "串口 2"
#define STR_SERIAL3 "串口 3"
@@ -339,6 +340,7 @@ END
#define STR_PARALLEL1 "并口 1"
#define STR_PARALLEL2 "并口 2"
#define STR_PARALLEL3 "并口 3"
#define STR_PARALLEL4 "并口 4"
#define STR_HDC "硬盘控制器:"
#define STR_FDC "软盘控制器:"