Date: Thu, 23 Dec 2004 15:41:48 -0800 (PST) From: Max Campos <mcampos@bpsw.biz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mcampos@bpsw.biz Subject: ports/75449: [maintainer update] [PATCH] misc/ezload: update to 0.4.0 Message-ID: <20041223234148.0A74F3E88DA@fez.bpsw.biz> Resent-Message-ID: <200412232350.iBNNoNJp072650@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75449 >Category: ports >Synopsis: [maintainer update] [PATCH] misc/ezload: update to 0.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 23 23:50:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Max Campos >Release: FreeBSD 5.3-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD fez.bpsw.biz 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #0: Wed Dec 22 20:47:46 PST 2004 >Description: - Update to 0.4.0 Removed file(s): - files/patch-aa This patch has been integrated into 0.4.0. Port maintainer (mcampos@bpsw.biz) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- ezload-0.4.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/ezload/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 22 Dec 2004 06:35:33 -0000 1.10 +++ Makefile 23 Dec 2004 23:36:09 -0000 @@ -6,12 +6,12 @@ # PORTNAME= ezload -PORTVERSION= 0.3.1 +PORTVERSION= 0.4.0 CATEGORIES= misc -MASTER_SITES= http://www.etla.net/~n_hibma/usb/ +MASTER_SITES= http://proj.bpsw.biz/ezload/downloads/ MAINTAINER= mcampos@bpsw.biz -COMMENT= Down-/uploader for AnchorChip's EZ-USB chip +COMMENT= Firmware down/uploader for Cypress' EZ-USB chip MAN1= ezupload.1 ezdownload.1 aw.1 MANCOMPRESSED= yes @@ -20,8 +20,8 @@ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 400012 -IGNORE= 'This port only works on 4.00012' +.if ${OSVERSION} < 460000 +IGNORE= 'This port only works on FreeBSD 4.6.0+' .endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/misc/ezload/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 31 Mar 2004 03:09:39 -0000 1.4 +++ distinfo 23 Dec 2004 23:36:09 -0000 @@ -1,2 +1,2 @@ -MD5 (ezload-0.3.1.tar.gz) = f88178d5f9e8dc157353cd33e0d8dac4 -SIZE (ezload-0.3.1.tar.gz) = 19082 +MD5 (ezload-0.4.0.tar.gz) = 35d36dcb3ab45062f892c340a25ddefc +SIZE (ezload-0.4.0.tar.gz) = 23375 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/misc/ezload/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- pkg-descr 29 Nov 2002 10:33:15 -0000 1.2 +++ pkg-descr 23 Dec 2004 23:36:09 -0000 @@ -1,5 +1,5 @@ The utility allows you to download firmware into and upload firmware from the -memory of a EZ-USB chip. +memory of a Cypress EZ-USB chip (AN2131 & friends). The chip is a generic 8051 based programmeble device. To function in a specific device, e.g. a USB to Parallel port convertor, the 8051 needs application @@ -7,9 +7,6 @@ The input file or the produced output file is in Intel Hex format. -An example program for the ActiveWire board is included, including the -Hex file with firmware for it. The board is available from +WWW: http://proj.bpsw.biz/ezload/ -WWW: http://www.ActiveWireInc.com/ - -- Nick Hibma (n_hibma@freebsd.org) and Dirk van Gulik (dirkx@webweaving.org) +- Max Campos (mcampos@bpsw.biz) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/misc/ezload/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 22 Nov 1999 19:00:55 -0000 1.2 +++ pkg-plist 23 Dec 2004 23:36:09 -0000 @@ -1,6 +1,7 @@ bin/ezdownload bin/ezupload bin/aw +share/usb/firmware/06cd.010b.8001.hex share/usb/firmware/0854.0100.0000.hex share/usb/firmware/0854.0100.0001.hex share/usb/firmware/README Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 29 Nov 2002 10:33:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,190 +0,0 @@ ---- ezupload/ezupload.c.orig Thu Oct 10 14:33:34 2002 -+++ ezupload/ezupload.c Thu Oct 10 14:34:49 2002 -@@ -179,15 +179,15 @@ - l = en-at; - - #ifdef BSD -- ur.request.bmRequestType= 0xC0; /* see Anchor TRM v1.6 page 64 */ -- ur.request.bRequest = 0xA0; /* Anchor Down/Upload */ -+ ur.ucr_request.bmRequestType= 0xC0; /* see Anchor TRM v1.6 page 64 */ -+ ur.ucr_request.bRequest = 0xA0; /* Anchor Down/Upload */ - -- USETW(ur.request.wValue,at); /* Starting Address */ -- USETW(ur.request.wIndex,0); /* unused */ -- USETW(ur.request.wLength,l); /* payload len in bytes */ -+ USETW(ur.ucr_request.wValue,at); /* Starting Address */ -+ USETW(ur.ucr_request.wIndex,0); /* unused */ -+ USETW(ur.ucr_request.wLength,l); /* payload len in bytes */ - -- ur.flags = 0; -- ur.actlen = 0; -+ ur.ucr_flags = 0; -+ ur.ucr_actlen = 0; - #else - ur.requesttype= 0xC0; /* see Anchor TRM v1.6 page 64 */ - ur.request = 0xA0; /* Anchor Down/Upload */ -@@ -195,7 +195,7 @@ - ur.index = 0; /* unused */ - ur.length = l; /* payload len in bytes */ - #endif -- ur.data = (void *)d; -+ ur.ucr_data = (void *)d; - - #ifdef BSD - if(ioctl(fd, USB_DO_REQUEST,&ur)) { -@@ -207,7 +207,7 @@ - break; - } - #ifdef BSD -- if (ur.actlen != l) { -+ if (ur.ucr_actlen != l) { - fprintf(stderr,"Failed to get full %d chunk at adr %X: %s\nAborted\n", - l,at,strerror(errno)); - break; ---- ezdownload/ezdownload.c.orig Thu Oct 10 14:36:01 2002 -+++ ezdownload/ezdownload.c Thu Oct 10 14:51:28 2002 -@@ -268,13 +268,13 @@ - int err; - - #ifdef BSD -- ur.request.bmRequestType= 0x40; /* see TRM v1.6 page 64 */ -- ur.request.bRequest = 0xA0; /* Anchor Download */ -- USETW(ur.request.wValue, at); /* Starting Address */ -- USETW(ur.request.wIndex, 0); /* unused */ -- USETW(ur.request.wLength, len); /* payload len in bytes */ -- ur.flags = 0; -- ur.actlen = 0; -+ ur.ucr_request.bmRequestType= 0x40; /* see TRM v1.6 page 64 */ -+ ur.ucr_request.bRequest = 0xA0; /* Anchor Download */ -+ USETW(ur.ucr_request.wValue, at); /* Starting Address */ -+ USETW(ur.ucr_request.wIndex, 0); /* unused */ -+ USETW(ur.ucr_request.wLength, len); /* payload len in bytes */ -+ ur.ucr_flags = 0; -+ ur.ucr_actlen = 0; - #else - ur.requesttype= 0x40; /* see TRM v1.6 page 64 */ - ur.request = 0xA0; /* Anchor Download */ -@@ -282,7 +282,7 @@ - ur.index = 0; /* unused */ - ur.length = len; /* payload len in bytes */ - #endif -- ur.data = (void *) d; -+ ur.ucr_data = (void *) d; - - /* Although USB does not limit you here, the Anchor docs - * quote 64 as a limit, and Mato@activewireinc.com suggested -@@ -304,7 +304,7 @@ - return err; - - #ifdef BSD -- if (ur.actlen != len) -+ if (ur.ucr_actlen != len) - return EAGAIN; /* or too obscure ? */ - #endif - -@@ -386,16 +386,29 @@ - }; - #define SURE(x) (((x!=NULL) && (*x !='\0')) ? x : "<not defined>") - if (verbose) -+#ifdef BSD -+ printf("Device information: vendor %04x (%s) product %04x (%s) rev 0x%04x addr %x\n", -+ udi.udi_vendorNo, SURE(udi.udi_vendor), -+ udi.udi_productNo, SURE(udi.udi_product), -+ udi.udi_releaseNo, udi.udi_addr); -+#else - printf("Device information: vendor %04x (%s) product %04x (%s) rev 0x%04x addr %x\n", - udi.vendorNo, SURE(udi.vendor), - udi.productNo, SURE(udi.product), - udi.releaseNo, udi.addr); -+#endif - - /* standard setup for AnchorChips ISAIK - */ -+#ifdef BSD -+ ai.uai_config_index = 0; -+ ai.uai_interface_index = 0; -+ ai.uai_alt_no = 0; -+#else - ai.config_index = 0; - ai.interface_index = 0; - ai.alt_no = 0; -+#endif - - if ( ioctl(fd, USB_SET_ALTINTERFACE, &ai) == -1 ) { - fprintf(stderr, "ioctl 1 returned: %s\n", -@@ -425,8 +438,13 @@ - /* XXX is the revision # really hardware specific ? Is it a string - * or a BCD number ? - */ -+#ifdef BSD -+ snprintf(tmp,sizeof(tmp),"%s/%04x.%04x.%04x.hex", -+ dir,udi.udi_vendorNo,udi.udi_productNo,udi.udi_releaseNo); -+#else - snprintf(tmp,sizeof(tmp),"%s/%04x.%04x.%04x.hex", - dir,udi.vendorNo,udi.productNo,udi.releaseNo); -+#endif - - /* we could just do a loop through the directory - * and slack compare ? -@@ -439,9 +457,15 @@ - printf("No %s\n",tmp); - }; - if (!hexfile) { -+#ifdef BSD -+ fprintf(stderr,"No hexfile with firmware for " -+ "%04x.%04x.%04x available.\n", -+ udi.udi_vendorNo,udi.udi_productNo,udi.udi_releaseNo); -+#else - fprintf(stderr,"No hexfile with firmware for " - "%04x.%04x.%04x available.\n", - udi.vendorNo,udi.productNo,udi.releaseNo); -+#endif - if (!force) return(1); - }; - } else { -@@ -453,8 +477,13 @@ - else - l++; - -+#ifdef BSD -+ snprintf(tmp,sizeof(tmp),"%04x.%04x.%04x", -+ udi.udi_vendorNo,udi.udi_productNo,udi.udi_releaseNo); -+#else - snprintf(tmp,sizeof(tmp),"%04x.%04x.%04x", - udi.vendorNo,udi.productNo,udi.releaseNo); -+#endif - - if (strncmp(l,tmp,strlen(tmp))) { - fprintf(stderr,"The firmware specified does not match the device: %s\n",tmp); ---- aw/aw.c.orig Thu Oct 10 14:51:43 2002 -+++ aw/aw.c Thu Oct 10 14:55:06 2002 -@@ -83,15 +83,26 @@ - #define SURE(x) \ - (((x!=NULL) && (*x !='\0')) ? x : "<not defined>") - -+#ifdef __FreeBSD__ -+ printf("Device information: vendor %04x (%s) product %04x (%s) rev %s addr %x\n", -+ udi.udi_vendorNo, SURE(udi.udi_vendor), -+ udi.udi_productNo, SURE(udi.udi_product), -+ SURE(udi.udi_release), udi.udi_addr); -+#else - printf("Device information: vendor %04x (%s) product %04x (%s) rev %s addr %x\n", - udi.vendorNo, SURE(udi.vendor), - udi.productNo, SURE(udi.product), - SURE(udi.release), udi.addr); -+#endif - close(fd); - - /* vendor 0854 (ActiveWire, Inc.) product 0101 (ActiveWire USB) rev 0.00 - */ -+#ifdef __FreeBSD__ -+ if ((udi.udi_vendorNo != 0x854) || (udi.udi_productNo != 0x101)) { -+#else - if ((udi.vendorNo != 0x854) || (udi.productNo != 0x101)) { -+#endif - fprintf(stderr,"Sorry, does not seem to be an ActiveWire board. Aborted\n"); - exit(1); - } - - - --- ezload-0.4.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041223234148.0A74F3E88DA>