Various cosmetics and bugfixes.

diff --git a/cwav-usbeeax/Makefile b/cwav-usbeeax/Makefile
index ff05a1eb7d161e1faa1b59169c20a7407c7ee47b..a60f2af7ab4b6faf9c2b4f21179e8887d602bbd0 100644 (file)
--- a/cwav-usbeeax/Makefile
+++ b/cwav-usbeeax/Makefile
@@ -18,10 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-SOURCES = \
-       main.c \
-       ../fx2lafw.c \
-       ../debug.c
+SOURCES = main.c ../fx2lafw.c ../debug.c
 A51_SOURCES = ../dscr.a51
 BASENAME = fx2lafw-cwav-usbeeax
 

diff --git a/cwav-usbeeax/main.c b/cwav-usbeeax/main.c
index 8f7be941697e92b89a473d62bf8f125128c6adea..1c398f5b2784113befbf28b5cb547ae4857cb133 100644 (file)
--- a/cwav-usbeeax/main.c
+++ b/cwav-usbeeax/main.c
@@ -25,7 +25,6 @@ void main(void)
 {
        fx2lafw_init();
 
-       while(1)
+       while (1)
                fx2lafw_run();
 }
-

diff --git a/debug.c b/debug.c
index 11807589dc794b29bb450be25357d8ca126aeb8a..ba8d3f16f6e45e39a2c6954b13c22fcfbafc61b6 100644 (file)
--- a/debug.c
+++ b/debug.c
@@ -22,39 +22,40 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-
 #include <delay.h>
 #include <fx2regs.h>
 #include <fx2macros.h>
-
 #include "debug.h"
 
 #define MESSAGE_LENGTH_MAX 64
 
-void debugf(const char *format, ...) {
+void debugf(const char *format, ...)
+{
        va_list arg;
        int count;
 
-       // Format the string
-       va_start (arg, format);
+       /* Format the string. */
+       va_start(arg, format);
        count = vsprintf(EP6FIFOBUF, format, arg);
-       va_end (arg);
+       va_end(arg);
 
-       // Zero out the rest of the buffer
-       while(count < MESSAGE_LENGTH_MAX)
+       /* Zero out the rest of the buffer. */
+       while (count < MESSAGE_LENGTH_MAX)
                EP6FIFOBUF[count++] = '\0';
 
-       // Send the buffer
+       /* Send the buffer. */
        count = 32;
        EP6BCH = MSB(count);
        SYNCDELAY4;
        EP6BCL = LSB(count);
+       SYNCDELAY4;
 }
 
-void _assert(char *expr, const char *filename, unsigned int linenumber) {
+void _assert(char *expr, const char *filename, unsigned int linenumber)
+{
        debugf("Assert(%s) failed at line %u in file %s.\n",
-               expr, linenumber, filename);
-       while(1);
+              expr, linenumber, filename);
+       while (1);
 }
 
 #endif

diff --git a/dscr.a51 b/dscr.a51
index c96e003d773c8fa28bb79dd00915d5f797a3721c..76b3401f59d9274c7bebb0cbf4c562abd20dae8c 100644 (file)
--- a/dscr.a51
+++ b/dscr.a51
@@ -115,10 +115,10 @@ highspd_dscr_end:
        ; Endpoint 6 (IN)
        .db     DSCR_ENDPOINT_LEN
        .db     DSCR_ENDPOINT_TYPE
-       .db     0x86                    ;  EP number (6), direction (IN)
+       .db     0x86                    ; EP number (6), direction (IN)
        .db     ENDPOINT_TYPE_BULK      ; Endpoint type (bulk)
-       .db     0x00                    ; Max. packet size, LSB (64 bytes)
-       .db     0x02                    ; Max. packet size, MSB (64 bytes)
+       .db     0x00                    ; Max. packet size, LSB (512 bytes)
+       .db     0x02                    ; Max. packet size, MSB (512 bytes)
        .db     0x00                    ; Polling interval
 
 highspd_dscr_realend:
@@ -164,7 +164,7 @@ fullspd_dscr_end:
        ; Endpoint 6 (IN)
        .db     DSCR_ENDPOINT_LEN
        .db     DSCR_ENDPOINT_TYPE
-       .db 0x86                        ; EP number (6), direction (IN)
+       .db     0x86                    ; EP number (6), direction (IN)
        .db     ENDPOINT_TYPE_BULK      ; Endpoint type (bulk)
        .db     0x40                    ; Max. packet size, LSB (64 bytes)
        .db     0x00                    ; Max. packet size, MSB (64 bytes)

diff --git a/fx2lafw.c b/fx2lafw.c
index 24c0590991f7f95b5acb7550837a3d4ebbfec429..2a64b84ae8db8de497fe95de85279ed4c0926456 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -272,7 +272,7 @@ static void setup_endpoints(void)
 #endif
        SYNCDELAY();
 
-       /* Disable all other EPs (EP4 and EP8). */
+       /* Disable all other EPs (EP1, EP4, and EP8). */
        EP1INCFG &= ~bmVALID;
        SYNCDELAY();
        EP1OUTCFG &= ~bmVALID;
@@ -355,14 +355,17 @@ BOOL handle_set_interface(BYTE ifc, BYTE alt_ifc)
        /* (2) Reset data toggles of the EPs in the interface. */
        /* Note: RESETTOGGLE() gets the EP number WITH bit 7 set/cleared. */
        RESETTOGGLE(0x82);
-       RESETTOGGLE(0x76);
+#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. */
 

diff --git a/fx2lafw.mk b/fx2lafw.mk
index a8f7a3b475275c38e8f83032e3983c43cfd78ed5..c4af71dffe1251a4abe835423634ec70c60e0f47 100644 (file)
--- a/fx2lafw.mk
+++ b/fx2lafw.mk
@@ -31,3 +31,4 @@ endif
 SDCCFLAGS += -I../include/
 
 include $(FX2LIBDIR)/lib/fx2.mk
+

diff --git a/include/debug.h b/include/debug.h
index 5cb6861e6cb8c67f4f3ff47e102a63a8271a0bee..1d631c39eedd7484c70f164aa31ff26338d524ee 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -20,43 +20,30 @@
 
 #ifdef DEBUG
 
-#define ERRF(fmt, ...) \
-       do { debugf("E " fmt, __VA_ARGS__); \
-               while(1); } while(0)
-#define ERR(msg) \
-       ERRF("%s", msg)
-
-#define WARNF(fmt, ...) \
-       debugf("W " fmt, __VA_ARGS__)
-#define WARN(msg) \
-       WARNF("%s", msg)
-
-#define INFOF(fmt, ...) \
-       debugf("I " fmt, __VA_ARGS__)
-#define INFO(msg) \
-       INFOF("%s", msg)
+#define ERRF(fmt, ...)         do { debugf("E " fmt, __VA_ARGS__); \
+                               while(1); } while(0)
+#define ERR(msg)               ERRF("%s", msg)
+
+#define WARNF(fmt, ...)                debugf("W " fmt, __VA_ARGS__)
+#define WARN(msg)              WARNF("%s", msg)
+
+#define INFOF(fmt, ...)                debugf("I " fmt, __VA_ARGS__)
+#define INFO(msg)              INFOF("%s", msg)
 
 /**
- * A printf the prints messages through the UART
- * EP6.
+ * A printf that prints messages through EP6.
  */
 void debugf(const char *format, ...);
 
 #else
 
-#define ERRF(fmt, ...) \
-       ((void) 0)
-#define ERR(msg) \
-       ((void) 0)
+#define ERRF(fmt, ...)         ((void)0)
+#define ERR(msg)               ((void)0)
 
-#define WARNF(fmt, ...) \
-       ((void) 0)
-#define WARN(msg) \
-       ((void) 0)
+#define WARNF(fmt, ...)                ((void)0)
+#define WARN(msg)              ((void)0)
 
-#define INFOF(fmt, ...) \
-       ((void) 0)
-#define INFO(msg) \
-       ((void) 0)
+#define INFOF(fmt, ...)                ((void)0)
+#define INFO(msg)              ((void)0)
 
 #endif

diff --git a/tools/debug.py b/tools/debug.py
index cd197762d53405c4c7867f91dcd6c3fcbb0bb720..b3be5180e50d87f4014da5cdb1c3376c4f810143 100755 (executable)
--- a/tools/debug.py
+++ b/tools/debug.py
@@ -17,15 +17,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import struct 
+import struct
 
 from fx2load import *
 
-# Connect to the device
+# Connect to the device.
 openfx2(0x6666, 0x0019)
 
-# Read debug messages
+# Read debug messages.
 while 1:
-    buf='\x00'*200  
-    f.ep_bulk( buf, 0x86, 1000)
-    print buf
+    buf = '\x00' * 200
+    f.ep_bulk(buf, 0x86, 1000)
+    print(buf)