deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix flash routines on GNU/Linux.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
2017-09-08 20:53:56 +09:00
parent 2c9191c4b3
commit e671a539b0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mcu/sys-gnu-linux.c
View File

@@ -86,13 +86,13 @@ flash_unlock (void)
}
int
flash_program_halfword (uint32_t addr, uint16_t data)
flash_program_halfword (uintptr_t addr, uint16_t data)
{
off_t offset;
char buf[2];
fprintf (stderr, "flash_program_halfword: addr=%08x, data=%04x\n", addr, data);
offset = (off_t)(addr - (uint32_t)flash_addr);
fprintf (stderr, "flash_program_halfword: addr=%016lx, data=%04x\n", addr, data);
offset = (off_t)(addr - (uintptr_t)flash_addr);
offset = lseek (flash_fd, offset, SEEK_SET);
if (offset == (off_t)-1)
{
@@ -112,13 +112,13 @@ flash_program_halfword (uint32_t addr, uint16_t data)
static const uint8_t erased[] = { [0 ... 1023 ] = 0xff };
int
flash_erase_page (uint32_t addr)
flash_erase_page (uintptr_t addr)
{
off_t offset;
fprintf (stderr, "flash_erase_page: addr=%08x\n", addr);
fprintf (stderr, "flash_erase_page: addr=%016lx\n", addr);
offset = (off_t)(addr - (uint32_t)flash_addr);
offset = (off_t)(addr - (uintptr_t)flash_addr);
offset = lseek (flash_fd, offset, SEEK_SET);
if (offset == (off_t)-1)
{
@@ -126,7 +126,7 @@ flash_erase_page (uint32_t addr)
return 1;
}
if (write (flash_fd, erased, sizeof (erased)) != len)
if (write (flash_fd, erased, sizeof (erased)) != sizeof (erased))
{
perror ("flash_erase_page");
return 2;
@@ -147,13 +147,13 @@ flash_check_blank (const uint8_t *p_start, size_t size)
}
int
flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
flash_write (uintptr_t dst_addr, const uint8_t *src, size_t len)
{
off_t offset;
fprintf (stderr, "flash_write: addr=%08x, %p, %zd\n", dst_addr, src, len);
fprintf (stderr, "flash_write: addr=%016lx, %p, %zd\n", dst_addr, src, len);
offset = (off_t)(dst_addr - (uint32_t)flash_addr);
offset = (off_t)(dst_addr - (uintptr_t)flash_addr);
offset = lseek (flash_fd, offset, SEEK_SET);
if (offset == (off_t)-1)
{
@@ -161,7 +161,7 @@ flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
return 1;
}
if (write (flash_fd, src, len) != len)
if (write (flash_fd, src, len) != (ssize_t)len)
{
perror ("flash_write");
return 2;

6
mcu/sys-gnu-linux.h
View File

@@ -23,10 +23,10 @@ unique_device_id (void)
void set_led (int on);
void flash_unlock (void);
int flash_program_halfword (uint32_t addr, uint16_t data);
int flash_erase_page (uint32_t addr);
int flash_program_halfword (uintptr_t addr, uint16_t data);
int flash_erase_page (uintptr_t addr);
int flash_check_blank (const uint8_t *p_start, size_t size);
int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len);
int flash_write (uintptr_t dst_addr, const uint8_t *src, size_t len);
int flash_protect (void);
void __attribute__((noreturn))
flash_erase_all_and_exec (void (*entry)(void));