diff --git a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
index 2f73d6978c..065b0bbad2 100644
--- a/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
+++ b/targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
@@ -412,7 +412,7 @@ void calibrate_rf(openair0_device *device) {
   bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_LMS_DCOFF_I,offIold);
   for (i=0;i<10;i++) {
     trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
   }
   for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
     switch (i&3) {
@@ -438,7 +438,7 @@ void calibrate_rf(openair0_device *device) {
   bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_LMS_DCOFF_I,offI);
   for (i=0;i<10;i++) {
     trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
   }
   for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
     switch (i&3) {
@@ -474,7 +474,7 @@ void calibrate_rf(openair0_device *device) {
 
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
       switch (i&3) {
@@ -503,7 +503,7 @@ void calibrate_rf(openair0_device *device) {
   bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_LMS_DCOFF_Q,offQold);
   for (i=0;i<10;i++) {
     trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
   }
   // project on fs/4
   for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
@@ -530,7 +530,7 @@ void calibrate_rf(openair0_device *device) {
   bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_LMS_DCOFF_Q,offQ);
   for (i=0;i<10;i++) {
     trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+    trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
   }
   for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
     switch (i&3) {
@@ -568,7 +568,7 @@ void calibrate_rf(openair0_device *device) {
 
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
       switch (i&3) {
@@ -601,7 +601,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_FPGA_PHASE,offphaseold);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on fs/8 (Image of TX signal in +ve frequencies)
     for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
@@ -618,7 +618,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_FPGA_PHASE,offphase);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on fs/8 (Image of TX signal in +ve frequencies)
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -648,7 +648,7 @@ void calibrate_rf(openair0_device *device) {
       
       for (i=0;i<10;i++) {
 	trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
       }
       // project on fs/8 (Image of TX signal in +ve frequencies)
       for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -670,7 +670,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_FPGA_GAIN,offgainold);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on fs/8 (Image of TX signal in +ve frequencies)
     for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
@@ -687,7 +687,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_TX,BLADERF_CORR_FPGA_GAIN,offgain);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on fs/8 (Image of TX signal in +ve frequencies)
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -716,7 +716,7 @@ void calibrate_rf(openair0_device *device) {
       
       for (i=0;i<10;i++) {
 	trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
       }
       // project on fs/8 (Image of TX signal in +ve frequencies)
       for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -741,7 +741,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_RX,BLADERF_CORR_FPGA_PHASE,offphaseold);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on -3fs/8 (Image of TX signal in -ve frequencies)
     for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
@@ -758,7 +758,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_RX,BLADERF_CORR_FPGA_PHASE,offphase);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on -3fs/8 (Image of TX signal in -ve frequencies)
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -788,7 +788,7 @@ void calibrate_rf(openair0_device *device) {
       
       for (i=0;i<10;i++) {
 	trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
       }
       // project on -3fs/8 (Image of TX signal in -ve frequencies)
       for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -810,7 +810,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_RX,BLADERF_CORR_FPGA_GAIN,offgainold);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0,0);
     }
     // project on -3fs/8 (Image of TX signal in +ve frequencies)
     for (meanIold=meanQold=i=j=0;i<RXDCLENGTH;i++) {
@@ -827,7 +827,7 @@ void calibrate_rf(openair0_device *device) {
     bladerf_set_correction(brf->dev,BLADERF_MODULE_RX,BLADERF_CORR_FPGA_GAIN,offgain);
     for (i=0;i<10;i++) {
       trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+      trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
     }
     // project on 3fs/8 (Image of TX signal in -ve frequencies)
     for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -856,7 +856,7 @@ void calibrate_rf(openair0_device *device) {
       
       for (i=0;i<10;i++) {
 	trx_brf_read(device, &ptimestamp, (void **)&calib_buffp, RXDCLENGTH, 0);
-	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0);
+	trx_brf_write(device,ptimestamp+5*RXDCLENGTH, (void **)&calib_tx_buffp, RXDCLENGTH, 0, 0);
       }
       // project on -3fs/8 (Image of TX signal in -ve frequencies)
       for (meanI=meanQ=i=j=0;i<RXDCLENGTH;i++) {
@@ -1068,7 +1068,6 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
   bladerf_log_set_verbosity(get_brf_log_level(openair0_cfg->log_level));
   
   printf("BLADERF: Initializing openair0_device\n");
-  device->priv           = brf; 
   device->Mod_id         = num_devices++;
   device->type             = BLADERF_DEV; 
   device->trx_start_func = trx_brf_start;