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

Simplified the presentation of build date information and added a

Browse Source 
command-line utility to retrieve it.

- fw/include/atspi/ep0.h, fw/atspi/ep0.c (my_setup): merged
  ATSPI_BUILD_NUMBER and ATSPI_BUILD_DATE into single ATSPI_BUILD
- fw/atspi/ep0.c (my_setup): added work-arounds for compiler bugs
- tools/atspi-id/Makefile, tools/atspi-id/atspi-id.c: command-line utility
  to query hardware and firmware version
This commit is contained in:
Werner Almesberger
2010-08-20 15:09:45 -03:00
parent 537c67598d
commit bb4b07f86a
4 changed files with 181 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
fw/atspi/ep0.c
View File

@@ -29,6 +29,31 @@
#define error(...)
/*
* SDCC 2.8.0 had a number of code generation bugs that appeared in the big
* switch statement of my_setup. SDCC_FORCE_UPDATE forced the value of the
* "size" variable to be written to memory. This work-around doesn't seem
* to be necessary with 2.9.0, but we keep it around, just in case.
*
* Unfortunately, the setup->bRequest garbling bug is still with us. Without
* the evaluation forced with SDCC_FORCE_EVAL, sdcc gets confused about the
* value of setup->bRequest and then rejects all SETUP requests.
*/
#define SDCC_FORCE_EVAL(type, value) \
do { \
static volatile type foo; \
foo = value; \
} while (0)
#define SDCC_FORCE_UPDATE(type, var) \
do { \
volatile type foo; \
foo = var; \
var = foo; \
} while (0)
static const uint8_t id[] = { EP0ATSPI_MAJOR, EP0ATSPI_MINOR, HW_TYPE };
static __xdata uint8_t buf[MAX_PSDU+3]; /* command, PHDR, and LQ */
static uint8_t size;
@@ -73,8 +98,12 @@ static void do_buf_write(void *user)
}
#define BUILD_OFFSET 7 /* '#' plus "65535" plus ' ' */
static __bit my_setup(struct setup_request *setup) __reentrant
{
unsigned tmp;
uint8_t i;
switch (setup->bmRequestType | setup->bRequest << 8) {
@@ -84,22 +113,24 @@ static __bit my_setup(struct setup_request *setup) __reentrant
return 0;
usb_send(&ep0, id, setup->wLength, NULL, NULL);
return 1;
case ATSPI_FROM_DEV(ATSPI_BUILD_NUMBER):
debug("ATSPI_BUILD_NUMBER\n");
if (setup->wLength > 2)
return 0;
usb_send(&ep0, (void *) &build_number, setup->wLength,
NULL, NULL);
return 1;
case ATSPI_FROM_DEV(ATSPI_BUILD_DATE):
debug("ATSPI_BUILD_DATE\n");
for (size = 0; build_date[size]; size++);
if (size > EP1_SIZE)
return 0;
case ATSPI_FROM_DEV(ATSPI_BUILD):
debug("ATSPI_BUILD\n");
tmp = build_number;
for (i = BUILD_OFFSET-2; tmp; i--) {
buf[i] = (tmp % 10)+'0';
tmp /= 10;
}
buf[i] = '#';
buf[BUILD_OFFSET-1] = ' ';
for (size = 0; build_date[size]; size++)
buf[BUILD_OFFSET+size] = build_date[size];
size += BUILD_OFFSET-i+1;
SDCC_FORCE_EVAL(uint8_t, setup->bRequest);
if (size > setup->wLength)
return 0;
usb_send(&ep0, build_date, size, NULL, NULL);
usb_send(&ep0, buf+i, size, NULL, NULL);
return 1;
case ATSPI_TO_DEV(ATSPI_RESET):
debug("ATSPI_RESET\n");
RSTSRC = SWRSF;
@@ -180,6 +211,7 @@ static __bit my_setup(struct setup_request *setup) __reentrant
nSS = 1;
usb_send(&ep0, buf, size, NULL, NULL);
return 1;
#endif
default:
error("Unrecognized SETUP: 0x%02x 0x%02x ...\n",

6
fw/include/atspi/ep0.h
View File

@@ -18,9 +18,8 @@
* Direction bRequest wValue wIndex wLength
*
* ->host ATSPI_ID - - 3
* ->host ATSPI_BUILD - - #bytes
* host-> ATSPI_RESET - - 0
* ->host ATSPI_BUILD_NUMBER - - 2
* ->host ATSPI_BUILD_DATE - - #bytes
*
* host-> ATSPI_RF_RESET - -
*
@@ -61,9 +60,8 @@
enum atspi_requests {
ATSPI_ID = 0x00,
ATSPI_BUILD,
ATSPI_RESET,
ATSPI_BUILD_NUMBER,
ATSPI_BUILD_DATE,
ATSPI_RF_RESET = 0x10,
ATSPI_REG_WRITE = 0x20,
ATSPI_REG_READ,