diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h index e5f0bac94..4dbb9c79a 100644 --- a/src/include/86box/86box.h +++ b/src/include/86box/86box.h @@ -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 diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h index 109de58ba..d0f881773 100644 --- a/src/include/86box/lpt.h +++ b/src/include/86box/lpt.h @@ -24,13 +24,27 @@ extern void lpt1_remove_ams(void); #define lpt1_init(a) lpt_port_init(0, a) #define lpt1_irq(a) lpt_port_irq(0, a) #define lpt1_remove() lpt_port_remove(0) + #define lpt2_init(a) lpt_port_init(1, a) #define lpt2_irq(a) lpt_port_irq(1, a) #define lpt2_remove() lpt_port_remove(1) + #define lpt3_init(a) lpt_port_init(2, a) #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,7 +59,7 @@ typedef struct { void * priv; } lpt_port_t; -extern lpt_port_t lpt_ports[3]; +extern lpt_port_t lpt_ports[PARALLEL_MAX]; extern void lpt_write(uint16_t port, uint8_t val, void *priv); extern uint8_t lpt_read(uint16_t port, void *priv); diff --git a/src/lpt.c b/src/lpt.c index d528c2911..e2cb6ad5e 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -14,7 +14,7 @@ #include <86box/net_plip.h> -lpt_port_t lpt_ports[3]; +lpt_port_t lpt_ports[PARALLEL_MAX]; static const struct { @@ -74,7 +74,7 @@ lpt_devices_init(void) { int i = 0; - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].dt = (lpt_device_t *) lpt_devices[lpt_ports[i].device].device; if (lpt_ports[i].dt) @@ -89,7 +89,7 @@ lpt_devices_close(void) int i = 0; lpt_port_t *dev; - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { dev = &lpt_ports[i]; if (dev->dt) @@ -176,10 +176,10 @@ void lpt_init(void) { int i; - uint16_t default_ports[3] = { 0x378, 0x278, 0x3bc }; - uint8_t default_irqs[3] = { 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 < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].addr = 0xffff; lpt_ports[i].irq = 0xff; lpt_ports[i].enable_irq = 0x10; diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index b63d8a176..a68446043 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap zařízení:" #define STR_NET "Síťový adaptér:" +#define STR_COM1 "Zařízení na COM1" +#define STR_COM2 "Zařízení na COM2" +#define STR_COM3 "Zařízení na COM3" +#define STR_COM4 "Zařízení na COM4" #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" @@ -338,6 +343,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č:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index eaaa28171..b45d0e013 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap-Gerät:" #define STR_NET "Netzwerkadapter:" +#define STR_COM1 "COM1-Gerät" +#define STR_COM2 "COM2-Gerät" +#define STR_COM3 "COM3-Gerät" +#define STR_COM4 "COM4-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" @@ -338,6 +343,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:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 9f4211aa0..14d3512b6 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -522,9 +522,14 @@ END #undef STR_PCAP #undef STR_NET +#undef STR_COM1 +#undef STR_COM2 +#undef STR_COM3 +#undef STR_COM4 #undef STR_LPT1 #undef STR_LPT2 #undef STR_LPT3 +#undef STR_LPT4 #undef STR_SERIAL1 #undef STR_SERIAL2 #undef STR_SERIAL3 @@ -532,6 +537,7 @@ END #undef STR_PARALLEL1 #undef STR_PARALLEL2 #undef STR_PARALLEL3 +#undef STR_PARALLEL4 #undef STR_HDC #undef STR_FDC diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 61749d954..6c3e5bda0 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap device:" #define STR_NET "Network adapter:" +#define STR_COM1 "COM1 Device:" +#define STR_COM2 "COM2 Device:" +#define STR_COM3 "COM3 Device:" +#define STR_COM4 "COM4 Device:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 3bee70556..63b8ea82c 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap device:" #define STR_NET "Network adapter:" +#define STR_COM1 "COM1 Device:" +#define STR_COM2 "COM2 Device:" +#define STR_COM3 "COM3 Device:" +#define STR_COM4 "COM4 Device:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 2232e69c5..a7157cf33 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Adaptador de red:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 6b58bd593..b5fd58d71 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Dispositif PCap:" #define STR_NET "Adaptateur de réseau:" +#define STR_COM1 "Dispositif COM1:" +#define STR_COM2 "Dispositif COM2:" +#define STR_COM3 "Dispositif COM3:" +#define STR_COM4 "Dispositif COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index c6d4c4cc5..f0662c077 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Uređaj PCap:" #define STR_NET "Mrežna kartica:" +#define STR_COM1 "Uređaj COM1:" +#define STR_COM2 "Uređaj COM2:" +#define STR_COM3 "Uređaj COM3:" +#define STR_COM4 "Uređaj COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 731ef0e42..8ad87ec22 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -331,9 +331,14 @@ END #define STR_PCAP "PCap eszköz:" #define STR_NET "Hálózati kártya:" +#define STR_COM1 "COM1 eszköz:" +#define STR_COM2 "COM2 eszköz:" +#define STR_COM3 "COM3 eszköz:" +#define STR_COM4 "COM4 eszköz:" #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" @@ -341,6 +346,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ő:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 461b76e71..ec6e7132d 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Scheda di rete:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index e88e1822c..56f52eebd 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCapデバイス:" #define STR_NET "ネットワークカード:" +#define STR_COM1 "COM1デバイス:" +#define STR_COM2 "COM2デバイス:" +#define STR_COM3 "COM3デバイス:" +#define STR_COM4 "COM4デバイス:" #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" @@ -338,6 +343,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コントローラー:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index a46c8f6d7..23a97b916 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap 장치:" #define STR_NET "네트워크 어댑터:" +#define STR_COM1 "COM1 장치:" +#define STR_COM2 "COM2 장치:" +#define STR_COM3 "COM3 장치:" +#define STR_COM4 "COM4 장치:" #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" @@ -338,6 +343,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 컨트롤러:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 06a000458..cbaca2c8a 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -331,9 +331,14 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Adaptador de rede:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #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" @@ -341,6 +346,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:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index a424ad141..755a4a737 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Placa de rede:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #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" @@ -338,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:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 413b0c5f3..81bdcdb12 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Устройство PCap:" #define STR_NET "Сетевая карта:" +#define STR_COM1 "Устройство COM1:" +#define STR_COM2 "Устройство COM2:" +#define STR_COM3 "Устройство COM3:" +#define STR_COM4 "Устройство COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index fb1c80b8b..24c4cbac1 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "Naprava PCap:" #define STR_NET "Omrežna kartica:" +#define STR_COM1 "Naprava COM1:" +#define STR_COM2 "Naprava COM2:" +#define STR_COM3 "Naprava COM3:" +#define STR_COM4 "Naprava COM4:" #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" @@ -338,6 +343,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:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 5d2ef2c50..cd1975f32 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap cihazı:" #define STR_NET "Ağ cihazı:" +#define STR_COM1 "COM1 Cihazı:" +#define STR_COM2 "COM2 Cihazı:" +#define STR_COM3 "COM3 Cihazı:" +#define STR_COM4 "COM4 Cihazı:" #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" @@ -338,6 +343,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ü:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 37c5621ab..fa70dffec 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap 设备:" #define STR_NET "网络适配器:" +#define STR_COM1 "COM1 设备:" +#define STR_COM2 "COM2 设备:" +#define STR_COM3 "COM3 设备:" +#define STR_COM4 "COM4 设备:" #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" @@ -338,6 +343,7 @@ END #define STR_PARALLEL1 "并口 1" #define STR_PARALLEL2 "并口 2" #define STR_PARALLEL3 "并口 3" +#define STR_PARALLEL4 "并口 4" #define STR_HDC "硬盘控制器:" #define STR_FDC "软盘控制器:" diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 2f2324e2e..3511277ef 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -99,8 +99,8 @@ static int temp_net_type, temp_net_card; static char temp_pcap_dev[522]; /* Ports category */ -static int temp_lpt_devices[3]; -static int temp_serial[4], temp_lpt[3]; +static int temp_lpt_devices[PARALLEL_MAX]; +static int temp_serial[SERIAL_MAX], temp_lpt[PARALLEL_MAX]; /* Other peripherals category */ static int temp_fdc_card, temp_hdc, temp_ide_ter, temp_ide_qua, temp_cassette; @@ -357,11 +357,11 @@ win_settings_init(void) temp_net_card = network_card; /* Ports category */ - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { temp_lpt_devices[i] = lpt_ports[i].device; temp_lpt[i] = lpt_ports[i].enabled; } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) temp_serial[i] = serial_enabled[i]; /* Storage devices category */ @@ -477,11 +477,11 @@ win_settings_changed(void) i = i || (network_card != temp_net_card); /* Ports category */ - for (j = 0; j < 3; j++) { + for (j = 0; j < PARALLEL_MAX; j++) { i = i || (temp_lpt_devices[j] != lpt_ports[j].device); i = i || (temp_lpt[j] != lpt_ports[j].enabled); } - for (j = 0; j < 4; j++) + for (j = 0; j < SERIAL_MAX; j++) i = i || (temp_serial[j] != serial_enabled[j]); /* Storage devices category */ @@ -568,11 +568,11 @@ win_settings_save(void) network_card = temp_net_card; /* Ports category */ - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].device = temp_lpt_devices[i]; lpt_ports[i].enabled = temp_lpt[i]; } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) serial_enabled[i] = temp_serial[i]; /* Storage devices category */ @@ -1504,7 +1504,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG: lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { c = 0; while (1) { s = lpt_device_get_name(c); @@ -1527,7 +1527,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) settings_enable_window(hdlg, IDC_COMBO_LPT1 + i, temp_lpt[i]); } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) settings_set_check(hdlg, IDC_CHECK_SERIAL1 + i, temp_serial[i]); free(lptsTemp); @@ -1547,12 +1547,12 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_SAVESETTINGS: - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { temp_lpt_devices[i] = settings_get_cur_sel(hdlg, IDC_COMBO_LPT1 + i); temp_lpt[i] = settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i); } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) temp_serial[i] = settings_get_check(hdlg, IDC_CHECK_SERIAL1 + i); default: