From a534cb921583775d39f7042a1e7664165bda9e60 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Wed, 6 Jul 2011 09:59:08 +0200
Subject: [PATCH] modified nrf code to use sspSendReceive

---
 firmware/applications/funk.c |  2 --
 firmware/funk/nrf24l01p.c    | 15 +++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/firmware/applications/funk.c b/firmware/applications/funk.c
index 49bac33..ccd4d88 100644
--- a/firmware/applications/funk.c
+++ b/firmware/applications/funk.c
@@ -157,8 +157,6 @@ void handleMenu(const struct MENU *the_menu) {
     visible_lines--; // subtract title line
 
     while (!back) {
-
-        delayms(100);
         uint8_t line = 0;
 
         lcdFill(0); // clear display buffer
diff --git a/firmware/funk/nrf24l01p.c b/firmware/funk/nrf24l01p.c
index 13ae5ba..921b9e2 100644
--- a/firmware/funk/nrf24l01p.c
+++ b/firmware/funk/nrf24l01p.c
@@ -39,8 +39,8 @@ void nrf_cmd(uint8_t cmd){
 };
 
 uint8_t nrf_cmd_status(uint8_t cmd){
-    xmit_spi(cmd);
-    return rcvr_spi();
+    sspSendReceive(0, &cmd, 1);
+    return cmd;
 };
 
 void nrf_write_reg(const uint8_t reg, const uint8_t val){
@@ -64,13 +64,12 @@ void nrf_write_reg_long(const uint8_t reg, int len, char* data){
     };
 };
 
+//XXX: Why is len a pointer?
 void nrf_cmd_read_long(const uint8_t cmd, int *len, char* data){
-    xmit_spi(cmd);
-    // do i need to read the status byte here?
-    for(int i=0;i<*len;i++){
-        xmit_spi(0);
-        rcvr_spi_m(&data[i]);
-    };
+    data[0] = 0xFF;
+    for(int i=1;i<*len;i++)
+        data[i] = 0x00;
+    sspSendReceive(0,data,*len);
 };
 
 void nrf_init() {