[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/c autoconf.h, 1.2, 1.3 serialsource.c, 1.2, 1.3 sf.c, 1.2, 1.3

David Gay idgay at users.sourceforge.net
Wed Jun 6 09:17:45 PDT 2007


Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/c
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19119

Modified Files:
	autoconf.h serialsource.c sf.c 
Log Message:
some C sdk bug fixes + Mac OS X support


Index: autoconf.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/autoconf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** autoconf.h	12 Jul 2006 16:59:52 -0000	1.2
--- autoconf.h	6 Jun 2007 16:17:42 -0000	1.3
***************
*** 1,3 ****
! /* autoconf.h.  Generated by configure.  */
  /* autoconf.h.in.  Generated from configure.ac by autoheader.  */
  
--- 1,3 ----
! /* autoconf.h.  Generated from autoconf.h.in by configure.  */
  /* autoconf.h.in.  Generated from configure.ac by autoheader.  */
  

Index: serialsource.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/serialsource.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** serialsource.c	12 Jul 2006 16:59:53 -0000	1.2
--- serialsource.c	6 Jun 2007 16:17:42 -0000	1.3
***************
*** 194,198 ****
  
  /* Work around buggy usb serial driver (returns 0 when no data is
!    available, independent of the blocking/non-blocking mode) */
  static int buggyread(serial_source src, void *buffer, int n)
  {
--- 194,200 ----
  
  /* Work around buggy usb serial driver (returns 0 when no data is
!    available, independent of the blocking/non-blocking mode).
!    Mac OS X seems to like to do this too (at least with a Keyspan 49WG)
! */
  static int buggyread(serial_source src, void *buffer, int n)
  {
***************
*** 207,211 ****
  	  cnt = -1;
  	  errno = EAGAIN;
- 	  printf("foo\n");
  	}
        return cnt;
--- 209,212 ----
***************
*** 591,594 ****
--- 592,596 ----
  	    {
  	      message(src, msg_bad_crc);
+ 	      free(received);
  	      /* We don't lose sync here. If we did, garbage on the line
  		 at startup will cause loss of the first packet. */

Index: sf.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/sf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sf.c	12 Jul 2006 16:59:53 -0000	1.2
--- sf.c	6 Jun 2007 16:17:42 -0000	1.3
***************
*** 88,91 ****
--- 88,92 ----
  void new_client(int fd)
  {
+   fcntl(fd, F_SETFL, 0);
    if (init_sf_source(fd) < 0)
      close(fd);



More information about the Tinyos-2-commits mailing list