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

improve regnual

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-05-23 12:16:31 +09:00
parent d3af289b3c
commit 8e4775ab4a
4 changed files with 38 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2012-05-23 Niibe Yutaka <gniibe@fsij.org>
* regnual/regnual.c (regnual_setup): Don't call flash_write here.
(regnual_ctrl_write_finish): But call here.
(USB_REGNUAL_RESULT): New.
2012-05-22 Niibe Yutaka <gniibe@fsij.org> 2012-05-22 Niibe Yutaka <gniibe@fsij.org>
* src/configure (../regnual/sys.h): Create symblic link. * src/configure (../regnual/sys.h): Create symblic link.

59
regnual/regnual.c
View File

@@ -33,8 +33,7 @@ extern void *memset (void *s, int c, size_t n);
extern void set_led (int); extern void set_led (int);
extern uint8_t _flash_start, _flash_end; extern uint8_t _flash_start, _flash_end;
extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len); extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len);
extern int flash_erase_page (uint32_t addr); extern int flash_protect (uint16_t protection);
extern int flash_protect (void);
extern void nvic_system_reset (void); extern void nvic_system_reset (void);
@@ -123,15 +122,15 @@ regnual_device_reset (void)
64); 64);
} }
#define USB_REGNUAL_MEMINFO 0 #define USB_REGNUAL_MEMINFO 0
#define USB_REGNUAL_SEND 1 #define USB_REGNUAL_SEND 1
#define USB_REGNUAL_CRC32 2 #define USB_REGNUAL_RESULT 2
#define USB_REGNUAL_FLASH 3 #define USB_REGNUAL_FLASH 3
#define USB_REGNUAL_ERASE 4 #define USB_REGNUAL_PROTECT 4
#define USB_REGNUAL_PROTECT 5 #define USB_REGNUAL_FINISH 5
#define USB_REGNUAL_FINISH 6
static uint8_t mem[256]; static uint8_t mem[256];
static uint32_t result;
static const uint8_t *const mem_info[] = { &_flash_start, &_flash_end, }; static const uint8_t *const mem_info[] = { &_flash_start, &_flash_end, };
@@ -145,9 +144,21 @@ static void regnual_ctrl_write_finish (uint8_t req, uint8_t req_no,
if (type_rcp == (VENDOR_REQUEST | DEVICE_RECIPIENT) if (type_rcp == (VENDOR_REQUEST | DEVICE_RECIPIENT)
&& USB_SETUP_SET (req) && len == 0) && USB_SETUP_SET (req) && len == 0)
{ {
if (req_no == USB_REGNUAL_FINISH && value == 0 && index == 0) if (req_no == USB_REGNUAL_SEND && index == 0)
{
result = 0; // calculate crc32 here!!!
}
else if (req_no == USB_REGNUAL_FLASH && index == 0)
{
uint32_t dst_addr = (0x08000000 + value * 0x100);
result = flash_write (dst_addr, mem, 256);
}
else if (req_no == USB_REGNUAL_PROTECT && index == 0)
result = flash_protect (value);
else if (req_no == USB_REGNUAL_FINISH && value == 0 && index == 0)
nvic_system_reset (); nvic_system_reset ();
} }
} }
static int static int
@@ -165,11 +176,9 @@ regnual_setup (uint8_t req, uint8_t req_no,
usb_lld_set_data_to_send (mem_info, sizeof (mem_info)); usb_lld_set_data_to_send (mem_info, sizeof (mem_info));
return USB_SUCCESS; return USB_SUCCESS;
} }
else if (req_no == USB_REGNUAL_CRC32) else if (req_no == USB_REGNUAL_RESULT)
{ {
static uint32_t crc32_check = 0; /* calculate CRC32 for mem */ usb_lld_set_data_to_send (&result, sizeof (uint32_t));
usb_lld_set_data_to_send (&crc32_check, sizeof (uint32_t));
return USB_SUCCESS; return USB_SUCCESS;
} }
} }
@@ -180,30 +189,22 @@ regnual_setup (uint8_t req, uint8_t req_no,
if (value != 0 || index + len > 256) if (value != 0 || index + len > 256)
return USB_UNSUPPORT; return USB_UNSUPPORT;
if (index != 0) if (index + len < 256)
memset (mem, 0xff, 256); memset (mem + index + len, 0xff, 256 - (index + len));
usb_lld_set_data_to_recv (mem + index, len); usb_lld_set_data_to_recv (mem + index, len);
return USB_SUCCESS; return USB_SUCCESS;
} }
else if (req_no == USB_REGNUAL_FLASH && len == 0) else if (req_no == USB_REGNUAL_FLASH && len == 0 && index == 0)
{ {
uint32_t dst_addr = (0x08000000 + value * 0x100); uint32_t dst_addr = (0x08000000 + value * 0x100);
if (flash_write (dst_addr, mem, 256) == 0) if (dst_addr + 256 <= (uint32_t)&_flash_end)
return USB_SUCCESS; return USB_SUCCESS;
} }
else if (req_no == USB_REGNUAL_ERASE && len == 0 && index == 0) else if (req_no == USB_REGNUAL_PROTECT && len == 0 && index == 0)
{ {
uint32_t dst_addr = (0x08000000 + value * 0x100); if (value == 0)
if (flash_erase_page (dst_addr))
return USB_SUCCESS;
}
else if (req_no == USB_REGNUAL_PROTECT && len == 0
&& value == 0 && index == 0)
{
if (flash_protect ())
return USB_SUCCESS; return USB_SUCCESS;
} }
else if (req_no == USB_REGNUAL_FINISH && len == 0 else if (req_no == USB_REGNUAL_FINISH && len == 0

2
regnual/regnual.ld
View File

@@ -12,7 +12,7 @@ MEMORY
} }
_flash_start = 0x08000000; _flash_start = 0x08000000;
_flash_end = 0x08010000; _flash_end = 0x08020000;
__ram_start__ = ORIGIN(ram0); __ram_start__ = ORIGIN(ram0);
__ram_size__ = 20k; __ram_size__ = 20k;

25
regnual/sys.c
View File

@@ -431,30 +431,7 @@ flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
} }
int int
flash_erase_page (uint32_t addr) flash_protect (uint16_t protection)
{
int status;
status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
intr_disable ();
if (status == FLASH_COMPLETE)
{
FLASH->CR |= FLASH_CR_PER;
FLASH->AR = addr;
FLASH->CR |= FLASH_CR_STRT;
status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
if (status != FLASH_TIMEOUT)
FLASH->CR &= ~FLASH_CR_PER;
}
intr_enable ();
return status == FLASH_COMPLETE;
}
int
flash_protect (void)
{ {
/* Not yet implemented */ /* Not yet implemented */
return 1; return 1;