[Tinyos-commits] CVS: tinyos-1.x/tools/src/sf platform.c, NONE, 1.1 Makefile, 1.1, 1.2 platform.h, 1.1, 1.2 sfsource.h, 1.4, 1.5

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tools/src/sf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7802

Modified Files:
	Makefile platform.h sfsource.h 
Added Files:
	platform.c 
Log Message:
more cleanup


--- NEW FILE: platform.c ---
#include <sys/types.h>
#include "platform.h"

uint32_t platform;

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/src/sf/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	12 Feb 2004 01:19:37 -0000	1.1
--- Makefile	13 Dec 2004 19:52:14 -0000	1.2
***************
*** 1,8 ****
! all: sf
  
! sf: sf.c serialsource.c sfsource.c serialsource.h sfsource.h
! 	gcc -O1 -Wall -g -o $@ sf.c serialsource.c sfsource.c
  
  # For ARM
! asf: sf.c serialsource.c sfsource.c serialsource.h sfsource.h
! 	arm-linux-gcc -O1 -Wall -g -o $@ sf.c serialsource.c sfsource.c
--- 1,17 ----
! PROGRAMS=sf sflisten
  
! all: $(PROGRAMS)
! 
! sf: sf.c serialsource.c sfsource.c platform.c platform.h serialsource.h sfsource.h
! 	gcc -O1 -Wall -g -o $@ sf.c serialsource.c sfsource.c platform.c
  
  # For ARM
! asf: sf.c serialsource.c sfsource.c platform.c platform.h serialsource.h sfsource.h
! 	arm-linux-gcc -O1 -Wall -g -o $@ sf.c serialsource.c sfsource.c platform.c
! 
! sflisten: sflisten.c sfsource.c platform.c platform.h sfsource.h
! 	gcc -O1 -Wall -g -o $@ sflisten.c sfsource.c platform.c
! 
! clean:
! 	rm -f $(PROGRAMS) asf
! 

Index: platform.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/src/sf/platform.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** platform.h	31 May 2004 22:06:05 -0000	1.1
--- platform.h	13 Dec 2004 19:52:14 -0000	1.2
***************
*** 6,8 ****
--- 6,24 ----
  #define MICAZ   3
  
+ #if !defined(__CYGWIN__)
+ #include <inttypes.h>
+ #else //__CYGWIN
+ #include <sys/types.h>
+ // Earlier cygwins do not define uint8_t & co
+ #ifndef _STDINT_H
+ #ifndef __uint32_t_defined
+ #define __uint32_t_defined
+ typedef u_int32_t uint32_t;
+ #endif
+ #endif
+ 
+ #endif //__CYGWIN
+ 
+ extern uint32_t platform;
+ 
  #endif

Index: sfsource.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/src/sf/sfsource.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sfsource.h	13 Dec 2004 19:43:43 -0000	1.4
--- sfsource.h	13 Dec 2004 19:52:14 -0000	1.5
***************
*** 2,7 ****
  #define SFSOURCE_H
  
- extern uint32_t platform;
- 
  int open_sf_source(const char *host, int port);
  /* Returns: file descriptor for serial forwarder at host:port, or
--- 2,5 ----