volatile __bit got_sud;
BYTE vendor_command;
-volatile WORD ledcounter = 1000;
-
-extern __bit gpif_acquiring;
+volatile WORD ledcounter = 0;
static void setup_endpoints(void)
{
/* Setup EP2 (IN). */
- EP2CFG = (1 << 7) | /* EP is valid/activated */
- (1 << 6) | /* EP direction: IN */
- (1 << 5) | (0 << 4) | /* EP Type: bulk */
- (1 << 3) | /* EP buffer size: 1024 */
- (0 << 2) | /* Reserved. */
- (0 << 1) | (0 << 0); /* EP buffering: quad buffering */
+ EP2CFG = (1u << 7) | /* EP is valid/activated */
+ (1u << 6) | /* EP direction: IN */
+ (1u << 5) | (0u << 4) | /* EP Type: bulk */
+ (1u << 3) | /* EP buffer size: 1024 */
+ (0u << 2) | /* Reserved. */
+ (0u << 1) | (0u << 0); /* EP buffering: quad buffering */
SYNCDELAY();
/* Disable all other EPs (EP1, EP4, EP6, and EP8). */
/* EP2: Reset the FIFOs. */
/* Note: RESETFIFO() gets the EP number WITHOUT bit 7 set/cleared. */
- RESETFIFO(0x02)
+ RESETFIFO(0x02);
/* EP2: Enable AUTOIN mode. Set FIFO width to 8bits. */
EP2FIFOCFG = bmAUTOIN;
/* Send the message. */
EP0BCH = 0;
+ SYNCDELAY();
EP0BCL = sizeof(struct version_info);
+ SYNCDELAY();
}
static void send_revid_version(void)
/* Send the message. */
EP0BCH = 0;
+ SYNCDELAY();
EP0BCL = 1;
+ SYNCDELAY();
}
BOOL handle_vendorcommand(BYTE cmd)
/* Protocol implementation */
switch (cmd) {
case CMD_START:
+ /* Tell hardware we are ready to receive data. */
vendor_command = cmd;
EP0BCL = 0;
+ SYNCDELAY();
return TRUE;
case CMD_GET_FW_VERSION:
send_fw_version();
CLEAR_SUDAV();
}
+/* IN BULK NAK - the host started requesting data. */
+void ibn_isr(void) __interrupt IBN_ISR
+{
+ /*
+ * If the IBN interrupt is not disabled, clearing
+ * does not work. See AN78446, 6.2.
+ */
+ BYTE ibnsave = IBNIE;
+ IBNIE = 0;
+ CLEAR_USBINT();
+
+ /*
+ * If the host sent the START command, start the GPIF
+ * engine. The host will repeat the BULK IN in the next
+ * microframe.
+ */
+ if ((IBNIRQ & bmEP2IBN) && (gpif_acquiring == PREPARED)) {
+ ledcounter = 1;
+ LED_OFF();
+ gpif_acquisition_start();
+ }
+
+ /* Clear IBN flags for all EPs. */
+ IBNIRQ = 0xff;
+
+ NAKIRQ = bmIBN;
+ SYNCDELAY();
+
+ IBNIE = ibnsave;
+ SYNCDELAY();
+}
+
void usbreset_isr(void) __interrupt USBRESET_ISR
{
handle_hispeed(FALSE);
void timer2_isr(void) __interrupt TF2_ISR
{
/* Blink LED during acquisition, keep it on otherwise. */
- if (gpif_acquiring) {
+ if (gpif_acquiring == RUNNING) {
if (--ledcounter == 0) {
- PA1 = !PA1;
+ LED_TOGGLE();
ledcounter = 1000;
}
- } else {
- PA1 = 1; /* LED on. */
+ } else if (gpif_acquiring == STOPPED) {
+ LED_ON();
}
TF2 = 0;
}
/* TODO: Does the order of the following lines matter? */
ENABLE_SUDAV();
+ ENABLE_EP2IBN();
ENABLE_HISPEED();
ENABLE_USBRESET();
- /* PA1 (LED) is an output. */
- PORTACFG = 0;
- OEA = (1 << 1);
- PA1 = 1; /* LED on. */
+ LED_INIT();
+ LED_ON();
/* Init timer2. */
RCAP2L = -500 & 0xff;
break;
if (EP0BCL == sizeof(struct cmd_start_acquisition)) {
- gpif_acquisition_start(
+ gpif_acquisition_prepare(
(const struct cmd_start_acquisition *)EP0BUF);
}