/*
- * This file is part of the fx2lafw project.
+ * This file is part of the sigrok-firmware-fx2lafw project.
*
* Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
*
*
* - We use the FX2 in GPIF mode to sample the data (asynchronously).
* - We use the internal 48MHz clock for GPIF.
- * - The 8 channels/pins we sample (the GPIF data bus) are PB0-PB7.
- * Support for 16 channels is not yet included, but might be added later.
- * - Endpoint 2 is used for data transfers from FX2 to host.
- * - The endpoint is quad-buffered.
+ * - The 8 channels/pins we sample (the GPIF data bus) are PB0-PB7,
+ * or PB0-PB7 + PD0-PD7 for 16-channel sampling.
+ * - Endpoint 2 (quad-buffered) is used for data transfers from FX2 to host.
*
* Documentation:
*
#include <setupdat.h>
#include <eputils.h>
#include <gpif.h>
-
#include <command.h>
#include <fx2lafw.h>
#include <gpif-acquisition.h>
/* ... */
-volatile bit got_sud;
+volatile __bit got_sud;
BYTE vendor_command;
static void setup_endpoints(void)
EP2CFG = (1 << 7) | /* EP is valid/activated */
(1 << 6) | /* EP direction: IN */
(1 << 5) | (0 << 4) | /* EP Type: bulk */
- (0 << 3) | /* EP buffer size: 512 */
+ (1 << 3) | /* EP buffer size: 1024 */
(0 << 2) | /* Reserved. */
(0 << 1) | (0 << 0); /* EP buffering: quad buffering */
SYNCDELAY();
- /* Setup EP6 (IN) in the debug build. */
-#ifdef DEBUG
- EP6CFG = (1 << 7) | /* EP is valid/activated */
- (1 << 6) | /* EP direction: IN */
- (1 << 5) | (0 << 4) | /* EP Type: bulk */
- (0 << 3) | /* EP buffer size: 512 */
- (0 << 2) | /* Reserved */
- (1 << 1) | (0 << 0); /* EP buffering: double buffering */
-#else
- EP6CFG &= ~bmVALID;
-#endif
- SYNCDELAY();
-
- /* Disable all other EPs (EP1, EP4, and EP8). */
+ /* Disable all other EPs (EP1, EP4, EP6, and EP8). */
EP1INCFG &= ~bmVALID;
SYNCDELAY();
EP1OUTCFG &= ~bmVALID;
SYNCDELAY();
EP4CFG &= ~bmVALID;
SYNCDELAY();
+ EP6CFG &= ~bmVALID;
+ SYNCDELAY();
EP8CFG &= ~bmVALID;
SYNCDELAY();
/* Note: RESETFIFO() gets the EP number WITHOUT bit 7 set/cleared. */
RESETFIFO(0x02)
-#ifdef DEBUG
- /* Reset the FIFOs of EP6 when in debug mode. */
- RESETFIFO(0x06)
-#endif
-
/* EP2: Enable AUTOIN mode. Set FIFO width to 8bits. */
EP2FIFOCFG = bmAUTOIN;
SYNCDELAY();
SYNCDELAY();
}
+static void send_fw_version(void)
+{
+ /* Populate the buffer. */
+ struct version_info *const vi = (struct version_info *)EP0BUF;
+ vi->major = FX2LAFW_VERSION_MAJOR;
+ vi->minor = FX2LAFW_VERSION_MINOR;
+
+ /* Send the message. */
+ EP0BCH = 0;
+ EP0BCL = sizeof(struct version_info);
+}
+
+static void send_revid_version(void)
+{
+ uint8_t *p;
+
+ /* Populate the buffer. */
+ p = (uint8_t *)EP0BUF;
+ *p = REVID;
+
+ /* Send the message. */
+ EP0BCH = 0;
+ EP0BCL = 1;
+}
+
BOOL handle_vendorcommand(BYTE cmd)
{
/* Protocol implementation */
switch (cmd) {
case CMD_START:
- /* There is data to receive - arm EP0 */
+ vendor_command = cmd;
EP0BCL = 0;
+ return TRUE;
+ break;
case CMD_GET_FW_VERSION:
- vendor_command = cmd;
+ send_fw_version();
+ return TRUE;
+ break;
+ case CMD_GET_REVID_VERSION:
+ send_revid_version();
return TRUE;
- default:
- /* Unimplemented command. */
break;
}
/* We only support interface 0, alternate interface 0. */
if (ifc != 0 || alt_ifc != 0)
return FALSE;
-
+
/* Perform procedure from TRM, section 2.3.7: */
/* (1) TODO. */
/* (2) Reset data toggles of the EPs in the interface. */
/* Note: RESETTOGGLE() gets the EP number WITH bit 7 set/cleared. */
RESETTOGGLE(0x82);
-#ifdef DEBUG
- RESETTOGGLE(0x86);
-#endif
/* (3) Restore EPs to their default conditions. */
/* Note: RESETFIFO() gets the EP number WITHOUT bit 7 set/cleared. */
RESETFIFO(0x02);
/* TODO */
-#ifdef DEBUG
- RESETFIFO(0x06);
-#endif
/* (4) Clear the HSNAK bit. Not needed, fx2lib does this. */
return (cfg == 1) ? TRUE : FALSE;
}
-void sudav_isr(void) interrupt SUDAV_ISR
+void sudav_isr(void) __interrupt SUDAV_ISR
{
got_sud = TRUE;
CLEAR_SUDAV();
}
-void sof_isr(void) interrupt SOF_ISR using 1
+void sof_isr(void) __interrupt SOF_ISR __using 1
{
CLEAR_SOF();
}
-void usbreset_isr(void) interrupt USBRESET_ISR
+void usbreset_isr(void) __interrupt USBRESET_ISR
{
handle_hispeed(FALSE);
CLEAR_USBRESET();
}
-void hispeed_isr(void) interrupt HISPEED_ISR
+void hispeed_isr(void) __interrupt HISPEED_ISR
{
handle_hispeed(TRUE);
CLEAR_HISPEED();
if (vendor_command) {
switch (vendor_command) {
- case CMD_GET_FW_VERSION:
- /* TODO */
-
- /* Acknowledge the vendor command. */
- vendor_command = 0;
- break;
-
case CMD_START:
- if((EP0CS & bmEPBUSY) != 0)
+ if ((EP0CS & bmEPBUSY) != 0)
break;
- if(EP0BCL == 2) {
+ if (EP0BCL == sizeof(struct cmd_start_acquisition)) {
gpif_acquisition_start(
- (const struct cmd_start_acquisition*)EP0BUF);
+ (const struct cmd_start_acquisition *)EP0BUF);
}
/* Acknowledge the vendor command. */
vendor_command = 0;
break;
-
default:
/* Unimplemented command. */
vendor_command = 0;
gpif_poll();
}
+
+void main(void)
+{
+ fx2lafw_init();
+ while (1)
+ fx2lafw_poll();
+}
projects / sigrok-firmware-fx2lafw.git / blobdiff