gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change atoi_short() so it returns number of bytes consumed.

Browse Source
This commit is contained in:
René van Dorst
2026-08-25 07:54:15 +02:00
parent f582576b10
commit 4937618684
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd_parser.c
+18 -12
View File
@@ -80,6 +80,8 @@ __xdata uint16_t cmd_history_ptr;
// Error set by commands // Error set by commands
__xdata uint8_t err_status; __xdata uint8_t err_status;
__xdata uint16_t atoi_results_short;
inline uint8_t isletter(uint8_t l) inline uint8_t isletter(uint8_t l)
{ {
// return (l >= 'a' && l <= 'z') || (l >= 'A' && l <= 'Z'); // return (l >= 'a' && l <= 'z') || (l >= 'A' && l <= 'Z');
@@ -203,22 +205,26 @@ uint8_t atoi_byte(__xdata uint8_t *out, uint8_t idx)
return err; return err;
} }
// return 0 on error or non-zero number of number-byte taken for the conversion.
uint8_t atoi_short(__xdata uint16_t *vlan, uint8_t idx) // Stops at any non-digit '0'-'9' char or bytes is more then 5.
uint8_t atoi_short(uint8_t idx)
{ {
uint8_t err = 1; uint8_t cnt = 0;
*vlan = 0; atoi_results_short = 0;
while (isnumber(cmd_buffer[idx])) { uint8_t *ptr = &cmd_buffer[idx];
err = 0;
uint8_t val = cmd_buffer[idx] - '0'; while (1) {
if (*vlan > 6553 || (*vlan == 6553 && val > 5)) uint8_t val = *ptr++ - '0';
return 1; if (val > 9)
*vlan = (*vlan * 10) + val; break;
idx++; if (atoi_results_short > 6553 || (atoi_results_short == 6553 && val > 5) || cnt >= 5)
return 0;
atoi_results_short = (atoi_results_short * 10) + val;
cnt++;
} }
return err; return cnt;
} }