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

Modem: Extra logging and misc improvements

Browse Source
This commit is contained in:
Alexander Babikov
2024-04-01 12:50:23 +05:00
parent 9b8680b7cf
commit 93f7705c83
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/net_modem.c
View File

@@ -35,6 +35,7 @@
#include <86box/serial.h> #include <86box/serial.h>
#include <86box/plat.h> #include <86box/plat.h>
#include <86box/network.h> #include <86box/network.h>
#include <86box/version.h>
#include <86box/plat_unused.h> #include <86box/plat_unused.h>
#include <86box/plat_netsocket.h> #include <86box/plat_netsocket.h>
@@ -523,6 +524,7 @@ void modem_send_res(modem_t* modem, const ResTypes response) {
response == ResCONNECT || response == ResNOCARRIER)) { response == ResCONNECT || response == ResNOCARRIER)) {
return; return;
} }
pclog("Modem response: %s\n", response_str);
if (modem->numericresponse && code != ~0) { if (modem->numericresponse && code != ~0) {
modem_send_number(modem, code); modem_send_number(modem, code);
} else if (response_str != NULL) { } else if (response_str != NULL) {
@@ -651,6 +653,8 @@ modem_dial(modem_t* modem, const char* str)
char buf[NUMBER_BUFFER_SIZE] = ""; char buf[NUMBER_BUFFER_SIZE] = "";
strncpy(buf, str, sizeof(buf) - 1); strncpy(buf, str, sizeof(buf) - 1);
strncpy(modem->lastnumber, str, sizeof(modem->lastnumber) - 1); strncpy(modem->lastnumber, str, sizeof(modem->lastnumber) - 1);
pclog("Connecting to %s...\n", buf);
// Scan host for port // Scan host for port
uint16_t port; uint16_t port;
char * hasport = strrchr(buf,':'); char * hasport = strrchr(buf,':');
@@ -800,6 +804,7 @@ modem_do_command(modem_t* modem, int repeat)
foundstr = modem->numberinprogress; foundstr = modem->numberinprogress;
} }
pclog("Dialing number %s\n", foundstr);
mappedaddr = modem_get_address_from_phonebook(modem, foundstr); mappedaddr = modem_get_address_from_phonebook(modem, foundstr);
if (mappedaddr) { if (mappedaddr) {
modem_dial(modem, mappedaddr); modem_dial(modem, mappedaddr);
@@ -858,7 +863,7 @@ modem_do_command(modem_t* modem, int repeat)
case 'I': // Some strings about firmware case 'I': // Some strings about firmware
switch (modem_scan_number(&scanbuf)) { switch (modem_scan_number(&scanbuf)) {
case 3: modem_send_line(modem, "86Box Emulated Modem Firmware V1.00"); break; case 3: modem_send_line(modem, "86Box Emulated Modem Firmware V1.00"); break;
case 4: modem_send_line(modem, "Modem compiled for 86Box"); break; case 4: modem_send_line(modem, "Modem compiled for 86Box version " EMU_VERSION); break;
} }
break; break;
case 'E': // Echo on/off case 'E': // Echo on/off
@@ -902,6 +907,8 @@ modem_do_command(modem_t* modem, int repeat)
break; break;
case 'M': // Monitor case 'M': // Monitor
case 'L': // Volume case 'L': // Volume
case 'W':
case 'X':
modem_scan_number(&scanbuf); modem_scan_number(&scanbuf);
break; break;
case 'A': // Answer call case 'A': // Answer call
@@ -1039,13 +1046,16 @@ modem_dtr_callback_timer(void* priv)
if (dev->connected) { if (dev->connected) {
switch (dev->dtrmode) { switch (dev->dtrmode) {
case 1: case 1:
pclog("DTR dropped, returning to command mode (dtrmode = %i)\n", dev->dtrmode);
dev->mode = MODEM_MODE_COMMAND; dev->mode = MODEM_MODE_COMMAND;
break; break;
case 2: case 2:
pclog("DTR dropped, hanging up (dtrmode = %i)\n", dev->dtrmode);
modem_send_res(dev, ResNOCARRIER); modem_send_res(dev, ResNOCARRIER);
modem_enter_idle_state(dev); modem_enter_idle_state(dev);
break; break;
case 3: case 3:
pclog("DTR dropped, resetting modem (dtrmode = %i)\n", dev->dtrmode);
modem_send_res(dev, ResNOCARRIER); modem_send_res(dev, ResNOCARRIER);
modem_reset(dev); modem_reset(dev);
break; break;
@@ -1388,6 +1398,7 @@ modem_cmdpause_timer_callback(void *priv)
if (modem->plusinc == 0) { if (modem->plusinc == 0) {
modem->plusinc = 1; modem->plusinc = 1;
} else if (modem->plusinc == 4) { } else if (modem->plusinc == 4) {
pclog("Escape sequence triggered, returning to command mode\n");
modem->mode = MODEM_MODE_COMMAND; modem->mode = MODEM_MODE_COMMAND;
modem_send_res(modem, ResOK); modem_send_res(modem, ResOK);
modem->plusinc = 0; modem->plusinc = 0;