MirrorSave
/
pigpio
mirror of https://github.com/joan2937/pigpio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pigpio: allow override of /proc/cpuinfo

This commit is contained in:
Paul Wallrabe 2021-07-22 10:48:09 +02:00
parent c33738a320
commit 9adb7cd1f9
No known key found for this signature in database
GPG Key ID: CBEC1170D31CBE3B
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pigpio.c
View File

@ -6067,7 +6067,7 @@ static void alertEmit(
newLevel = reportedLevel; newLevel = reportedLevel;
report[emit].seqno = seqno; report[emit].seqno = seqno;
report[emit].flags = report[emit].flags =
PI_NTFY_FLAGS_EVENT | PI_NTFY_FLAGS_BIT(b); PI_NTFY_FLAGS_EVENT | PI_NTFY_FLAGS_BIT(b);
report[emit].tick = eTick; report[emit].tick = eTick;
report[emit].level = newLevel; report[emit].level = newLevel;
@ -7395,7 +7395,7 @@ static int initPeripherals(void)
else else
gpioCfg.DMAprimaryChannel = PI_DEFAULT_DMA_PRIMARY_CHANNEL; gpioCfg.DMAprimaryChannel = PI_DEFAULT_DMA_PRIMARY_CHANNEL;
} }
if (gpioCfg.DMAsecondaryChannel == PI_DEFAULT_DMA_NOT_SET) if (gpioCfg.DMAsecondaryChannel == PI_DEFAULT_DMA_NOT_SET)
{ {
if (pi_is_2711) if (pi_is_2711)
@ -7403,7 +7403,7 @@ static int initPeripherals(void)
else else
gpioCfg.DMAsecondaryChannel = PI_DEFAULT_DMA_SECONDARY_CHANNEL; gpioCfg.DMAsecondaryChannel = PI_DEFAULT_DMA_SECONDARY_CHANNEL;
} }
dmaIn = dmaReg + (gpioCfg.DMAprimaryChannel * 0x40); dmaIn = dmaReg + (gpioCfg.DMAprimaryChannel * 0x40);
dmaOut = dmaReg + (gpioCfg.DMAsecondaryChannel * 0x40); dmaOut = dmaReg + (gpioCfg.DMAsecondaryChannel * 0x40);
@ -7900,7 +7900,7 @@ static void initClock(int mainClock)
} }
clkSrc = CLK_CTL_SRC_PLLD; clkSrc = CLK_CTL_SRC_PLLD;
clkDivI = clk_plld_freq / (10000000 / micros); /* 10 MHz - 1 MHz */ clkDivI = clk_plld_freq / (10000000 / micros); /* 10 MHz - 1 MHz */
clkBits = BITS; /* 10/BITS MHz - 1/BITS MHz */ clkBits = BITS; /* 10/BITS MHz - 1/BITS MHz */
clkDivF = 0; clkDivF = 0;
clkMash = 0; clkMash = 0;
@ -11423,7 +11423,7 @@ int bbSPIXfer(
wfRx_lock(SCLK); wfRx_lock(SCLK);
bbSPIStart(w); bbSPIStart(w);
for (pos=0; pos < count; pos++) for (pos=0; pos < count; pos++)
{ {
outBuf[pos] = bbSPIXferByte(w, inBuf[pos]); outBuf[pos] = bbSPIXferByte(w, inBuf[pos]);
@ -13722,10 +13722,16 @@ unsigned gpioHardwareRevision(void)
if (rev) return rev; if (rev) return rev;
filp = fopen ("/proc/cpuinfo", "r"); const char* env_rev_path = getenv("PIGPIO_REVISION_PATH");
if (env_rev_path == NULL)
{
env_rev_path = "/proc/cpuinfo";
}
if (filp != NULL) filp = fopen (env_rev_path, "r");
if (filp != NULL && rev == 0)
{ {
while (fgets(buf, sizeof(buf), filp) != NULL) while (fgets(buf, sizeof(buf), filp) != NULL)
{ {
@ -14033,4 +14039,3 @@ int gpioCfgSetInternals(uint32_t cfgVal)
/* include any user customisations */ /* include any user customisations */
#include "custom.cext" #include "custom.cext"