V27

diff --git a/pigpio.c b/pigpio.c
index cabe56b072edff4b3e184786c64be998acd328bb..803f2ea2143fdb11490ae7abf6a9b82c285b3fc8 100644 (file)
--- a/pigpio.c
+++ b/pigpio.c
@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 */
 
-/* pigpio version 26 */
+/* pigpio version 27 */
 
 #include <stdio.h>
 #include <string.h>
@@ -283,10 +283,9 @@ bit 0 READ_LAST_NOT_SET_ERROR
    }                                                               \
    while (0)
 
-#define DMA_BUS_ADR 0x40000000
-
 static volatile unsigned int piModel = 1;
 static volatile unsigned int PI_PERI_BASE = 0x20000000;
+static volatile unsigned int DMA_BUS_ADR  = 0x40000000;
 
 #define AUX_BASE   (PI_PERI_BASE + 0x00215000)
 #define CLK_BASE   (PI_PERI_BASE + 0x00101000)
@@ -8932,11 +8931,13 @@ unsigned gpioHardwareRevision(void)
             {
                piModel = 1;
                PI_PERI_BASE = 0x20000000;
+               DMA_BUS_ADR  = 0x40000000;
             }
             else if (strstr (buf, "ARMv7") != NULL)
             {
                piModel = 2;
                PI_PERI_BASE = 0x3F000000;
+               DMA_BUS_ADR  = 0xC0000000;
             }
          }
 

diff --git a/pigpio.h b/pigpio.h
index 3c2d456f442db6593d5fdacaea7e46854d442faf..5b807a5aca73615925536756aea13a3f7d0a7f94 100644 (file)
--- a/pigpio.h
+++ b/pigpio.h
@@ -31,7 +31,7 @@ For more information, please refer to <http://unlicense.org/>
 #include <stdint.h>
 #include <pthread.h>
 
-#define PIGPIO_VERSION 26
+#define PIGPIO_VERSION 27
 
 /*TEXT
 

diff --git a/x_pigs b/x_pigs
index 9753cca0b7eb512f862b27307c11af57a36bd594..5a25b15edb8618bc58f0c7ee5053f6653df1978c 100755 (executable)
--- a/x_pigs
+++ b/x_pigs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=26
+VERSION=27
 
 GPIO=4
 

diff --git a/x_pipe b/x_pipe
index ba5341c5849996e1f3fd7edc836a7d9a30740d4c..f49dfc7b7b1d863c22f7c9f43ab334bf0f3ca8a3 100755 (executable)
--- a/x_pipe
+++ b/x_pipe
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=26
+VERSION=27
 
 GPIO=4