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

samd21: Add support for gpio_x_reset() 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-08-20 17:06:17 -04:00
parent eec58b99fe
commit fa3d2b97bd
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/samd21/gpio.c
View File

@ -4,6 +4,7 @@
// //
// This file may be distributed under the terms of the GNU GPLv3 license. // This file may be distributed under the terms of the GNU GPLv3 license.
#include <string.h> // ffs
#include "board/irq.h" // irq_save #include "board/irq.h" // irq_save
#include "command.h" // shutdown #include "command.h" // shutdown
#include "gpio.h" // gpio_out_setup #include "gpio.h" // gpio_out_setup
@ -37,7 +38,6 @@ gpio_peripheral(char bank, uint32_t bit, char ptype, uint32_t pull_up)
#define GPIO(PORT, NUM) (((PORT)-'A') * 32 + (NUM)) #define GPIO(PORT, NUM) (((PORT)-'A') * 32 + (NUM))
#define GPIO2PORT(PIN) ((PIN) / 32) #define GPIO2PORT(PIN) ((PIN) / 32)
#define GPIO2NUM(PIN) ((PIN) % 32)
#define GPIO2BIT(PIN) (1<<((PIN) % 32)) #define GPIO2BIT(PIN) (1<<((PIN) % 32))
#define NUM_PORT 2 #define NUM_PORT 2
@ -47,20 +47,33 @@ gpio_out_setup(uint8_t pin, uint8_t val)
if (GPIO2PORT(pin) >= NUM_PORT) if (GPIO2PORT(pin) >= NUM_PORT)
goto fail; goto fail;
PortGroup *pg = &PORT->Group[GPIO2PORT(pin)]; PortGroup *pg = &PORT->Group[GPIO2PORT(pin)];
uint32_t bit = GPIO2BIT(pin); struct gpio_out g = { .regs=pg, .bit=GPIO2BIT(pin) };
irqstatus_t flag = irq_save(); gpio_out_reset(g, val);
if (val) return g;
pg->OUTSET.reg = bit;
else
pg->OUTCLR.reg = bit;
pg->DIRSET.reg = bit;
pg->PINCFG[GPIO2NUM(pin)].reg = 0;
irq_restore(flag);
return (struct gpio_out){ .regs=pg, .bit=bit };
fail: fail:
shutdown("Not an output pin"); shutdown("Not an output pin");
} }
static void
set_pincfg(PortGroup *pg, uint32_t bit, uint8_t cfg)
{
pg->PINCFG[ffs(bit)-1].reg = cfg;
}
void
gpio_out_reset(struct gpio_out g, uint8_t val)
{
PortGroup *pg = g.regs;
irqstatus_t flag = irq_save();
if (val)
pg->OUTSET.reg = g.bit;
else
pg->OUTCLR.reg = g.bit;
pg->DIRSET.reg = g.bit;
set_pincfg(pg, g.bit, 0);
irq_restore(flag);
}
void void
gpio_out_toggle_noirq(struct gpio_out g) gpio_out_toggle_noirq(struct gpio_out g)
{ {
@ -91,16 +104,23 @@ gpio_in_setup(uint8_t pin, int8_t pull_up)
if (GPIO2PORT(pin) >= NUM_PORT) if (GPIO2PORT(pin) >= NUM_PORT)
goto fail; goto fail;
PortGroup *pg = &PORT->Group[GPIO2PORT(pin)]; PortGroup *pg = &PORT->Group[GPIO2PORT(pin)];
uint32_t bit = GPIO2BIT(pin); struct gpio_in g = { .regs=pg, .bit=GPIO2BIT(pin) };
irqstatus_t flag = irq_save(); gpio_in_reset(g, pull_up);
pg->PINCFG[GPIO2NUM(pin)].reg = pull_up > 0 ? PORT_PINCFG_PULLEN : 0; return g;
pg->DIRCLR.reg = bit;
irq_restore(flag);
return (struct gpio_in){ .regs=pg, .bit=bit };
fail: fail:
shutdown("Not an input pin"); shutdown("Not an input pin");
} }
void
gpio_in_reset(struct gpio_in g, int8_t pull_up)
{
PortGroup *pg = g.regs;
irqstatus_t flag = irq_save();
set_pincfg(pg, g.bit, pull_up > 0 ? PORT_PINCFG_PULLEN : 0);
pg->DIRCLR.reg = g.bit;
irq_restore(flag);
}
uint8_t uint8_t
gpio_in_read(struct gpio_in g) gpio_in_read(struct gpio_in g)
{ {

2
src/samd21/gpio.h
View File

@ -8,6 +8,7 @@ struct gpio_out {
uint32_t bit; uint32_t bit;
}; };
struct gpio_out gpio_out_setup(uint8_t pin, uint8_t val); struct gpio_out gpio_out_setup(uint8_t pin, uint8_t val);
void gpio_out_reset(struct gpio_out g, uint8_t val);
void gpio_out_toggle_noirq(struct gpio_out g); void gpio_out_toggle_noirq(struct gpio_out g);
void gpio_out_toggle(struct gpio_out g); void gpio_out_toggle(struct gpio_out g);
void gpio_out_write(struct gpio_out g, uint8_t val); void gpio_out_write(struct gpio_out g, uint8_t val);
@ -17,6 +18,7 @@ struct gpio_in {
uint32_t bit; uint32_t bit;
}; };
struct gpio_in gpio_in_setup(uint8_t pin, int8_t pull_up); struct gpio_in gpio_in_setup(uint8_t pin, int8_t pull_up);
void gpio_in_reset(struct gpio_in g, int8_t pull_up);
uint8_t gpio_in_read(struct gpio_in g); uint8_t gpio_in_read(struct gpio_in g);
#endif // gpio.h #endif // gpio.h