h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samd21: Use GPIO() macro when calling gpio_peripheral()

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2018-11-26 22:18:51 -05:00
parent 0af0bc946e
commit 6d90ebe6f8
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/samd21/gpio.c
View File

@@ -18,10 +18,10 @@
****************************************************************/
void
gpio_peripheral(char bank, uint32_t bit, char ptype, uint32_t pull_up)
gpio_peripheral(uint32_t gpio, char ptype, uint32_t pull_up)
{
int group = bank == 'A' ? 0 : 1;
PortGroup *pg = &PORT->Group[group];
uint32_t bank = GPIO2PORT(gpio), bit = gpio % 32;
PortGroup *pg = &PORT->Group[bank];
if (ptype) {
volatile uint8_t *pmux = &pg->PMUX[bit/2].reg;
uint8_t shift = (bit & 1) ? 4 : 0, mask = ~(0xf << shift);
@@ -36,9 +36,6 @@ gpio_peripheral(char bank, uint32_t bit, char ptype, uint32_t pull_up)
* General Purpose Input Output (GPIO) pins
****************************************************************/
#define GPIO(PORT, NUM) (((PORT)-'A') * 32 + (NUM))
#define GPIO2PORT(PIN) ((PIN) / 32)
#define GPIO2BIT(PIN) (1<<((PIN) % 32))
#define NUM_PORT 2
struct gpio_out