RPi B+ Update to BCM2835 V1.37

http://www.airspayce.com/mikem/bcm2835/bcm2835-1.37.tar.gz

- Merge with latest BCM2835 driver changes
- Should allow full support for RPi B+ but is untested

RPi/RF24/RF24.cpp

@@ -523,7 +523,7 @@ void RF24::startListening(void)
   bcm2835_gpio_write(ce_pin, HIGH);
 
   // wait for the radio to come up (130us actually only needed)
-  //delayMicroseconds(130);
+  delayMicroseconds(130);
   listeningStarted = 1;
 }
 

RPi/RF24/bcm2835.c

@@ -5,7 +5,7 @@
 //
 // Author: Mike McCauley
 // Copyright (C) 2011-2013 Mike McCauley
-// $Id: bcm2835.c,v 1.14 2013/12/06 22:24:52 mikem Exp mikem $
+// $Id: bcm2835.c,v 1.16 2014/08/21 01:26:42 mikem Exp mikem $
 //
 //****************************************/
 // TMRh20 2014 - Merge updated lib from here: http://www.airspayce.com/mikem/bcm2835/group__spi.html#ga2fa186568605c21e9166a19b1d82ea95
@@ -58,9 +58,6 @@ static uint8_t debug = 0;
 // I2C The time needed to transmit one byte. In microseconds.
 static int i2c_byte_wait_us = 0;
 
-// SPI Custom Chip Select Pin
-//static int spi_custom_cs = 0;
-
 // Time for millis()
 static unsigned long long epoch ;
 
@@ -460,9 +457,8 @@ void bcm2835_gpio_set_pud(uint8_t pin, uint8_t pud)
     bcm2835_gpio_pudclk(pin, 0);
 }
 
-void bcm2835_spi_begin()
+void bcm2835_spi_begin(void)
 {
-
     // Set the SPI0 pins to the Alt 0 function to enable SPI0 access on them
     //bcm2835_gpio_fsel(RPI_GPIO_P1_26, BCM2835_GPIO_FSEL_ALT0); // CE1
 
@@ -484,41 +480,15 @@ void bcm2835_spi_begin()
 
 void bcm2835_spi_end(void)
 {  
-  /*  // Set all the SPI0 pins back to input
-		if (spi_custom_cs == 0)
-		{
-			bcm2835_gpio_fsel(RPI_GPIO_P1_26, BCM2835_GPIO_FSEL_INPT); // CE1
-			bcm2835_gpio_fsel(RPI_GPIO_P1_24, BCM2835_GPIO_FSEL_INPT); // CE0
-		}
-		else
-		{
-			bcm2835_gpio_fsel(spi_custom_cs, BCM2835_GPIO_FSEL_INPT); // Custom GPIO
-		}
-    bcm2835_gpio_fsel(RPI_GPIO_P1_21, BCM2835_GPIO_FSEL_INPT); // MISO
-    bcm2835_gpio_fsel(RPI_GPIO_P1_19, BCM2835_GPIO_FSEL_INPT); // MOSI
-    bcm2835_gpio_fsel(RPI_GPIO_P1_23, BCM2835_GPIO_FSEL_INPT); // CLK
-	*/
-
     // Set all the SPI0 pins back to input
     bcm2835_gpio_fsel(RPI_GPIO_P1_26, BCM2835_GPIO_FSEL_INPT); // CE1
     bcm2835_gpio_fsel(RPI_GPIO_P1_24, BCM2835_GPIO_FSEL_INPT); // CE0
     bcm2835_gpio_fsel(RPI_GPIO_P1_21, BCM2835_GPIO_FSEL_INPT); // MISO
     bcm2835_gpio_fsel(RPI_GPIO_P1_19, BCM2835_GPIO_FSEL_INPT); // MOSI
     bcm2835_gpio_fsel(RPI_GPIO_P1_23, BCM2835_GPIO_FSEL_INPT); // CLK
-
 }
 
-/*
-// Drive Custom chip select pin
-void bcm2835_spi_setChipSelect(uint8_t level)
-{
-	// Do this only if we are using custom ChipSelect I/O
-	if ( spi_custom_cs > BCM2835_SPI_CS_NONE )
-		bcm2835_gpio_write(spi_custom_cs, level);
-}*/
-
-
-	void bcm2835_spi_setBitOrder(uint8_t order)
+void bcm2835_spi_setBitOrder(uint8_t order)
 {
     // BCM2835_SPI_BIT_ORDER_MSBFIRST is the only one suported by SPI0
 }
@@ -546,11 +516,6 @@ uint8_t bcm2835_spi_transfer(uint8_t value)
     volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
     volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
 
-	// Custom chip select LOW
-	/*if(spi_custom_cs > BCM2835_SPI_CS_NONE){
-		bcm2835_spi_setChipSelect(LOW);
-	}*/
-
     // This is Polled transfer as per section 10.6.1
     // BUG ALERT: what happens if we get interupted in this section, and someone else
     // accesses a different peripheral? 
@@ -561,30 +526,25 @@ uint8_t bcm2835_spi_transfer(uint8_t value)
     bcm2835_peri_set_bits(paddr, BCM2835_SPI0_CS_TA, BCM2835_SPI0_CS_TA);
 
     // Maybe wait for TXD
-    while (!(bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD)){
+    while (!(bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_TXD))
+	;
 
-	}
     // Write to FIFO, no barrier
     bcm2835_peri_write_nb(fifo, value);
 
     // Wait for DONE to be set
-    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE)){
+    while (!(bcm2835_peri_read_nb(paddr) & BCM2835_SPI0_CS_DONE))
+	;
 
-	}	
     // Read any byte that was sent back by the slave while we sere sending to it
     uint32_t ret = bcm2835_peri_read_nb(fifo);
 
     // Set TA = 0, and also set the barrier
     bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
 
-	// Custom chip select HIGH
-	//if(spi_custom_cs > BCM2835_SPI_CS_NONE){
-	//	bcm2835_spi_setChipSelect(HIGH);
-	//}
     return ret;
 }
 
-
 // Writes (and reads) an number of bytes to SPI
 void bcm2835_spi_transfernb(char* tbuf, char* rbuf, uint32_t len)
 {
@@ -611,29 +571,27 @@ void bcm2835_spi_transfernb(char* tbuf, char* rbuf, uint32_t len)
         {
            bcm2835_peri_write_nb(fifo, tbuf[TXCnt]);
            TXCnt++;
-		   
         }
         //Rx fifo not empty, so get the next received bytes
-        while(((bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_RXD))&&( RXCnt < len )){		   
+        while(((bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_RXD))&&( RXCnt < len ))
+        {
            rbuf[RXCnt] = bcm2835_peri_read_nb(fifo);
            RXCnt++;
         }
     }
-	while(! (bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_DONE) ){}
-	if(TXCnt == len){ bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);}
+	while(! (bcm2835_peri_read(paddr) & BCM2835_SPI0_CS_DONE) )
+    ;
+	if(TXCnt == len) bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA)
+	;
 }
 
 
-
 // Writes an number of bytes to SPI
 void bcm2835_spi_writenb(char* tbuf, uint32_t len)
 {
     volatile uint32_t* paddr = bcm2835_spi0 + BCM2835_SPI0_CS/4;
     volatile uint32_t* fifo = bcm2835_spi0 + BCM2835_SPI0_FIFO/4;
 
-	//if(spi_custom_cs > BCM2835_SPI_CS_NONE){
-	//	bcm2835_spi_setChipSelect(LOW);
-	//}
     // This is Polled transfer as per section 10.6.1
     // BUG ALERT: what happens if we get interupted in this section, and someone else
     // accesses a different peripheral?
@@ -667,10 +625,6 @@ void bcm2835_spi_writenb(char* tbuf, uint32_t len)
 
     // Set TA = 0, and also set the barrier
     bcm2835_peri_set_bits(paddr, 0, BCM2835_SPI0_CS_TA);
-
-	//if(spi_custom_cs > BCM2835_SPI_CS_NONE){
-	//	bcm2835_spi_setChipSelect(HIGH);
-	//}
 }
 
 // Writes (and reads) an number of bytes to SPI
@@ -1116,12 +1070,29 @@ uint8_t bcm2835_i2c_write_read_rs(char* cmds, uint32_t cmds_len, char* buf, uint
 uint64_t bcm2835_st_read(void)
 {
     volatile uint32_t* paddr;
+    uint32_t hi, lo;
     uint64_t st;
+    paddr = bcm2835_st + BCM2835_ST_CHI/4;
+    hi = bcm2835_peri_read(paddr);
+
+    paddr = bcm2835_st + BCM2835_ST_CLO/4;
+    lo = bcm2835_peri_read(paddr);
+    
     paddr = bcm2835_st + BCM2835_ST_CHI/4;
     st = bcm2835_peri_read(paddr);
+    
+    // Test for overflow
+    if (st == hi)
+    {
+        st <<= 32;
+        st += lo;
+    }
+    else
+    {
         st <<= 32;
         paddr = bcm2835_st + BCM2835_ST_CLO/4;
         st += bcm2835_peri_read(paddr);
+    }
     return st;
 }