diff options
Diffstat (limited to 'avr')
-rw-r--r-- | avr/cmd_fat.c | 8 | ||||
-rw-r--r-- | avr/cmd_run.c | 2 | ||||
-rw-r--r-- | avr/cmd_sd.c | 8 | ||||
-rw-r--r-- | avr/command_tbl.c | 2 | ||||
-rw-r--r-- | avr/debug.c | 2 | ||||
-rw-r--r-- | avr/i2c.c | 8 | ||||
-rw-r--r-- | avr/print-utils.c | 13 |
7 files changed, 25 insertions, 18 deletions
diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index 8c8a308..8af8408 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -51,8 +51,12 @@ static FATFS FatFs1; void setup_fatfs(void) { - f_mount(&FatFs0, "0:", 0); - f_mount(&FatFs1, "1:", 0); + char drv[3]; + + strcpy_P(drv, PSTR("0:")); + f_mount(&FatFs0, drv, 0); + drv[0] = '1'; + f_mount(&FatFs1, drv, 0); } DWORD get_fattime (void) diff --git a/avr/cmd_run.c b/avr/cmd_run.c index 6482d0b..d5e3658 100644 --- a/avr/cmd_run.c +++ b/avr/cmd_run.c @@ -34,7 +34,7 @@ command_ret_t do_run(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag, int argc, char command_ret_t do_bootd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag, int argc UNUSED, char * const argv[] UNUSED) { - return run_command(getenv_str("bootcmd"), flag); + return run_command(getenv_str(PSTR(ENV_BOOTCMD)), flag); } static int source(FIL *fp, uint_fast8_t flag, int argc UNUSED, char * const argv[] UNUSED) diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c index 440bfd4..2a1874c 100644 --- a/avr/cmd_sd.c +++ b/avr/cmd_sd.c @@ -100,13 +100,13 @@ command_ret_t do_info(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons if (disk_ioctl(dev, MMC_GET_TYPE, &dat.uc) == RES_OK) printf_P(PSTR("Card type: %u\n"), dat.uc); if (disk_ioctl(dev, MMC_GET_CSD, dat.uca) == RES_OK) - dump_ram(dat.uca, 0, 16, "CSD:"); + dump_ram(dat.uca, 0, 16, PSTR("CSD:")); if (disk_ioctl(dev, MMC_GET_CID, dat.uca) == RES_OK) - dump_ram(dat.uca, 0, 16, "CID:"); + dump_ram(dat.uca, 0, 16, PSTR("CID:")); if (disk_ioctl(dev, MMC_GET_OCR, dat.uca) == RES_OK) - dump_ram(dat.uca, 0, 4, "OCR:"); + dump_ram(dat.uca, 0, 4, PSTR("OCR:")); if (disk_ioctl(dev, MMC_GET_SDSTAT, dat.uca) == RES_OK) - dump_ram(dat.uca, 0, 64, "SD Status:"); + dump_ram(dat.uca, 0, 64, PSTR("SD Status:")); return CMD_RET_SUCCESS; } diff --git a/avr/command_tbl.c b/avr/command_tbl.c index 053b856..6b165f0 100644 --- a/avr/command_tbl.c +++ b/avr/command_tbl.c @@ -121,7 +121,7 @@ CMD_TBL_ITEM_COMPLETE( var_complete ), CMD_TBL_ITEM( - boot, 1, 1, do_bootd, + boot, 1, 0, do_bootd, "boot default, i.e., run 'bootcmd'", "" ), diff --git a/avr/debug.c b/avr/debug.c index ea21583..e064167 100644 --- a/avr/debug.c +++ b/avr/debug.c @@ -244,7 +244,7 @@ void dump_heap(void) //extern unsigned int __brkval; dump_ram((uint8_t *)__malloc_heap_start, (size_t) __malloc_heap_start, __brkval - __malloc_heap_start, - "=== Heap:"); + PSTR("=== Heap:")); } command_ret_t do_pr_heap_avr(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) @@ -255,7 +255,7 @@ int_fast8_t i2c_waitready(void) xmit.stat |= timeout; #if DEBUG_I2C - dump_ram((uint8_t *) &xmit, 4, "=== i2c_wait ready: (done)"); + dump_ram((uint8_t *) &xmit, 4, PSTR("=== i2c_wait ready: (done)")); _delay_ms(30); #endif return xmit.stat; @@ -282,7 +282,7 @@ int i2c_send(uint8_t chip, uint16_t addr, uint8_t alen, uint8_t *buffer, int8_t xmit.len = i; #if DEBUG_I2C - dump_ram((uint8_t *) &xmit, 0x20, "=== i2c_send"); + dump_ram((uint8_t *) &xmit, 0x20, PSTR("=== i2c_send")); _delay_ms(30); #endif /* Enable TWI, TWI int and initiate start condition */ @@ -307,7 +307,7 @@ int i2c_recv(uint8_t chip, uint8_t *buffer, int8_t len) xmit.buf[0] = (chip<<1) | 1; #if DEBUG_I2C - dump_ram((uint8_t *) &xmit, 0x20, "=== i2c_recv: before start"); + dump_ram((uint8_t *) &xmit, 0x20, PSTR("=== i2c_recv: before start")); _delay_ms(30); #endif /* Enable TWI, TWI int and initiate start condition */ @@ -315,7 +315,7 @@ int i2c_recv(uint8_t chip, uint8_t *buffer, int8_t len) rc = i2c_waitready(); #if DEBUG_I2C - dump_ram((uint8_t *) &xmit, 0x20, "=== i2c_recv: after completion"); + dump_ram((uint8_t *) &xmit, 0x20, PSTR("=== i2c_recv: after completion")); _delay_ms(30); #endif if (rc & DATA_ACK) { diff --git a/avr/print-utils.c b/avr/print-utils.c index ea3b5cf..26f499f 100644 --- a/avr/print-utils.c +++ b/avr/print-utils.c @@ -37,7 +37,7 @@ ERRNUM flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count) } ERRNUM dump_mem(uint32_t address, uint32_t offset, uint32_t len, - ERRNUM (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title) + ERRNUM (*readfkt)(uint8_t *, uint32_t, uint8_t), const MEMX char *title) { uint8_t buf[16]; uint8_t llen = 16; @@ -46,8 +46,11 @@ ERRNUM dump_mem(uint32_t address, uint32_t offset, uint32_t len, len += pre; uint8_t i; - if (title && *title) { - printf_P(PSTR("%s\n"),title); + if (title) { + char c; + while ((c = *title++) != '\0') + putchar(c); + putchar('\n'); } while (len) { @@ -86,12 +89,12 @@ ERRNUM dump_mem(uint32_t address, uint32_t offset, uint32_t len, return ESUCCESS; } -void dump_eep(uint32_t addr, unsigned int len, char *title) +void dump_eep(uint32_t addr, unsigned int len, const MEMX char *title) { dump_mem(addr, addr, len, eeprom_read_buf, title); } -void dump_ram(uint8_t *addr, size_t offset, unsigned int len, char *title) +void dump_ram(uint8_t *addr, size_t offset, unsigned int len, const MEMX char *title) { dump_mem((uint32_t) (size_t) addr, offset, len, ram_read_buf, title); } |