admin/Toyota-AVC-LAN
1
0
Fork 0
mirror of https://github.com/halleysfifthinc/AVCLAN-Mockingboard.git synced 2026-08-07 01:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tighten PIT interrupt and avoid some BCD edge-cases

Browse Source
This commit is contained in:
Allen Hill
2026-05-15 14:28:05 -07:00
parent 28ddf2139b
commit b510eaaef8
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/avclandrv.c
+28 -16
View File
@@ -310,26 +310,38 @@ void AVCLAN_init() {
CD_Mode = stStop; CD_Mode = stStop;
} }
/* Increment packed 2-digit BCD number. /* Pack a 0–99 count into 2-digit BCD. Values >99 (sentinels such as 0xFF /
WARNING: Overflow behavior is incorrect (e.g. `incBCD(0x99) != 0x00`) */ 0x7F meaning "no time") pass through unchanged so they survive the wire
void incBCD(uint8_t *data) { round-trip. */
if ((*data & 0x9) == 0x9) static uint8_t toBCD(uint8_t x) {
*data += 7; if (x > 99)
else return x;
*data += 1; return (uint8_t)(((x / 10) << 4) | (x % 10));
}
// Copy cd_status to a wire response, applying BCD conversion to time fields.
static void serializeCDStatus(uint8_t *dst) {
AVCLAN_CD_Status_t wire = cd_status;
wire.mins = toBCD(wire.mins);
wire.secs = toBCD(wire.secs);
memcpy(dst, &wire, sizeof(wire));
} }
uint8_t AVCLAN_isPlaying() { return (CD_Mode == stPlay); } uint8_t AVCLAN_isPlaying() { return (CD_Mode == stPlay); }
void AVCLAN_incrementTime() { void AVCLAN_incrementTime() {
if (*cd_Time_Sec == 0x59) { // Sentinel values (>99) mean "no time"; leave them alone until setTime()
// replaces them with a real count.
if (*cd_Time_Sec > 99)
return;
if (*cd_Time_Sec == 59) {
*cd_Time_Sec = 0; *cd_Time_Sec = 0;
if (*cd_Time_Min == 0x99) { if (*cd_Time_Min == 99)
*cd_Time_Min = 0; *cd_Time_Min = 0;
} else else
incBCD(cd_Time_Min); (*cd_Time_Min)++;
} else } else
incBCD(cd_Time_Sec); (*cd_Time_Sec)++;
} }
void AVCLAN_setTime(uint8_t mins, uint8_t secs) { void AVCLAN_setTime(uint8_t mins, uint8_t secs) {
@@ -887,7 +899,7 @@ response_t AVCLAN_handleframe(const AVCLAN_frame_t *in, AVCLAN_frame_t *out) {
const uint8_t b0 = *data++; const uint8_t b0 = *data++;
const uint8_t b1 = *data++; const uint8_t b1 = *data++;
const uint8_t b2 = *data++; const uint8_t b2 = *data++;
uint8_t b3; uint8_t b3 = 0;
if (in->length > 3) // the shortest known/valid messages are 3 bytes long if (in->length > 3) // the shortest known/valid messages are 3 bytes long
b3 = *data++; b3 = *data++;
uint8_t from; uint8_t from;
@@ -1018,7 +1030,7 @@ response_t AVCLAN_handleframe(const AVCLAN_frame_t *in, AVCLAN_frame_t *out) {
out->data[1] = from; // respond to device that requested out->data[1] = from; // respond to device that requested
out->data[2] = Playback_Report; out->data[2] = Playback_Report;
out->length = sizeof(cdstatus_resp); out->length = sizeof(cdstatus_resp);
memcpy(&out->data[3], &cd_status, sizeof(cd_status)); serializeCDStatus(&out->data[3]);
goto CMD_SW_RESPONSE; goto CMD_SW_RESPONSE;
case Loading_Request2: case Loading_Request2:
out->length = sizeof(cdloading_resp); out->length = sizeof(cdloading_resp);
@@ -1070,7 +1082,7 @@ response_t AVCLAN_handleframe(const AVCLAN_frame_t *in, AVCLAN_frame_t *out) {
out->data[1] = from; // respond to device that requested out->data[1] = from; // respond to device that requested
out->data[2] = Playback_Report; out->data[2] = Playback_Report;
out->length = sizeof(cdstatus_resp); out->length = sizeof(cdstatus_resp);
memcpy(&out->data[3], &cd_status, sizeof(cd_status)); serializeCDStatus(&out->data[3]);
goto STATUS_RESPONSE; goto STATUS_RESPONSE;
case Loading_Request2: case Loading_Request2:
out->length = sizeof(cdloading_resp); out->length = sizeof(cdloading_resp);
@@ -1225,7 +1237,7 @@ void AVCLAN_generateStatus(AVCLAN_frame_t *status) {
status->data[0] = dev_CD_CHANGER; status->data[0] = dev_CD_CHANGER;
status->data[1] = dev_STATUS; status->data[1] = dev_STATUS;
status->data[2] = Status_Report; status->data[2] = Status_Report;
memcpy(&status->data[3], &cd_status, sizeof(cd_status)); serializeCDStatus(&status->data[3]);
} }
void AVCLAN_normalizeState() { void AVCLAN_normalizeState() {