qi-hardware/ben-wpan
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2025-04-21 12:27:27 +03:00
Code Activity

atusb/fw/: moved common elements of DFU processing to dfu_common.c

Browse Source 
- dfu.c (functional_descriptor, dfu, my_descr), dfu.h (dfu_my_descr):
  moved to dfu_common.c
- dfu.c (my_setup), dfu.h (dfu_setup_common), dfu_common.c
  (dfu_setup_common): moved handling of DFU_GETSTATUS, DFU_CLRSTATUS,
  and DFU_GETSTATE from my_setup to dfu_setup_common
- dfu_common.c (my_descr), dfu.c (dfu_init): renamed my_descr to
  dfu_my_descr
- Makefile (BOOT_OBJS): added dfu_common.o
This commit is contained in:
Werner Almesberger
2011-06-10 22:04:12 -03:00
parent bbe27fc357
commit 2544004a86
4 changed files with 107 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
atusb/fw/usb/dfu.c
View File

@@ -31,7 +31,6 @@
#include "dfu.h"
#include "../board.h"
#include "../sernum.h"
#ifndef NULL
@@ -81,29 +80,6 @@ const uint8_t config_descriptor[] = {
};
static const uint8_t functional_descriptor[] = {
9, /* bLength */
DFU_DT_FUNCTIONAL, /* bDescriptorType */
0xf, /* bmAttributes (claim omnipotence :-) */
LE(0xffff), /* wDetachTimeOut (we're very patient) */
LE(EP0_SIZE), /* wTransferSize */
LE(0x101), /* bcdDFUVersion */
};
/*
* The worst-case activity would be flashing a one page and erasing another
* one, would should take less than 10 ms. A 100 ms timeout ought to be plenty.
*/
struct dfu dfu = {
OK, /* bStatus */
LE(100), 0, /* bwPollTimeout, 100 ms */
dfuIDLE, /* bState */
0, /* iString */
};
static uint16_t next_block = 0;
static int did_download;
@@ -229,43 +205,17 @@ static int my_setup(const struct setup_request *setup)
next_block++;
dfu.state = dfuUPLOAD_IDLE;
return ok;
case DFU_FROM_DEV(DFU_GETSTATUS):
debug("DFU_GETSTATUS\n");
usb_send(&eps[0], (uint8_t *) &dfu, sizeof(dfu), NULL, NULL);
return 1;
case DFU_TO_DEV(DFU_CLRSTATUS):
debug("DFU_CLRSTATUS\n");
dfu.state = dfuIDLE;
dfu.status = OK;
return 1;
case DFU_FROM_DEV(DFU_GETSTATE):
debug("DFU_GETSTATE\n");
usb_send(&eps[0], &dfu.state, 1, NULL, NULL);
return 1;
case DFU_TO_DEV(DFU_ABORT):
debug("DFU_ABORT\n");
dfu.state = dfuIDLE;
dfu.status = OK;
return 1;
default:
error("DFU rt %x, rq%x ?\n",
setup->bmRequestType, setup->bRequest);
return 0;
return dfu_setup_common(setup);
}
}
static int my_descr(uint8_t type, uint8_t index, const uint8_t **reply,
uint8_t *size)
{
if (type != DFU_DT_FUNCTIONAL)
return sernum_get_descr(type, index, reply, size);
*reply = functional_descriptor;
*size = sizeof(functional_descriptor);
return 1;
}
static void my_reset(void)
{
#if 0
@@ -281,6 +231,6 @@ static void my_reset(void)
void dfu_init(void)
{
user_setup = my_setup;
user_get_descriptor = my_descr;
user_get_descriptor = dfu_my_descr;
user_reset = my_reset;
}