This commit is contained in:
joan 2015-02-02 22:57:09 +00:00
parent 624ecb6fb0
commit 9160f42474
4 changed files with 7 additions and 6 deletions

View File

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

View File

@ -31,7 +31,7 @@ For more information, please refer to <http://unlicense.org/>
#include <stdint.h> #include <stdint.h>
#include <pthread.h> #include <pthread.h>
#define PIGPIO_VERSION 26 #define PIGPIO_VERSION 27
/*TEXT /*TEXT

2
x_pigs
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=26 VERSION=27
GPIO=4 GPIO=4

2
x_pipe
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=26 VERSION=27
GPIO=4 GPIO=4