From 2234345f1cfe44f9ee6cd47e86174c1572daa832 Mon Sep 17 00:00:00 2001
From: Eray Arslan <relfishere@gmail.com>
Date: Sat, 22 Aug 2020 19:40:34 +0300
Subject: [PATCH] shit happen

---
 bladerf.go      | 16 ++++++++--------
 bladerf_test.go | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/bladerf.go b/bladerf.go
index 01411fa..b0ac258 100644
--- a/bladerf.go
+++ b/bladerf.go
@@ -136,10 +136,15 @@ func GetDevInfoFromStr(devStr string) DevInfo {
 	return NewDevInfo(&devInfo)
 }
 
-func OpenWithDevInfo(devInfo DevInfo) BladeRF {
+func OpenWithDevInfo(devInfo DevInfo) (BladeRF, error) {
 	var bladeRF *C.struct_bladerf
-	C.bladerf_open_with_devinfo(&bladeRF, devInfo.ref)
-	return BladeRF{ref: bladeRF}
+	err := GetError(C.bladerf_open_with_devinfo(&bladeRF, devInfo.ref))
+
+	if err != nil {
+		return BladeRF{}, err
+	}
+
+	return BladeRF{ref: bladeRF}, nil
 }
 
 func OpenWithDeviceIdentifier(identify string) BladeRF {
@@ -169,11 +174,6 @@ func SetFrequency(bladeRF *BladeRF, channel channel.Channel, frequency int) erro
 func SetSampleRate(bladeRF *BladeRF, channel channel.Channel, sampleRate int) error {
 	var actual C.uint
 	err := GetError(C.bladerf_set_sample_rate((*bladeRF).ref, C.bladerf_channel(channel), C.uint(sampleRate), &actual))
-
-	if err == nil {
-		println(uint(actual))
-	}
-
 	return err
 }
 
diff --git a/bladerf_test.go b/bladerf_test.go
index efef8a0..7548bfd 100644
--- a/bladerf_test.go
+++ b/bladerf_test.go
@@ -69,17 +69,19 @@ func TestBladeRF(t *testing.T) {
 
 	devices := GetDeviceList()
 	fmt.Printf("Devices Len: %d\n", len(devices))
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	LoadFpga(rf, "/Users/erayarslan/Downloads/hostedxA4-latest.rbf")
 	Close(rf)
 
 	rf = Open()
 	info := GetDevInfo(&rf)
 	Close(rf)
-	Close(OpenWithDevInfo(GetDevInfo(&rf)))
+	out, _ := OpenWithDevInfo(GetDevInfo(&rf))
+	Close(out)
 	Close(Open())
 	Close(OpenWithDeviceIdentifier("*:serial=" + info.serial))
-	Close(OpenWithDevInfo(GetDevInfoFromStr("*:serial=" + info.serial)))
+	out2, _ :=OpenWithDevInfo(GetDevInfoFromStr("*:serial=" + info.serial))
+	Close(out2)
 
 	result := DevInfoMatches(GetDevInfo(&rf), GetDevInfo(&rf))
 	fmt.Println("---------")
@@ -111,7 +113,7 @@ func TestSetGainStage(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	stages := GetGainStages(&rf, CHANNEL_RX(1))
@@ -136,7 +138,7 @@ func TestStream(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	_ = SetFrequency(&rf, channel, 96600000)
@@ -208,7 +210,7 @@ func TestGetGainModes(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	GetGainModes(&rf, CHANNEL_RX(1))
@@ -224,7 +226,7 @@ func TestGetGainRange(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	bfRange, _ := GetGainRange(&rf, CHANNEL_RX(1))
@@ -242,7 +244,7 @@ func TestGPSData(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	_ = SetFrequency(&rf, channel, 1525420000)
@@ -274,7 +276,7 @@ func TestAsyncStream(t *testing.T) {
 		return
 	}
 
-	rf := OpenWithDevInfo(devices[0])
+	rf, _ := OpenWithDevInfo(devices[0])
 	defer Close(rf)
 
 	_ = SetFrequency(&rf, channel, 96600000)