From 634c3abf3a6807c62e45c99ec3a103c3d070bb5e Mon Sep 17 00:00:00 2001
From: Joseph Poirier <jdpoirier@gmail.com>
Date: Wed, 16 Mar 2016 06:41:19 -0500
Subject: [PATCH 1/2] fix cb function type arg count, circleci branch specific
 builds, move cgo flag

---
 circle.yml                     | 2 +-
 godump978/godump978.go         | 4 ++--
 godump978/godump978_exports.go | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index b49b5de0..66c96c6a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ dependencies:
   pre:
     - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/jpoirier/librtlsdr; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.6.src.tar.gz; tar -zxvf go1.6.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env
   override:
-    - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; make
+    - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; git checkout $CIRCLE_BRANCH ; make
 
 test:
   override:
diff --git a/godump978/godump978.go b/godump978/godump978.go
index f4557b52..81c99064 100644
--- a/godump978/godump978.go
+++ b/godump978/godump978.go
@@ -28,7 +28,7 @@ package godump978
 #include <stdint.h>
 #include "../dump978/dump978.h"
 
-extern void dump978Cb(char updown, uint8_t *data, int len);
+extern void dump978Cb(char updown, uint8_t *data, int len, int rs_errors, int signal_strength);
 static inline CallBack GetGoCb() {
 	return (CallBack)dump978Cb;
 }
@@ -42,7 +42,7 @@ var PackageVersion = "v0.1"
 // InChan is a buffered input channel for raw data.
 var InChan = make(chan []byte, 100)
 
-type UserCbT func(C.char, *C.uint8_t, C.int)
+type UserCbT func(C.char, *C.uint8_t, C.int, C.int, C.int)
 
 // Dump978Init must be the first function called in this package.
 func Dump978Init() {
diff --git a/godump978/godump978_exports.go b/godump978/godump978_exports.go
index 1c989b55..ef3c1a94 100644
--- a/godump978/godump978_exports.go
+++ b/godump978/godump978_exports.go
@@ -12,9 +12,10 @@ import (
 	"unsafe"
 	"strconv"
 )
-
-// #cgo CFLAGS: -L../
+ 
 /*
+#cgo CFLAGS: -L../
+
 #include <stdint.h>
 #include "../dump978/dump978.h"
 */

From 799ee42bc1f0f41846a166fc3aaf24165f694338 Mon Sep 17 00:00:00 2001
From: Joseph Poirier <jdpoirier@gmail.com>
Date: Wed, 16 Mar 2016 07:14:07 -0500
Subject: [PATCH 2/2] fix circleci checkouts so PRs work

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 66c96c6a..44d36035 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ dependencies:
   pre:
     - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/jpoirier/librtlsdr; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.6.src.tar.gz; tar -zxvf go1.6.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env
   override:
-    - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; git checkout $CIRCLE_BRANCH ; make
+    - cd .. ; rm -rf stratux ; git clone --recursive https://github.com/cyoung/stratux ; cd stratux ; git fetch origin ; git checkout $CIRCLE_BRANCH ; make
 
 test:
   override: