deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support for serialdump on MacOS X. Patch by Laurent Deru.

Browse source
This commit is contained in:
Niclas Finne 2012-05-07 13:16:27 +02:00
parent cc863e7bd4
commit 40595ad5c7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/sky/Makefile.common
View file

@ -62,7 +62,7 @@ else
ifeq ($(HOST_OS),Darwin) ifeq ($(HOST_OS),Darwin)
ifndef MOTELIST ifndef MOTELIST
USBDEVPREFIX= USBDEVPREFIX=
SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-macos
MOTELIST = $(CONTIKI)/tools/sky/motelist-macos MOTELIST = $(CONTIKI)/tools/sky/motelist-macos
TMOTE_BSL_FILE = tmote-bsl-linux TMOTE_BSL_FILE = tmote-bsl-linux
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0) TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)

6
tools/sky/serialdump.c
View file

@ -4,6 +4,8 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>
#include <stdlib.h>
#include <string.h>
#define BAUDRATE B57600 #define BAUDRATE B57600
#define BAUDRATE_S "57600" #define BAUDRATE_S "57600"
@ -159,7 +161,11 @@ int main(int argc, char **argv)
} }
fprintf(stderr, "connecting to %s (%s)", device, speedname); fprintf(stderr, "connecting to %s (%s)", device, speedname);
#ifndef __APPLE__
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC ); fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC );
#else
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC );
#endif
if (fd <0) { if (fd <0) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
perror(device); perror(device);