Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sc8-pr-cvs17:/tmp/cvs-serv32415
Modified Files:
avr-binutils.info avr-gcc.info
Added Files:
avr-libc.info avrdude.info avrdude.patch
Log Message:
move to stable at maintainer's request
--- NEW FILE: avrdude.patch ---
diff -w -u -r /tmp/avrdude-5.1/ser_posix.c ./ser_posix.c
--- /tmp/avrdude-5.1/ser_posix.c 2005-08-29 18:30:05.000000000 -0700
+++ ./ser_posix.c 2006-04-03 09:08:25.000000000 -0700
@@ -65,6 +65,9 @@
{ 0, 0 } /* Terminator. */
};
+static struct termios original_termios;
+static int saved_original_termios;
+
static speed_t serial_baud_lookup(long baud)
{
struct baud_mapping *map = baud_lookup_table;
@@ -75,7 +78,7 @@
map++;
}
- fprintf(stderr, "%s: serial_baud_lookup(): unknown baud rate: %ld",
+ fprintf(stderr, "%s: serial_baud_lookup(): unknown baud rate: %ld\n",
progname, baud);
exit(1);
}
@@ -87,33 +90,38 @@
speed_t speed = serial_baud_lookup (baud);
if (!isatty(fd))
- return -1;
+ return -ENOTTY;
/*
* initialize terminal modes
*/
rc = tcgetattr(fd, &termios);
if (rc < 0) {
- fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed, %s",
- progname, strerror(errno));
+ fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed",
+ progname);
return -errno;
}
- termios.c_iflag = 0;
- termios.c_oflag = 0;
- termios.c_cflag = 0;
+ /*
+ * copy termios for ser_close if we haven't already
+ */
+ if (! saved_original_termios++) {
+ original_termios = termios;
+ }
+
+ cfmakeraw(&termios);
+ termios.c_cflag &= ~CSIZE;
termios.c_cflag |= (CS8 | CREAD | CLOCAL);
- termios.c_lflag = 0;
termios.c_cc[VMIN] = 1;
termios.c_cc[VTIME] = 0;
cfsetospeed(&termios, speed);
cfsetispeed(&termios, speed);
- rc = tcsetattr(fd, TCSANOW, &termios);
+ rc = tcsetattr(fd, TCSANOW | TCSAFLUSH, &termios);
if (rc < 0) {
- fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed, %s",
- progname, strerror(errno));
+ fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed",
+ progname);
return -errno;
}
@@ -137,7 +145,7 @@
/*
* open the serial port
*/
- fd = open(port, O_RDWR | O_NOCTTY /*| O_NONBLOCK*/);
+ fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (fd < 0) {
fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n",
progname, port, strerror(errno));
@@ -150,8 +158,8 @@
rc = ser_setspeed(fd, baud);
if (rc) {
fprintf(stderr,
- "%s: ser_open(): can't set attributes for device \"%s\"\n",
- progname, port);
+ "%s: ser_open(): can't set attributes for device \"%s\": %s\n",
+ progname, port, strerror(-rc));
exit(1);
}
@@ -161,7 +169,18 @@
static void ser_close(int fd)
{
- /* FIXME: Should really restore the terminal to original state here. */
+ /*
+ * restore original termios settings from ser_open
+ */
+ if (saved_original_termios) {
+ int rc = tcsetattr(fd, TCSANOW | TCSADRAIN, &original_termios);
+ if (rc) {
+ fprintf(stderr,
+ "%s: ser_close(): can't reset attributes for device: %s\n",
+ progname, strerror(errno));
+ }
+ saved_original_termios = 0;
+ }
close(fd);
}
diff -u avrdude-5.1/stk500.c avrdude-5.1-patch/stk500.c
--- avrdude-5.1/stk500.c 2005-08-30 03:30:05.000000000 +0200
+++ avrdude-5.1-patch/stk500.c 2006-04-07 10:26:08.000000000 +0200
@@ -625,13 +625,14 @@
static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m,
int page_size, int n_bytes)
{
- unsigned char buf[16];
+ unsigned char buf[page_size + 16];
int memtype;
unsigned int addr;
int a_div;
int block_size;
int tries;
unsigned int n;
+ unsigned int i;
int flash;
if (page_size == 0) {
@@ -697,17 +698,19 @@
retry:
tries++;
stk500_loadaddr(pgm, addr/a_div);
- buf[0] = Cmnd_STK_PROG_PAGE;
- buf[1] = (block_size >> 8) & 0xff;
- buf[2] = block_size & 0xff;
- buf[3] = memtype;
- stk500_send(pgm, buf, 4);
-
- stk500_send(pgm, &m->buf[addr], block_size);
-
- buf[0] = Sync_CRC_EOP;
- stk500_send(pgm, buf, 1);
-
+
+ /* build command block and avoid multiple send commands as it leads to a
crash
+ of the silabs usb serial driver on mac os x */
+ i = 0;
+ buf[i++] = Cmnd_STK_PROG_PAGE;
+ buf[i++] = (block_size >> 8) & 0xff;
+ buf[i++] = block_size & 0xff;
+ buf[i++] = memtype;
+ memcpy(&buf[i], &m->buf[addr], block_size);
+ i += block_size;
+ buf[i++] = Sync_CRC_EOP;
+ stk500_send( pgm, buf, i);
+
stk500_recv(pgm, buf, 1);
if (buf[0] == Resp_STK_NOSYNC) {
if (tries > 33) {
diff -u -r1.36 configure.ac
--- avrdude-5.1/Makefile.in 2006-09-26 19:59:27.000000000 +0200
+++ avrdude-5.1-patched/Makefile.in 2006-09-26 19:59:03.000000000 +0200
@@ -100,7 +100,7 @@
avrdude-stk500v2.$(OBJEXT) avrdude-term.$(OBJEXT) \
avrdude-usb_libusb.$(OBJEXT)
avrdude_OBJECTS = $(am_avrdude_OBJECTS)
-avrdude_LDADD = $(LDADD)
+avrdude_LDADD = $(LDADD) -framework CoreFoundation -framework IOKit
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
--- NEW FILE: avrdude.info ---
Package: avrdude
Version: 5.1
Revision: 1
Depends: libusb-shlibs (>= 0.1.8-14), libncurses5-shlibs
BuildDepends: libusb (>= 0.1.8-14), libncurses5, automake1.9, autoconf2.5
Source: http://download.savannah.gnu.org/releases/%n/%n-%v.tar.gz
Source-MD5: 6c3005709983f65043529c6eda5de314
Patch: %n.patch
ConfigureParams: --mandir='${prefix}/share/man'
InstallScript: <<
make prefix=%i install-exec install-man
mkdir -p %i/share/info
install doc/avrdude.info %i/share/info
<<
InfoDocs: avrdude.info
ConfFiles: %p/etc/%n.conf
DocFiles: AUTHORS ChangeLog* COPYING NEWS README doc/TODO
Description: Atmel AVR Microcontrollers Programmer
DescDetail: <<
Avrdude is a tool for AVR microcontrollers which can interface to
many hardware in-system programmers or bootloaders
<<
DescPort: <<
I've added the following patches:
LIBUSB on MacOS X
http://savannah.nongnu.org/patch/?func=detailitem&item_id=4685
O_NONBLOCK
http://savannah.nongnu.org/patch/?func=detailitem&item_id=5008
Better STK500 Robustness
http://savannah.nongnu.org/patch/?func=detailitem&item_id=5025
<<
License: GPL
Homepage: http://savannah.nongnu.org/projects/avrdude
Maintainer: Matthias Ringwald <[EMAIL PROTECTED]>
Index: avr-gcc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/avr-gcc.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- avr-gcc.info 20 Feb 2006 18:48:12 -0000 1.2
+++ avr-gcc.info 22 Jul 2007 14:33:03 -0000 1.3
@@ -1,25 +1,27 @@
Package: avr-gcc
-Version: 3.3.2
+Version: 4.2.0
Revision: 1
-Depends: avr-binutils (>= 2.14)
+Depends: avr-binutils (>= 2.15)
+BuildDepends: gcc4.0
Maintainer: Matthias Ringwald <[EMAIL PROTECTED]>
-Source: mirror:gnu:gcc/gcc-%v/gcc-%v.tar.gz
-Source-MD5: 60ab4d3431786a81be6522cc04bc1827
-CompileScript: <<
-./configure --target=avr --prefix=%p/share/avr --prefix=%p/share/avr
--bindir=%p/bin --mandir=%p/share/man --infodir=%p/share/info
--enable-languages=c,c++ --disable-nls
-make
-<<
+Source: mirror:gnu:gcc/gcc-%v/gcc-%v.tar.bz2
+Source-MD5: 4798c23548dc791ea12a139e18940684
+
+SetCC: gcc-4.0
+SetCXX: g++-4.0
+ConfigureParams: --target=avr --prefix=%p/share/avr --prefix=%p/share/avr
--bindir=%p/bin --mandir=%p/share/man --infodir=%p/share/info
--enable-languages=c,c++ --disable-nls --disable-libssp
+
InstallScript: <<
-make install DESTDIR=%d
-# maybe needed: rm -fr %i/share/avr/include
-rm -f %i/share/avr/lib/libiberty.a
-rm -f %i/share/info/standards.info
-rm -f %i/share/info/configure.info*
-mv %i/share/info/cpp.info %i/share/info/avr-cpp.info
-mv %i/share/info/cppinternals.info %i/share/info/avr-cppinternals.info
-mv %i/share/info/gcc.info %i/share/info/avr-gcc.info
-mv %i/share/info/gccint.info %i/share/info/avr-gccint.info
+ make install DESTDIR=%d
+ # maybe needed: rm -fr %i/share/avr/include
+ rm -f %i/share/avr/lib/libiberty.a
+ rm -f %i/share/info/standards.info
+ rm -f %i/share/info/configure.info*
+ rm -fr %i/share/man/man7
+ # prefix info files with avr- (thanks to Carl van Denzen for the nice loop)
+ for i in $(ls %i/share/info/*info); do mv $i
%i/share/info/avr-${i##*/};done
<<
+
DocFiles: BUGS bugs.html COPYING FAQ faq.html MAINTAINERS README README.SCO
InfoDocs: avr-cpp.info avr-cppinternals.info avr-gcc.info avr-gccint.info
Description: GNU GCC for ATMEL AVR micro controllers
@@ -31,3 +33,4 @@
<<
License: GPL
Homepage: http://gcc.gnu.org/
+
Index: avr-binutils.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/avr-binutils.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- avr-binutils.info 20 Jan 2006 20:12:52 -0000 1.1
+++ avr-binutils.info 22 Jul 2007 14:33:03 -0000 1.2
@@ -1,36 +1,17 @@
Package: avr-binutils
-Version: 2.14
+Version: 2.17
Revision: 1
Maintainer: Matthias Ringwald <[EMAIL PROTECTED]>
Source: mirror:gnu:binutils/binutils-%v.tar.bz2
-Source-MD5: 2da8def15d28af3ec6af0982709ae90a
+Source-MD5: e26e2e06b6e4bf3acf1dc8688a94c0d1
-CompileScript: <<
-./configure --target=avr --prefix=%p/share/avr --bindir=%p/bin
--mandir=%p/share/man --infodir=%p/share/info --disable-nls
-make
-<<
+ConfigureParams: --target=avr --prefix=%p/share/avr --bindir=%p/bin
--mandir=%p/share/man --infodir=%p/share/info --disable-nls
InstallScript: <<
-make install DESTDIR=%d
-rm -fr %i/share/avr/lib/
-mv %i/share/info/as.info %i/share/info/avr-as.info
-mv %i/share/info/bfd.info %i/share/info/avr-bfd.info
-mv %i/share/info/bfd.info-1 %i/share/info/avr-bfd.info-1
-mv %i/share/info/bfd.info-2 %i/share/info/avr-bfd.info-2
-mv %i/share/info/bfd.info-3 %i/share/info/avr-bfd.info-3
-mv %i/share/info/bfd.info-4 %i/share/info/avr-bfd.info-4
-mv %i/share/info/bfd.info-5 %i/share/info/avr-bfd.info-5
-mv %i/share/info/bfd.info-6 %i/share/info/avr-bfd.info-6
-mv %i/share/info/bfd.info-7 %i/share/info/avr-bfd.info-7
-mv %i/share/info/bfd.info-8 %i/share/info/avr-bfd.info-8
-mv %i/share/info/bfd.info-9 %i/share/info/avr-bfd.info-9
-mv %i/share/info/binutils.info %i/share/info/avr-binutils.info
-mv %i/share/info/configure.info %i/share/info/avr-configure.info
-mv %i/share/info/configure.info-1 %i/share/info/avr-configure.info-1
-mv %i/share/info/configure.info-2 %i/share/info/avr-configure.info-2
-mv %i/share/info/configure.info-3 %i/share/info/avr-configure.info-3
-mv %i/share/info/ld.info %i/share/info/avr-ld.info
-mv %i/share/info/standards.info %i/share/info/avr-standards.info
+ make install DESTDIR=%d
+ rm -fr %i/share/avr/lib/
+ # prefix info files with avr- (thanks to Carl van Denzen for the nice loop)
+ for i in $(ls %i/share/info/*info); do mv $i
%i/share/info/avr-${i##*/};done
<<
DocFiles: README COPYING
--- NEW FILE: avr-libc.info ---
Package: avr-libc
Version: 1.4.6
Revision: 1
Depends: avr-binutils (>= 2.17), avr-gcc (>= 4.2.0)
Maintainer: Matthias Ringwald <[EMAIL PROTECTED]>
Source: http://download.savannah.gnu.org/releases/avr/avr-libc-bin-%v.zip
Source-MD5: 78fede358c684587622d76d62e622b21
NoSourceDirectory: true
CompileScript: <<
<<
InstallScript: <<
mkdir -p %i/share/avr
cp -R %b/avr %i/share/avr/
cp -R %b/bin %i/share/avr/
mkdir -p %i/share/doc/avr-libc
cp -R %b/share/doc/avr-libc-%v/* %i/share/doc/avr-libc
ln -s %p/share/doc/avr-libc/avr-libc-user-manual/index.html
%i/share/doc/avr-libc/avr-libc-user-manual.html
<<
Description: AVR LIBC for GNU GCC & GNU binutils
License: GPL
DescDetail: <<
This is AVR-LIBC. It is a C library implementation for use with
GNU GCC and GNU binutils for development of programs for Atmel's AVR
mirocontrollers
<<
DescPort: <<
Gettting avr-libc to compile takes more effort than its worth, since
they provide already built versions. This package just installs the
prebuilt binaries.
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
