Skip to content
Snippets Groups Projects
Commit 16a8325b authored by schneider's avatar schneider
Browse files

chore(pushbuttons): code style

parent 8ffaa150
No related branches found
No related tags found
No related merge requests found
...@@ -43,88 +43,88 @@ ...@@ -43,88 +43,88 @@
/******************************************************************************/ /******************************************************************************/
int PB_Init(void) int PB_Init(void)
{ {
int retval = E_NO_ERROR; int retval = E_NO_ERROR;
unsigned int i; unsigned int i;
// If we have a port expander, its pins are already configured // If we have a port expander, its pins are already configured
if(!portexpander_detected()) { if (!portexpander_detected()) {
// Enable pushbutton inputs // Enable pushbutton inputs
for (i = 0; i < num_pbs; i++) { for (i = 0; i < num_pbs; i++) {
if (GPIO_Config(&pb_pin[i]) != E_NO_ERROR) { if (GPIO_Config(&pb_pin[i]) != E_NO_ERROR) {
retval = E_UNKNOWN; retval = E_UNKNOWN;
} }
} }
} }
return retval; return retval;
} }
/******************************************************************************/ /******************************************************************************/
int PB_RegisterCallback(unsigned int pb, pb_callback callback) int PB_RegisterCallback(unsigned int pb, pb_callback callback)
{ {
MXC_ASSERT(pb < num_pbs); MXC_ASSERT(pb < num_pbs);
// TODO: portexpander support // TODO: portexpander support
if (callback) { if (callback) {
// Register callback // Register callback
GPIO_RegisterCallback(&pb_pin[pb], callback, (void*)pb); GPIO_RegisterCallback(&pb_pin[pb], callback, (void *)pb);
// Configure and enable interrupt // Configure and enable interrupt
GPIO_IntConfig(&pb_pin[pb], GPIO_INT_EDGE, GPIO_INT_FALLING); GPIO_IntConfig(&pb_pin[pb], GPIO_INT_EDGE, GPIO_INT_FALLING);
GPIO_IntEnable(&pb_pin[pb]); GPIO_IntEnable(&pb_pin[pb]);
NVIC_EnableIRQ((IRQn_Type)MXC_GPIO_GET_IRQ(pb_pin[pb].port)); NVIC_EnableIRQ((IRQn_Type)MXC_GPIO_GET_IRQ(pb_pin[pb].port));
} else { } else {
// Disable interrupt and clear callback // Disable interrupt and clear callback
GPIO_IntDisable(&pb_pin[pb]); GPIO_IntDisable(&pb_pin[pb]);
GPIO_RegisterCallback(&pb_pin[pb], NULL, NULL); GPIO_RegisterCallback(&pb_pin[pb], NULL, NULL);
} }
return E_NO_ERROR; return E_NO_ERROR;
} }
//****************************************************************************** //******************************************************************************
void PB_IntEnable(unsigned int pb) void PB_IntEnable(unsigned int pb)
{ {
// TODO: portexpander support // TODO: portexpander support
MXC_ASSERT(pb < num_pbs); MXC_ASSERT(pb < num_pbs);
GPIO_IntEnable(&pb_pin[pb]); GPIO_IntEnable(&pb_pin[pb]);
} }
//****************************************************************************** //******************************************************************************
void PB_IntDisable(unsigned int pb) void PB_IntDisable(unsigned int pb)
{ {
// TODO: portexpander support // TODO: portexpander support
MXC_ASSERT(pb < num_pbs); MXC_ASSERT(pb < num_pbs);
GPIO_IntDisable(&pb_pin[pb]); GPIO_IntDisable(&pb_pin[pb]);
} }
//****************************************************************************** //******************************************************************************
void PB_IntClear(unsigned int pb) void PB_IntClear(unsigned int pb)
{ {
// TODO: portexpander support // TODO: portexpander support
MXC_ASSERT(pb < num_pbs); MXC_ASSERT(pb < num_pbs);
GPIO_IntClr(&pb_pin[pb]); GPIO_IntClr(&pb_pin[pb]);
} }
//****************************************************************************** //******************************************************************************
int PB_Get(unsigned int pb) int PB_Get(unsigned int pb)
{ {
static const uint8_t expander_pins[] = {5, 0x0, 3, 6}; static const uint8_t expander_pins[] = { 5, 0x0, 3, 6 };
MXC_ASSERT(pb < 4); MXC_ASSERT(pb < 4);
switch(pb) { switch (pb) {
case 1: case 1:
case 3: case 3:
case 4: case 4:
if(portexpander_detected()) { if (portexpander_detected()) {
uint8_t port = portexpander_get(); uint8_t port = portexpander_get();
return (port & (1 << expander_pins[pb-1])) == 0; return (port & (1 << expander_pins[pb - 1])) == 0;
} else { } else {
return GPIO_InGet(&pb_pin[pb-1]) == 0; return GPIO_InGet(&pb_pin[pb - 1]) == 0;
} }
break; break;
case 2: case 2:
return MAX77650_getDebounceStatusnEN0(); return MAX77650_getDebounceStatusnEN0();
break; break;
} }
return 0; return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment