6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2025-03-11 14:35:35 +00:00
Code Issues Projects Releases Wiki Activity

Firmware: fix issue with overflowing data space using progmem strings

Browse Source 
Change-Id: I28d37e9cc083fba0a5b988bed11e500cb082dad6
This commit is contained in:
David Banks 2019-11-09 11:19:16 +00:00
parent 76ee231cc6
commit 9711bf3a7c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firmware/AtomBusMon.c
View File

@ -418,12 +418,24 @@ void logc(char c) {
} }
} }
void logstr(char *s) { void logs(const char *s) {
while (*s) { while (*s) {
logc(*s++); logc(*s++);
} }
} }
#define logstr(s) logpgmstr(PSTR((s)))
void logpgmstr(const char *s) {
char c;
do {
c = pgm_read_byte(s++);
if (c) {
logc(c);
}
} while (c);
}
void loghex1(uint8_t i) { void loghex1(uint8_t i) {
i &= 0x0f; i &= 0x0f;
if (i < 10) { if (i < 10) {
@ -447,13 +459,13 @@ void loghex4(uint16_t i) {
//void loglong(long i) { //void loglong(long i) {
// char buffer[16]; // char buffer[16];
// // ltoa adds 176 bytes // // ltoa adds 176 bytes
// logstr(ltoa(i, buffer, 10)); // logs(ltoa(i, buffer, 10));
//} //}
// //
//void logint(int i) { //void logint(int i) {
// char buffer[16]; // char buffer[16];
// // itoa adds 176 bytes // // itoa adds 176 bytes
// logstr(itoa(i, buffer, 10)); // logs(itoa(i, buffer, 10));
//} //}
/******************************************************** /********************************************************
@ -759,7 +771,7 @@ void logMode(modes_t mode) {
if (!first) { if (!first) {
logstr(", "); logstr(", ");
} }
logstr(modeStrings[i]); logs(modeStrings[i]);
first = 0; first = 0;
} }
mode >>= 1; mode >>= 1;
@ -769,7 +781,7 @@ void logMode(modes_t mode) {
void logTrigger(trigger_t trigger) { void logTrigger(trigger_t trigger) {
if (trigger < NUM_TRIGGERS) { if (trigger < NUM_TRIGGERS) {
logstr("trigger: "); logstr("trigger: ");
logstr(triggerStrings[trigger]); logs(triggerStrings[trigger]);
} else { } else {
logstr("trigger: ILLEGAL"); logstr("trigger: ILLEGAL");
} }
@ -1056,7 +1068,7 @@ void test(addr_t start, addr_t end, int data) {
name = 5; name = 5;
} }
logstr("Memory test: "); logstr("Memory test: ");
logstr(testNames[name]); logs(testNames[name]);
if (data >= 0) { if (data >= 0) {
logc(' '); logc(' ');
loghex2(data); loghex2(data);
@ -1102,7 +1114,7 @@ void doCmdHelp(char *params) {
logstr("Commands:\n"); logstr("Commands:\n");
for (i = 0; i < NUM_CMDS; i++) { for (i = 0; i < NUM_CMDS; i++) {
logstr(" "); logstr(" ");
logstr(cmdStrings[i]); logs(cmdStrings[i]);
logc('\n'); logc('\n');
} }
} }
@ -1343,7 +1355,7 @@ void doCmdSRec(char *params) {
} }
void logSpecial(char *function, uint8_t value) { void logSpecial(char *function, uint8_t value) {
logstr(function); logs(function);
if (value) { if (value) {
logstr(" inhibited\n"); logstr(" inhibited\n");
} else { } else {
@ -1449,7 +1461,7 @@ void doCmdTrigger(char *params) {
logstr(" "); logstr(" ");
loghex1(trigger); loghex1(trigger);
logstr(" = "); logstr(" = ");
logstr(triggerStrings[trigger]); logs(triggerStrings[trigger]);
logc('\n'); logc('\n');
} }
return; return;
@ -1545,7 +1557,7 @@ void dispatchCmd(char *cmd) {
} }
} }
logstr("Unknown command "); logstr("Unknown command ");
logstr(cmd); logs(cmd);
logc('\n'); logc('\n');
} }