Skip to content

Read full 32bits at correct GPIO address and correct some pin mappings. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashdriver wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Read full 32bits at correct GPIO address and correct some pin mappings. #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12d23a6
Read full 32bits at correct GPIO address and correct some pin mappings.
ashdriver Dec 7, 2017
1a6bd04
Update OrangePi.c
ashdriver Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions wiringPi/OrangePi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,16 @@ unsigned int readR(unsigned int addr)
#ifdef CONFIG_ORANGEPI_2G_IOT
unsigned int val = 0;
unsigned int mmap_base = (addr & ~MAP_MASK);
unsigned int mmap_seek = (addr - mmap_base);
unsigned int mmap_seek = (addr - mmap_base) >> 2; /* Adjust for int32* pointer arithmetic */

if (mmap_base == 0x11a08000) /* Group C */
val = *((char *)OrangePi_gpioC + mmap_seek);
{
val = *((volatile uint32_t*)OrangePi_gpioC + mmap_seek);
}
else /* Group A, B and D */
val = *((char *)OrangePi_gpio + mmap_seek);
{
val = *((volatile uint32_t*)OrangePi_gpio + mmap_seek);
}
return val;
#else
uint32_t val = 0;
Expand All @@ -546,12 +550,16 @@ void writeR(unsigned int val, unsigned int addr)
{
#ifdef CONFIG_ORANGEPI_2G_IOT
unsigned int mmap_base = (addr & ~MAP_MASK);
unsigned int mmap_seek = (addr - mmap_base);
unsigned int mmap_seek = (addr - mmap_base) >> 2; /* Adjust for int32* pointer arithmetic */

if (mmap_base == 0x11a08000)
*((char *)OrangePi_gpioC + mmap_seek) = val;
{
*((volatile uint32_t*)OrangePi_gpioC + mmap_seek) = val;
}
else
*((char *)OrangePi_gpio + mmap_seek) = val;
{
*((volatile uint32_t*)OrangePi_gpio + mmap_seek) = val;
}
#else
unsigned int mmap_base = (addr & ~MAP_MASK);
unsigned int mmap_seek = ((addr - mmap_base) >> 2);
Expand Down Expand Up @@ -768,10 +776,6 @@ int OrangePi_digitalRead(int pin)
unsigned int phys_SET_R;
unsigned int phys_VAL_R;

/* version 0.1 not support GPIOC input function */
if (bank == 2)
return -1;

/* Offset of register */
if (bank == 0) /* group A */
base_address = GPIOA_BASE;
Expand Down Expand Up @@ -801,6 +805,8 @@ int OrangePi_digitalRead(int pin)
val = (readR(phys_VAL_R) & GPIO_BIT(index)) ? 1 : 0;
else /* Ouput */
val = (readR(phys_SET_R) & GPIO_BIT(index)) ? 1 : 0;
if (wiringPiDebug)
printf("Read reg val: 0x%#x, bank:%d, index:%d\n", val, bank, index);
return val;
#endif
}
Expand Down