Skip to content

debug #634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
radius75 wants to merge 3 commits into from
Closed

debug #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06de809
1.
radius75 Feb 3, 2026
9cc9924
2.
radius75 Feb 3, 2026
eb74dd2
Merge branch 'GideonZ:master' into debug
radius75 Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion software/io/acia/acia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ class Acia
int GetRxSpace(void);
volatile uint8_t *GetRxPointer(void);
void AdvanceRx(int);

uint8_t GetStatus(void) { return regs->status; }
uint8_t GetCommand(void) { return regs->command; }
uint8_t IrqHandler(void);

void GetHwMapping(uint8_t& enabled, uint16_t& address, uint8_t& nmi);
Expand Down
50 changes: 25 additions & 25 deletions software/io/acia/modem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void Modem :: RunRelay(int socket)
if (!tcp_buffer_valid) {
ret = recv(socket, tcp_receive_buffer, 512, 0);
if (ret > 0) {
//printf("[%d] TCP: %d\n", xTaskGetTickCount(), ret);
printf("TCP:%d ", ret);
tcp_buffer_valid = ret;
tcp_buffer_offset= 0;
} else if(ret == 0) {
Expand All @@ -205,13 +205,13 @@ void Modem :: RunRelay(int socket)
if (tcp_buffer_valid > space) {
memcpy((void *)dest, tcp_receive_buffer + tcp_buffer_offset, space);
acia.AdvanceRx(space);
//printf("[%d] Rx: Got=%d. Push:%d.\n", xTaskGetTickCount(), tcp_buffer_valid, space);
printf("Rx:%d/%d ", tcp_buffer_valid, space);
tcp_buffer_valid -= space;
tcp_buffer_offset += space;
} else {
memcpy((void *)dest, tcp_receive_buffer + tcp_buffer_offset, tcp_buffer_valid);
acia.AdvanceRx(tcp_buffer_valid);
//printf("[%d] Rx: Got=%d. Push: All.\n", xTaskGetTickCount(), tcp_buffer_valid);
printf("Rx:All ");
tcp_buffer_valid = 0;
}
}
Expand Down Expand Up @@ -248,7 +248,7 @@ void Modem :: RunRelay(int socket)
}
}
ret = send(socket, pnt, avail, 0);
//printf("[%d] Tx: Got=%d. Sent:%d\n", xTaskGetTickCount(), avail, ret);
printf("Tx:%d/%d ", avail, ret);
if (ret > 0) {
aciaTxBuffer->AdvanceReadPointer(ret);
} else if(ret < 0) {
Expand Down Expand Up @@ -706,7 +706,7 @@ int Modem :: ExecuteCommand(ModemCommand_t *cmd)

//ATA command does not return a response (except for CONNECT response)
if(doesResponse)
acia.SendToRx((uint8_t *)response, strlen(response));
acia.SendToRx((uint8_t *)response, strlen(response));

return connectionStateChange;
}
Expand Down Expand Up @@ -754,7 +754,7 @@ void Modem :: ModemTask()

while(1) {
xQueueReceive(aciaQueue, &message, portMAX_DELAY);
//printf("Message type: %d. Value: %b. DataLen: %d Buffer: %d\n", message.messageType, message.smallValue, message.dataLength, aciaTxBuffer->AvailableData());
printf("MSG:%d V:%02X [S:%02X C:%02X]\n", message.messageType, message.smallValue, acia.GetStatus(), acia.GetCommand());
switch(message.messageType) {
case ACIA_MSG_CONTROL:
newRate = baudRates[message.smallValue & 0x0F];
Expand All @@ -778,7 +778,7 @@ void Modem :: ModemTask()
acia.SetHS(message.smallValue);
break;
case ACIA_MSG_HANDSH:
//printf("HANDSH=%b\n", message.smallValue);
printf("HANDSH=%b\n", message.smallValue);
lastHandshake = message.smallValue;
if (!(message.smallValue & ACIA_HANDSH_DTR) && dropOnDTR) {
keepConnection = false;
Expand All @@ -787,29 +787,29 @@ void Modem :: ModemTask()
//acia.SendToRx((uint8_t *)outbuf, strlen(outbuf));
break;
case ACIA_MSG_TXDATA:
if (commandMode) {
{
len = aciaTxBuffer->Get(txbuf, 30);
if (echo) {
acia.SendToRx(txbuf, len); // local echo
}
txbuf[len] = 0;
CollectCommand(&modemCommand, (char *)txbuf, len);
if (modemCommand.state == 3) {
// Let's check if the modem is in a call
if (xSemaphoreTake(connectionLock, 0) != pdTRUE) {
if (xQueueSend(commandQueue, &modemCommand, 10) == pdFALSE) {
acia.SendToRx((uint8_t *)"NAK\r", 4);
printf("B>%02X:%02X Spc:%d [%d] ", acia.GetStatus(), acia.GetCommand(), acia.GetRxSpace(), len);
if (commandMode) {
if (echo) {
acia.SendToRx(txbuf, len);
}
CollectCommand(&modemCommand, (char *)txbuf, len);
if (modemCommand.state == 3) {
if (xSemaphoreTake(connectionLock, 0) != pdTRUE) {
if (xQueueSend(commandQueue, &modemCommand, 10) == pdFALSE) {
acia.SendToRx((uint8_t *)"NAK\r", 4);
}
} else {
xSemaphoreGive(connectionLock);
ExecuteCommand(&modemCommand);
}
} else {
// we were not in a call, release the semaphore that we got
xSemaphoreGive(connectionLock);
// Not in a call, we just execute the command right away
ExecuteCommand(&modemCommand);
modemCommand.state = 0;
modemCommand.length = 0;
}
modemCommand.state = 0;
modemCommand.length = 0;
}
} // else: relay thread will take the data and send it to the socket
}
break;
}
}
Expand Down