clockworkpi/WiringPi
1
0
Fork 0
mirror of https://github.com/clockworkpi/WiringPi.git synced 2025-12-13 08:18:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use correct peripheral address for Pi4B

Browse Source
This commit is contained in:
Steve Baker 2019-12-14 02:01:23 +00:00
parent aca883a051
commit a49f696232
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wiringPi/wiringPi.c
View File

@ -214,7 +214,8 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
// The base address of the GPIO memory mapped hardware IO // The base address of the GPIO memory mapped hardware IO
#define GPIO_PERI_BASE_OLD 0x20000000 #define GPIO_PERI_BASE_OLD 0x20000000
#define GPIO_PERI_BASE_NEW 0x3F000000 #define GPIO_PERI_BASE_2708 0x3F000000
#define GPIO_PERI_BASE_2711 0xFE000000
static volatile unsigned int piGpioBase = 0 ; static volatile unsigned int piGpioBase = 0 ;
@ -1533,7 +1534,6 @@ int digitalRead (int pin)
{ {
char c ; char c ;
struct wiringPiNodeStruct *node = wiringPiNodes ; struct wiringPiNodeStruct *node = wiringPiNodes ;
if ((pin & PI_GPIO_MASK) == 0) // On-Board Pin if ((pin & PI_GPIO_MASK) == 0) // On-Board Pin
{ {
/**/ if (wiringPiMode == WPI_MODE_GPIO_SYS) // Sys mode /**/ if (wiringPiMode == WPI_MODE_GPIO_SYS) // Sys mode
@ -2243,7 +2243,9 @@ int wiringPiSetup (void)
piBoardId (&model, &rev, &mem, &maker, &overVolted) ; piBoardId (&model, &rev, &mem, &maker, &overVolted) ;
if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P)) if ((model == PI_MODEL_CM) ||
(model == PI_MODEL_CM3) ||
(model == PI_MODEL_CM3P))
wiringPiMode = WPI_MODE_GPIO ; wiringPiMode = WPI_MODE_GPIO ;
else else
wiringPiMode = WPI_MODE_PINS ; wiringPiMode = WPI_MODE_PINS ;
@ -2270,8 +2272,12 @@ int wiringPiSetup (void)
piGpioBase = GPIO_PERI_BASE_OLD ; piGpioBase = GPIO_PERI_BASE_OLD ;
break ; break ;
case PI_MODEL_4B:
piGpioBase = GPIO_PERI_BASE_2711 ;
break ;
default: default:
piGpioBase = GPIO_PERI_BASE_NEW ; piGpioBase = GPIO_PERI_BASE_2708 ;
break ; break ;
} }