From: Joel Holdsworth Date: Wed, 14 Mar 2012 21:44:08 +0000 (+0000) Subject: Removed debug routines - they turned out not to be so useful, and occupy valuable... X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~40 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=576c66275f9fbc419b6449a72dd870d29bb4bf31;hp=920d03436aee786fe4f366354f8ed0cb6432abe6;p=sigrok-firmware-fx2lafw.git Removed debug routines - they turned out not to be so useful, and occupy valuable FIFO space --- diff --git a/Makefile.include b/Makefile.include index 5c01a958..81c4915a 100644 --- a/Makefile.include +++ b/Makefile.include @@ -24,13 +24,6 @@ OBJCOPY ?= objcopy FX2LIBDIR ?= ../../fx2lib BUILDDIR ?= build -DEBUG ?= 0 -ifeq ($(DEBUG), 1) - SDCCFLAGS += -DDEBUG -else - SDCCFLAGS += -DNDEBUG -endif - SDCCFLAGS += -I../../include/ $(BUILDDIR)/$(BASENAME).fw: $(BUILDDIR)/$(BASENAME).ihx diff --git a/debug.c b/debug.c deleted file mode 100644 index ba8d3f16..00000000 --- a/debug.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file is part of the fx2lafw project. - * - * Copyright (C) 2012 Joel Holdsworth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef DEBUG - -#include -#include -#include -#include -#include -#include "debug.h" - -#define MESSAGE_LENGTH_MAX 64 - -void debugf(const char *format, ...) -{ - va_list arg; - int count; - - /* Format the string. */ - va_start(arg, format); - count = vsprintf(EP6FIFOBUF, format, arg); - va_end(arg); - - /* Zero out the rest of the buffer. */ - while (count < MESSAGE_LENGTH_MAX) - EP6FIFOBUF[count++] = '\0'; - - /* Send the buffer. */ - count = 32; - EP6BCH = MSB(count); - SYNCDELAY4; - EP6BCL = LSB(count); - SYNCDELAY4; -} - -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); -} - -#endif diff --git a/fx2lafw.c b/fx2lafw.c index d4423633..401b5fe6 100644 --- a/fx2lafw.c +++ b/fx2lafw.c @@ -64,26 +64,15 @@ static void setup_endpoints(void) (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(); @@ -91,11 +80,6 @@ static void setup_endpoints(void) /* 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(); diff --git a/hw/cwav-usbeeax/Makefile b/hw/cwav-usbeeax/Makefile index 1d773a67..b40892c8 100644 --- a/hw/cwav-usbeeax/Makefile +++ b/hw/cwav-usbeeax/Makefile @@ -21,8 +21,7 @@ SOURCES = \ main.c \ ../../fx2lafw.c \ - ../../gpif-acquisition.c \ - ../../debug.c + ../../gpif-acquisition.c A51_SOURCES = dscr.a51 BASENAME = fx2lafw-cwav-usbeeax diff --git a/hw/cwav-usbeeax/dscr.a51 b/hw/cwav-usbeeax/dscr.a51 index 0822887a..eda53ac2 100644 --- a/hw/cwav-usbeeax/dscr.a51 +++ b/hw/cwav-usbeeax/dscr.a51 @@ -97,7 +97,7 @@ highspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -112,15 +112,6 @@ highspd_dscr_end: .db 0x02 ; Max. packet size, MSB (512 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .db 0x86 ; EP number (6), direction (IN) - .db ENDPOINT_TYPE_BULK ; Endpoint type (bulk) - .db 0x00 ; Max. packet size, LSB (512 bytes) - .db 0x02 ; Max. packet size, MSB (512 bytes) - .db 0x00 ; Polling interval - highspd_dscr_realend: .even @@ -146,7 +137,7 @@ fullspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -161,15 +152,6 @@ fullspd_dscr_end: .db 0x00 ; Max. packet size, MSB (64 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .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) - .db 0x00 ; Polling interval - fullspd_dscr_realend: .even diff --git a/hw/cwav-usbeesx/Makefile b/hw/cwav-usbeesx/Makefile index 5d1c59aa..a585a49b 100644 --- a/hw/cwav-usbeesx/Makefile +++ b/hw/cwav-usbeesx/Makefile @@ -22,8 +22,7 @@ SOURCES = \ main.c \ ../../fx2lafw.c \ - ../../gpif-acquisition.c \ - ../../debug.c + ../../gpif-acquisition.c A51_SOURCES = dscr.a51 BASENAME = fx2lafw-cwav-usbeesx diff --git a/hw/cwav-usbeesx/dscr.a51 b/hw/cwav-usbeesx/dscr.a51 index 9498c3a5..1d23fc04 100644 --- a/hw/cwav-usbeesx/dscr.a51 +++ b/hw/cwav-usbeesx/dscr.a51 @@ -98,7 +98,7 @@ highspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -113,15 +113,6 @@ highspd_dscr_end: .db 0x02 ; Max. packet size, MSB (512 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .db 0x86 ; EP number (6), direction (IN) - .db ENDPOINT_TYPE_BULK ; Endpoint type (bulk) - .db 0x00 ; Max. packet size, LSB (512 bytes) - .db 0x02 ; Max. packet size, MSB (512 bytes) - .db 0x00 ; Polling interval - highspd_dscr_realend: .even @@ -147,7 +138,7 @@ fullspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -162,15 +153,6 @@ fullspd_dscr_end: .db 0x00 ; Max. packet size, MSB (64 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .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) - .db 0x00 ; Polling interval - fullspd_dscr_realend: .even diff --git a/hw/saleae-logic/Makefile b/hw/saleae-logic/Makefile index d0b42cda..ff65939c 100644 --- a/hw/saleae-logic/Makefile +++ b/hw/saleae-logic/Makefile @@ -21,8 +21,7 @@ SOURCES = \ main.c \ ../../fx2lafw.c \ - ../../gpif-acquisition.c \ - ../../debug.c + ../../gpif-acquisition.c A51_SOURCES = dscr.a51 BASENAME = fx2lafw-saleae-logic diff --git a/hw/saleae-logic/dscr.a51 b/hw/saleae-logic/dscr.a51 index e67617f7..2502b51d 100644 --- a/hw/saleae-logic/dscr.a51 +++ b/hw/saleae-logic/dscr.a51 @@ -97,7 +97,7 @@ highspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -112,15 +112,6 @@ highspd_dscr_end: .db 0x02 ; Max. packet size, MSB (512 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .db 0x86 ; EP number (6), direction (IN) - .db ENDPOINT_TYPE_BULK ; Endpoint type (bulk) - .db 0x00 ; Max. packet size, LSB (512 bytes) - .db 0x02 ; Max. packet size, MSB (512 bytes) - .db 0x00 ; Polling interval - highspd_dscr_realend: .even @@ -146,7 +137,7 @@ fullspd_dscr_end: .db DSCR_INTERFACE_TYPE .db 0 ; Interface index .db 0 ; Alternate setting index - .db 2 ; Number of endpoints + .db 1 ; Number of endpoints .db 0xff ; Class (vendor specific) .db 0xff ; Subclass (vendor specific) .db 0xff ; Protocol (vendor specific) @@ -161,15 +152,6 @@ fullspd_dscr_end: .db 0x00 ; Max. packet size, MSB (64 bytes) .db 0x00 ; Polling interval - ; Endpoint 6 (IN) - .db DSCR_ENDPOINT_LEN - .db DSCR_ENDPOINT_TYPE - .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) - .db 0x00 ; Polling interval - fullspd_dscr_realend: .even diff --git a/include/debug.h b/include/debug.h deleted file mode 100644 index 1d631c39..00000000 --- a/include/debug.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of the fx2lafw project. - * - * Copyright (C) 2012 Joel Holdsworth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#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) - -/** - * A printf that prints messages through EP6. - */ -void debugf(const char *format, ...); - -#else - -#define ERRF(fmt, ...) ((void)0) -#define ERR(msg) ((void)0) - -#define WARNF(fmt, ...) ((void)0) -#define WARN(msg) ((void)0) - -#define INFOF(fmt, ...) ((void)0) -#define INFO(msg) ((void)0) - -#endif