From 9160f4247414ec69d30ff2771d6f2d6cbed06456 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 2 Feb 2015 22:57:09 +0000 Subject: [PATCH] V27 --- pigpio.c | 7 ++++--- pigpio.h | 2 +- x_pigs | 2 +- x_pipe | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pigpio.c b/pigpio.c index cabe56b..803f2ea 100644 --- a/pigpio.c +++ b/pigpio.c @@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to */ -/* pigpio version 26 */ +/* pigpio version 27 */ #include #include @@ -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 3c2d456..5b807a5 100644 --- a/pigpio.h +++ b/pigpio.h @@ -31,7 +31,7 @@ For more information, please refer to #include #include -#define PIGPIO_VERSION 26 +#define PIGPIO_VERSION 27 /*TEXT diff --git a/x_pigs b/x_pigs index 9753cca..5a25b15 100755 --- 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 ba5341c..f49dfc7 100755 --- a/x_pipe +++ b/x_pipe @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=26 +VERSION=27 GPIO=4