yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix navio_gpio: use uintptr_t for pointer type instead of uint32_t

Browse Source
This commit is contained in:
Beat Küng
2016-08-23 09:40:50 +02:00
committed by Julian Oes
parent 4b6e6572b9
commit a7ef9b4954
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/navio_gpio/navio_gpio.cpp
View File

@@ -77,7 +77,7 @@ int Gpio::stop(void)
return 0; return 0;
} }
void Gpio::atomic_modify(uint32_t addr, void Gpio::atomic_modify(uintptr_t addr,
unsigned int shift, unsigned int shift,
unsigned int mask, unsigned int mask,
unsigned int value) unsigned int value)
@@ -99,13 +99,13 @@ int Gpio::configgpio(uint32_t pinset)
unsigned int pin; unsigned int pin;
unsigned int cnf; unsigned int cnf;
uint32_t addr; uintptr_t addr;
unsigned int shift; unsigned int shift;
pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
cnf = (pinset & GPIO_CNF_MASK) >> GPIO_CNF_SHIFT; cnf = (pinset & GPIO_CNF_MASK) >> GPIO_CNF_SHIFT;
addr = (uint32_t)_gpio_map + GPIO_GPFSEL0_OFFSET + pin / 10; addr = (uintptr_t)_gpio_map + GPIO_GPFSEL0_OFFSET + pin / 10;
shift = (pin % 10) * 3; shift = (pin % 10) * 3;
atomic_modify(addr, shift, GPIO_CNF_MASK, cnf); atomic_modify(addr, shift, GPIO_CNF_MASK, cnf);
@@ -124,12 +124,12 @@ bool Gpio::gpioread(uint32_t pinset)
{ {
unsigned int pin; unsigned int pin;
uint32_t addr; uintptr_t addr;
unsigned int shift; unsigned int shift;
pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
addr = (uint32_t)_gpio_map + GPIO_GPLEV0_OFFSET + pin / 32; addr = (uintptr_t)_gpio_map + GPIO_GPLEV0_OFFSET + pin / 32;
shift = pin % 32; shift = pin % 32;
return (*(volatile uint32_t *)addr >> shift) & 0x1u; return (*(volatile uint32_t *)addr >> shift) & 0x1u;
@@ -140,16 +140,16 @@ void Gpio::gpiowrite(uint32_t pinset, bool value)
{ {
unsigned int pin; unsigned int pin;
uint32_t addr; uintptr_t addr;
unsigned int shift; unsigned int shift;
pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
if (value == 0) { if (value == 0) {
addr = (uint32_t)_gpio_map + GPIO_GPCLR0_OFFSET + pin / 32; addr = (uintptr_t)_gpio_map + GPIO_GPCLR0_OFFSET + pin / 32;
} else { } else {
addr = (uint32_t)_gpio_map + GPIO_GPSET0_OFFSET + pin / 32; addr = (uintptr_t)_gpio_map + GPIO_GPSET0_OFFSET + pin / 32;
} }
shift = pin % 32; shift = pin % 32;

2
src/drivers/navio_gpio/navio_gpio.h
View File

@@ -136,7 +136,7 @@ public:
bool isMapped() { return _gpio_map != nullptr; } bool isMapped() { return _gpio_map != nullptr; }
private: private:
void atomic_modify(uint32_t addr, void atomic_modify(uintptr_t addr,
unsigned int shift, unsigned int shift,
unsigned int mask, unsigned int mask,
unsigned int value); unsigned int value);